From a2f08541387806c9299a43b38fbfeaa5da5904a9 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 07 十二月 2021 17:43:55 +0800 Subject: [PATCH] 优化通道录入性能,优化启动后读取配置写入数据库的过程 --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 11 + src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 6 src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 4 src/main/resources/all-application.yml | 3 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 6 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 9 + src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 49 +++++++++ src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 8 + src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 4 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 11 + src/main/resources/application-dev.yml | 3 src/main/resources/application-docker.yml | 3 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 130 ++++++++++++++++++------- 14 files changed, 190 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 20339a9..0c7ef88 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -60,7 +60,7 @@ 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 @@ return secret; } - public String getStreamNoneReaderDelayMS() { + public int getStreamNoneReaderDelayMS() { return streamNoneReaderDelayMS; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index 2f90dee..138ccaf 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java @@ -1163,7 +1163,7 @@ @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"); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java index 7349a7a..5fcc3ad 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java @@ -27,7 +27,9 @@ 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 @@ 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 @@ deviceChannel.setPTZType(Integer.parseInt(getText(itemDevice, "PTZType"))); } deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC - storager.updateChannel(device.getDeviceId(), deviceChannel); + // TODO 淇敼涓烘壒閲忔彃鍏� + channelList.add(deviceChannel); } - + storager.updateChannels(device.getDeviceId(), channelList); RequestMessage msg = new RequestMessage(); msg.setKey(key); msg.setData(device); diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java index f53c167..71df295 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java @@ -49,8 +49,13 @@ @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 @@ if (startGetMedia != null) { startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId()); } - mediaServerService.handLeZLMServerConfig(zlmServerConfig); + mediaServerService.zlmServerOnline(zlmServerConfig); } }); @@ -107,7 +112,7 @@ zlmServerConfig.setIp(mediaServerItem.getIp()); zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort()); startGetMedia.remove(mediaServerItem.getId()); - mediaServerService.handLeZLMServerConfig(zlmServerConfig); + mediaServerService.zlmServerOnline(zlmServerConfig); } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java index c1a9bd2..841c14c 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java @@ -32,7 +32,7 @@ private String generalMaxStreamWaitMS; @JSONField(name = "general.streamNoneReaderDelayMS") - private String generalStreamNoneReaderDelayMS; + private int generalStreamNoneReaderDelayMS; @JSONField(name = "ip") private String ip; @@ -296,11 +296,11 @@ this.generalMaxStreamWaitMS = generalMaxStreamWaitMS; } - public String getGeneralStreamNoneReaderDelayMS() { + public int getGeneralStreamNoneReaderDelayMS() { return generalStreamNoneReaderDelayMS; } - public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) { + public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) { this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS; } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java index 1d4bf31..b7b4e28 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java @@ -37,7 +37,7 @@ private String secret; - private String streamNoneReaderDelayMS; + private int streamNoneReaderDelayMS; private boolean rtpEnable; @@ -206,11 +206,11 @@ this.secret = secret; } - public String getStreamNoneReaderDelayMS() { + public int getStreamNoneReaderDelayMS() { return streamNoneReaderDelayMS; } - public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) { + public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) { this.streamNoneReaderDelayMS = streamNoneReaderDelayMS; } diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java index 43d36d9..e539f23 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java @@ -28,7 +28,7 @@ * @param zlmServerConfig * @return */ - void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig); + void zlmServerOnline(ZLMServerConfig zlmServerConfig); MediaServerItem getMediaServerForMinimumLoad(); @@ -56,6 +56,8 @@ int addToDatabase(MediaServerItem mediaSerItem); + int updateToDatabase(MediaServerItem mediaSerItem); + void resetOnlineServerItem(MediaServerItem serverItem); WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 141c7cf..b6bfc00 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -285,7 +285,7 @@ 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 @@ 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()); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java index 39dc5ad..4c988d9 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -50,6 +50,14 @@ 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 diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index eef7a15..1d0b365 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -25,30 +25,30 @@ @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 @@ "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 @@ "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 @@ @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); } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java index a5a4be7..35dda13 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java @@ -152,6 +152,49 @@ } @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 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); } diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index c00ee2a..2058742 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -38,6 +38,9 @@ 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 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 512152b..066702a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -26,6 +26,9 @@ 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 diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 37c3294..7eefe88 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -26,6 +26,9 @@ 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 -- Gitblit v1.8.0