优化通道录入性能，优化启动后读取配置写入数据库的过程

648540858
1 parent 381b3d15
Showing 14 changed files with 190 additions and 59 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
src/main/resources/all-application.yml
src/main/resources/application-dev.yml
src/main/resources/application-docker.yml
@@ -60,7 +60,7 @@ public class MediaConfig{
     private String secret;
     @Value("${media.stream-none-reader-delay-ms:18000}")
-    private String streamNoneReaderDelayMS = "18000";
+    private int streamNoneReaderDelayMS = 18000;
     @Value("${media.rtp.enable}")
     private boolean rtpEnable;
@@ -141,7 +141,7 @@ public class MediaConfig{
         return secret;
     }
-    public String getStreamNoneReaderDelayMS() {
+    public int getStreamNoneReaderDelayMS() {
         return streamNoneReaderDelayMS;
     }
@@ -1163,7 +1163,7 @@ public class SIPCommander implements ISIPCommander {
 	@Override
 	public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {
 		// 清空通道
-		storager.cleanChannelsForDevice(device.getDeviceId());
+//		storager.cleanChannelsForDevice(device.getDeviceId());
 		try {
 			StringBuffer catalogXml = new StringBuffer(200);
 			catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
@@ -27,7 +27,9 @@ import javax.sip.RequestEvent;
 import javax.sip.SipException;
 import javax.sip.message.Response;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
@@ -69,7 +71,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
             Element deviceListElement = rootElement.element("DeviceList");
             Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
             if (deviceListIterator != null) {
-
+                List<DeviceChannel> channelList = new ArrayList<>();
                 // 遍历DeviceList
                 while (deviceListIterator.hasNext()) {
                     Element itemDevice = deviceListIterator.next();
@@ -151,9 +153,10 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
                         deviceChannel.setPTZType(Integer.parseInt(getText(itemDevice, "PTZType")));
                     }
                     deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC
-                    storager.updateChannel(device.getDeviceId(), deviceChannel);
+                    // TODO 修改为批量插入
+                    channelList.add(deviceChannel);
                 }
-
+                storager.updateChannels(device.getDeviceId(), channelList);
                 RequestMessage msg = new RequestMessage();
                 msg.setKey(key);
                 msg.setData(device);
@@ -49,8 +49,13 @@ public class ZLMRunner implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
         mediaServerService.clearMediaServerForOnline();
-        if (mediaServerService.getDefaultMediaServer() == null) {
+        MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
+        if (defaultMediaServer == null) {
             mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
+        }else {
+            MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+            mediaSerItem.setId(defaultMediaServer.getId());
+            mediaServerService.updateToDatabase(mediaSerItem);
         }
         // 订阅 zlm启动事件, 新的zlm也会从这里进入系统
@@ -61,7 +66,7 @@ public class ZLMRunner implements CommandLineRunner {
                 if (startGetMedia != null) {
                     startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
                 }
-                mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+                mediaServerService.zlmServerOnline(zlmServerConfig);
             }
         });
@@ -107,7 +112,7 @@ public class ZLMRunner implements CommandLineRunner {
             zlmServerConfig.setIp(mediaServerItem.getIp());
             zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
             startGetMedia.remove(mediaServerItem.getId());
-            mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+            mediaServerService.zlmServerOnline(zlmServerConfig);
         }
     }
@@ -32,7 +32,7 @@ public class ZLMServerConfig {
     private String generalMaxStreamWaitMS;
     @JSONField(name = "general.streamNoneReaderDelayMS")
-    private String generalStreamNoneReaderDelayMS;
+    private int generalStreamNoneReaderDelayMS;
     @JSONField(name = "ip")
     private String ip;
@@ -296,11 +296,11 @@ public class ZLMServerConfig {
         this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
     }
-    public String getGeneralStreamNoneReaderDelayMS() {
+    public int getGeneralStreamNoneReaderDelayMS() {
         return generalStreamNoneReaderDelayMS;
     }
-    public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
+    public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
         this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
     }
@@ -37,7 +37,7 @@ public class MediaServerItem{
     private String secret;
-    private String streamNoneReaderDelayMS;
+    private int streamNoneReaderDelayMS;
     private boolean rtpEnable;
@@ -206,11 +206,11 @@ public class MediaServerItem{
         this.secret = secret;
     }
-    public String getStreamNoneReaderDelayMS() {
+    public int getStreamNoneReaderDelayMS() {
         return streamNoneReaderDelayMS;
     }
-    public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
+    public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
         this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
     }
@@ -28,7 +28,7 @@ public interface IMediaServerService {
      * @param zlmServerConfig
      * @return
      */
-    void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig);
+    void zlmServerOnline(ZLMServerConfig zlmServerConfig);
     MediaServerItem getMediaServerForMinimumLoad();
@@ -56,6 +56,8 @@ public interface IMediaServerService {
     int addToDatabase(MediaServerItem mediaSerItem);
+    int updateToDatabase(MediaServerItem mediaSerItem);
+
     void resetOnlineServerItem(MediaServerItem serverItem);
     WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
@@ -285,7 +285,7 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR
                 mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
                 zlmServerConfig.setIp(mediaServerItem.getIp());
                 mediaServerMapper.add(mediaServerItem);
-                handLeZLMServerConfig(zlmServerConfig);
+                zlmServerOnline(zlmServerConfig);
                 result.setCode(0);
                 result.setMsg("success");
             }else {
@@ -305,12 +305,19 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR
         return mediaServerMapper.add(mediaSerItem);
     }
+    @Override
+    public int updateToDatabase(MediaServerItem mediaSerItem) {
+        return mediaServerMapper.update(mediaSerItem);
+    }
+
+
+
     /**
      * 处理zlm上线
      * @param zlmServerConfig zlm上线携带的参数
      */
     @Override
-    public void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig) {
+    public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
         logger.info("[ ZLM：{} ]-[ {}:{} ]已连接",
                 zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
@@ -50,6 +50,14 @@ public interface IVideoManagerStorager {
 	public void updateChannel(String deviceId, DeviceChannel channel);
 	/**
+	 * 批量添加设备通道
+	 *
+	 * @param deviceId 设备id
+	 * @param channels 多个通道
+	 */
+	public void updateChannels(String deviceId, List<DeviceChannel> channels);
+
+	/**
 	 * 开始播放
 	 * @param deviceId 设备id
 	 * @param channelId 通道ID
@@ -25,30 +25,30 @@ public interface DeviceChannelMapper {
     @Update(value = {" <script>" +
             "UPDATE device_channel " +
             "SET updateTime='${updateTime}'" +
-            "<if test=\"name != null\">, name='${name}'</if>" +
-            "<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
-            "<if test=\"model != null\">, model='${model}'</if>" +
-            "<if test=\"owner != null\">, owner='${owner}'</if>" +
-            "<if test=\"civilCode != null\">, civilCode='${civilCode}'</if>" +
-            "<if test=\"block != null\">, block='${block}'</if>" +
-            "<if test=\"address != null\">, address='${address}'</if>" +
-            "<if test=\"parental != null\">, parental=${parental}</if>" +
-            "<if test=\"parentId != null\">, parentId='${parentId}'</if>" +
-            "<if test=\"safetyWay != null\">, safetyWay=${safetyWay}</if>" +
-            "<if test=\"registerWay != null\">, registerWay=${registerWay}</if>" +
-            "<if test=\"certNum != null\">, certNum='${certNum}'</if>" +
-            "<if test=\"certifiable != null\">, certifiable=${certifiable}</if>" +
-            "<if test=\"errCode != null\">, errCode=${errCode}</if>" +
-            "<if test=\"secrecy != null\">, secrecy='${secrecy}'</if>" +
-            "<if test=\"ipAddress != null\">, ipAddress='${ipAddress}'</if>" +
-            "<if test=\"port != null\">, port=${port}</if>" +
-            "<if test=\"password != null\">, password='${password}'</if>" +
-            "<if test=\"PTZType != null\">, PTZType=${PTZType}</if>" +
-            "<if test=\"status != null\">, status='${status}'</if>" +
-            "<if test=\"streamId != null\">, streamId='${streamId}'</if>" +
-            "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" +
-            "<if test=\"longitude != null\">, longitude=${longitude}</if>" +
-            "<if test=\"latitude != null\">, latitude=${latitude}</if>" +
+            "<if test='name != null'>, name='${name}'</if>" +
+            "<if test='manufacture != null'>, manufacture='${manufacture}'</if>" +
+            "<if test='model != null'>, model='${model}'</if>" +
+            "<if test='owner != null'>, owner='${owner}'</if>" +
+            "<if test='civilCode != null'>, civilCode='${civilCode}'</if>" +
+            "<if test='block != null'>, block='${block}'</if>" +
+            "<if test='address != null'>, address='${address}'</if>" +
+            "<if test='parental != null'>, parental=${parental}</if>" +
+            "<if test='parentId != null'>, parentId='${parentId}'</if>" +
+            "<if test='safetyWay != null'>, safetyWay=${safetyWay}</if>" +
+            "<if test='registerWay != null'>, registerWay=${registerWay}</if>" +
+            "<if test='certNum != null'>, certNum='${certNum}'</if>" +
+            "<if test='certifiable != null'>, certifiable=${certifiable}</if>" +
+            "<if test='errCode != null'>, errCode=${errCode}</if>" +
+            "<if test='secrecy != null'>, secrecy='${secrecy}'</if>" +
+            "<if test='ipAddress != null'>, ipAddress='${ipAddress}'</if>" +
+            "<if test='port != null'>, port=${port}</if>" +
+            "<if test='password != null'>, password='${password}'</if>" +
+            "<if test='PTZType != null'>, PTZType=${PTZType}</if>" +
+            "<if test='status != null'>, status='${status}'</if>" +
+            "<if test='streamId != null'>, streamId='${streamId}'</if>" +
+            "<if test='hasAudio != null'>, hasAudio=${hasAudio}</if>" +
+            "<if test='longitude != null'>, longitude=${longitude}</if>" +
+            "<if test='latitude != null'>, latitude=${latitude}</if>" +
             "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
             " </script>"})
     int update(DeviceChannel channel);
@@ -57,16 +57,19 @@ public interface DeviceChannelMapper {
             "SELECT * FROM ( "+
             " SELECT * , (SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount FROM device_channel dc " +
             " WHERE dc.deviceId=#{deviceId} " +
-            " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
-            " <if test=\"parentChannelId != null\"> AND dc.parentId=#{parentChannelId} </if> " +
-            " <if test=\"online == true\" > AND dc.status=1</if>" +
-            " <if test=\"online == false\" > AND dc.status=0</if>) dcr" +
+            " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+            " <if test='parentChannelId != null'> AND dc.parentId=#{parentChannelId} </if> " +
+            " <if test='online == true' > AND dc.status=1</if>" +
+            " <if test='online == false' > AND dc.status=0</if>) dcr" +
             " WHERE 1=1 " +
-            " <if test=\"hasSubChannel == true\" >  AND subCount >0</if>" +
-            " <if test=\"hasSubChannel == false\" >  AND subCount=0</if>" +
+            " <if test='hasSubChannel == true' >  AND subCount >0</if>" +
+            " <if test='hasSubChannel == false' >  AND subCount=0</if>" +
             " ORDER BY channelId ASC" +
             " </script>"})
-    List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
+    List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
+
+    @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId}")
+    List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
     @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
     DeviceChannel queryChannel(String deviceId, String channelId);
@@ -92,15 +95,15 @@ public interface DeviceChannelMapper {
                 "FROM device_channel dc " +
                 "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
                 " WHERE 1=1 " +
-                " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
-                " <if test=\"online == true\" > AND dc.status=1</if> " +
-                " <if test=\"online == false\" > AND dc.status=0</if> " +
+                " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+                " <if test='online == true' > AND dc.status=1</if> " +
+                " <if test='online == false' > AND dc.status=0</if> " +
             ") dcr" +
             " WHERE 1=1 " +
-            " <if test=\"hasSubChannel!= null and hasSubChannel == true\" >  AND subCount >0</if> " +
-            " <if test=\"hasSubChannel!= null and hasSubChannel == false\" >  AND subCount=0</if> " +
-            " <if test=\"platformId != null and inPlatform == true \" >  AND platformId='${platformId}'</if> " +
-            " <if test=\"platformId != null and inPlatform == false \" >  AND (platformId != '${platformId}' OR platformId is NULL )  </if> " +
+            " <if test='hasSubChannel!= null and hasSubChannel == true' >  AND subCount >0</if> " +
+            " <if test='hasSubChannel!= null and hasSubChannel == false' >  AND subCount=0</if> " +
+            " <if test='platformId != null and inPlatform == true ' >  AND platformId='${platformId}'</if> " +
+            " <if test='platformId != null and inPlatform == false ' >  AND (platformId != '${platformId}' OR platformId is NULL )  </if> " +
             " ORDER BY deviceId, channelId ASC" +
             " </script>"})
@@ -114,4 +117,55 @@ public interface DeviceChannelMapper {
     @Update(value = {"UPDATE device_channel SET status=1 WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
     void online(String deviceId,  String channelId);
+
+    @Insert("<script> " +
+            "insert into device_channel " +
+            "(channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
+            "  address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
+            "  ipAddress, port, password, PTZType, status, streamId, longitude, latitude, createTime, updateTime) " +
+            "values " +
+            "<foreach collection='addChannels' index='index' item='item' separator=','> " +
+            "('${item.channelId}', '${item.deviceId}', '${item.name}', '${item.manufacture}', '${item.model}', " +
+            "'${item.owner}', '${item.civilCode}', '${item.block}'," +
+            "'${item.address}', ${item.parental}, '${item.parentId}', ${item.safetyWay}, ${item.registerWay}, " +
+            "'${item.certNum}', ${item.certifiable}, ${item.errCode}, '${item.secrecy}', " +
+            "'${item.ipAddress}', ${item.port}, '${item.password}', ${item.PTZType}, ${item.status}, " +
+            "'${item.streamId}', ${item.longitude}, ${item.latitude},'${item.createTime}', '${item.updateTime}')" +
+            "</foreach> " +
+            "</script>")
+    void batchAdd(List<DeviceChannel> addChannels);
+
+    @Update({"<script>" +
+            "<foreach collection='updateChannels' item='item' separator=';'>" +
+            " UPDATE" +
+            " device_channel" +
+            " SET updateTime='${item.updateTime}'" +
+            "<if test='item.name != null'>, name='${item.name}'</if>" +
+            "<if test='item.manufacture != null'>, manufacture='${item.manufacture}'</if>" +
+            "<if test='item.model != null'>, model='${item.model}'</if>" +
+            "<if test='item.owner != null'>, owner='${item.owner}'</if>" +
+            "<if test='item.civilCode != null'>, civilCode='${item.civilCode}'</if>" +
+            "<if test='item.block != null'>, block='${item.block}'</if>" +
+            "<if test='item.address != null'>, address='${item.address}'</if>" +
+            "<if test='item.parental != null'>, parental=${item.parental}</if>" +
+            "<if test='item.parentId != null'>, parentId='${item.parentId}'</if>" +
+            "<if test='item.safetyWay != null'>, safetyWay=${item.safetyWay}</if>" +
+            "<if test='item.registerWay != null'>, registerWay=${item.registerWay}</if>" +
+            "<if test='item.certNum != null'>, certNum='${item.certNum}'</if>" +
+            "<if test='item.certifiable != null'>, certifiable=${item.certifiable}</if>" +
+            "<if test='item.errCode != null'>, errCode=${item.errCode}</if>" +
+            "<if test='item.secrecy != null'>, secrecy='${item.secrecy}'</if>" +
+            "<if test='item.ipAddress != null'>, ipAddress='${item.ipAddress}'</if>" +
+            "<if test='item.port != null'>, port=${item.port}</if>" +
+            "<if test='item.password != null'>, password='${item.password}'</if>" +
+            "<if test='item.PTZType != null'>, PTZType=${item.PTZType}</if>" +
+            "<if test='item.status != null'>, status='${item.status}'</if>" +
+            "<if test='item.streamId != null'>, streamId='${item.streamId}'</if>" +
+            "<if test='item.hasAudio != null'>, hasAudio=${item.hasAudio}</if>" +
+            "<if test='item.longitude != null'>, longitude=${item.longitude}</if>" +
+            "<if test='item.latitude != null'>, latitude=${item.latitude}</if>" +
+            "WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}"+
+            "</foreach>" +
+            "</script>"})
+    void batchUpdate(List<DeviceChannel> updateChannels);
 }
@@ -152,6 +152,49 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 	}
 	@Override
+	public void updateChannels(String deviceId, List<DeviceChannel> channels) {
+		List<DeviceChannel> addChannels = new ArrayList<>();
+		List<DeviceChannel> updateChannels = new ArrayList<>();
+		HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
+		if (channels != null && channels.size() > 0) {
+			List<DeviceChannel> channelList = deviceChannelMapper.queryChannelsByDeviceId(deviceId);
+			if (channelList.size() == 0) {
+				for (DeviceChannel channel : channels) {
+					channel.setDeviceId(deviceId);
+					channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
+					String now = this.format.format(System.currentTimeMillis());
+					channel.setUpdateTime(now);
+					channel.setCreateTime(now);
+					addChannels.add(channel);
+				}
+			}else {
+				for (DeviceChannel deviceChannel : channelList) {
+					channelsInStore.put(deviceChannel.getChannelId(), deviceChannel);
+				}
+				for (DeviceChannel channel : channels) {
+					String channelId = channel.getChannelId();
+					channel.setDeviceId(deviceId);
+					channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
+					String now = this.format.format(System.currentTimeMillis());
+					channel.setUpdateTime(now);
+					if (channelsInStore.get(channel.getChannelId()) != null) {
+						updateChannels.add(channel);
+					}else {
+						addChannels.add(channel);
+						channel.setCreateTime(now);
+					}
+				}
+			}
+			if (addChannels.size() > 0) {
+				deviceChannelMapper.batchAdd(addChannels);
+			}
+			if (updateChannels.size() > 0) {
+				deviceChannelMapper.batchUpdate(updateChannels);
+			}
+		}
+	}
+
+	@Override
 	public void deviceChannelOnline(String deviceId, String channelId) {
 		deviceChannelMapper.online(deviceId, channelId);
 	}
@@ -186,19 +229,19 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 	public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
 		// 获取到所有正在播放的流
 		PageHelper.startPage(page, count);
-		List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
+		List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
 		return new PageInfo<>(all);
 	}
 	@Override
 	public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
-		return deviceChannelMapper.queryChannelsByDeviceId(deviceId, null,null, null, null);
+		return deviceChannelMapper.queryChannels(deviceId, null,null, null, null);
 	}
 	@Override
 	public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
 		PageHelper.startPage(page, count);
-		List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
+		List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, null, null, null);
 		return new PageInfo<>(all);
 	}
@@ -38,6 +38,9 @@ spring:
         password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name:  org.sqlite.JDBC
+        journal_mode: WAL
+        synchronous: NORMAL
+        transaction_mode: IMMEDIATE
         max-active: 1
         min-idle: 1
@@ -26,6 +26,9 @@ spring:
         password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name:  org.sqlite.JDBC
+        journal_mode: WAL
+        synchronous: NORMAL
+        transaction_mode: IMMEDIATE
         max-active: 1
         min-idle: 1
@@ -26,6 +26,9 @@ spring:
         password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name:  org.sqlite.JDBC
+        journal_mode: WAL
+        synchronous: NORMAL
+        transaction_mode: IMMEDIATE
         max-active: 1
         min-idle: 1