From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 15 一月 2021 13:22:07 +0800 Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0 --- web_src/src/components/platformEdit.vue | 1 + src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java | 2 +- src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 3 ++- src/main/resources/wvp.sqlite | 0 src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 2 +- web_src/src/components/gb28181/chooseChannelForGb.vue | 2 +- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 6 ++++-- src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++--- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 2 ++ 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java index 1860ec7..9ad928d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java @@ -162,11 +162,13 @@ private void processMessageCatalogList(RequestEvent evt) { try { Element rootElement = getRootElement(evt); + String name = rootElement.getName(); Element deviceIdElement = rootElement.element("DeviceID"); String deviceId = deviceIdElement.getText(); Element deviceListElement = rootElement.element("DeviceList"); - if (deviceListElement == null) { // 瀛樺湪DeviceList鍒欎负鍝嶅簲 catalog锛� 涓嶅瓨鍦―eviceList鍒欎负鏌ヨ璇锋眰 - // TODO 鍚庣画灏嗕唬鐮佹媶鍒� + // if (deviceListElement == null) { // 瀛樺湪DeviceList鍒欎负鍝嶅簲 catalog锛� 涓嶅瓨鍦―eviceList鍒欎负鏌ヨ璇锋眰 + if (name == "Query") { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹� + // TODO 鍚庣画灏嗕唬鐮佹媶鍒� ParentPlatform parentPlatform = storager.queryParentPlatById(deviceId); if (parentPlatform == null) { response404Ack(evt); 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 5c871bd..6d3b031 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 @@ -63,6 +63,7 @@ " WHERE 1=1 " + " <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); @@ -96,6 +97,7 @@ " <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>"}) List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java index 7075757..6d5d83b 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java @@ -51,7 +51,7 @@ @Select("SELECT * FROM parent_platform WHERE enable=#{enable}") List<ParentPlatform> getEnableParentPlatformList(boolean enable); - @Select("SELECT * FROM parent_platform WHERE deviceGBId=#{platformGbId}") + @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}") ParentPlatform getParentPlatById(String platformGbId); @Update("UPDATE parent_platform SET status=false" ) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java index c5e9091..cbc56fc 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java @@ -18,7 +18,7 @@ */ @Select("<script> "+ "SELECT deviceAndChannelId FROM platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" + - "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach>" + + "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach> ORDER BY deviceAndChannelId ASC" + "</script>") List<String> findChannelRelatedPlatform(String platformId, List<String> deviceAndChannelIds); 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 93d8c83..4547d76 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 @@ -231,14 +231,14 @@ @Override public boolean updateParentPlatform(ParentPlatform parentPlatform) { int result = 0; - ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getDeviceGBId()); - if ( platformMapper.getParentPlatById(parentPlatform.getDeviceGBId()) == null) { + ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId()); + if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) { result = platformMapper.addParentPlatform(parentPlatform); if (parentPlatformCatch == null) { parentPlatformCatch = new ParentPlatformCatch(); parentPlatformCatch.setParentPlatform(parentPlatform); - parentPlatformCatch.setId(parentPlatform.getDeviceGBId()); + parentPlatformCatch.setId(parentPlatform.getServerGBId()); } }else { result = platformMapper.updateParentPlatform(parentPlatform); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java index a75d753..031fb09 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java @@ -82,7 +82,8 @@ } // TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐� - ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId()); + // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId()); + ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId()); boolean updateResult = storager.updateParentPlatform(parentPlatform); diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite index 3694bad..efb382c 100644 --- a/src/main/resources/wvp.sqlite +++ b/src/main/resources/wvp.sqlite Binary files differ diff --git a/web_src/src/components/gb28181/chooseChannelForGb.vue b/web_src/src/components/gb28181/chooseChannelForGb.vue index ceadc8c..b21416c 100644 --- a/web_src/src/components/gb28181/chooseChannelForGb.vue +++ b/web_src/src/components/gb28181/chooseChannelForGb.vue @@ -72,7 +72,7 @@ online: "", choosed: "", currentPage: 0, - count: 15, + count: 10, total: 0, eventEnanle: false diff --git a/web_src/src/components/platformEdit.vue b/web_src/src/components/platformEdit.vue index aefa9ab..4a916e8 100644 --- a/web_src/src/components/platformEdit.vue +++ b/web_src/src/components/platformEdit.vue @@ -200,6 +200,7 @@ this.platform = platform; this.onSubmit_text = "淇濆瓨"; } else { + this.onSubmit_text = "绔嬪嵆鍒涘缓"; } }, onSubmit: function () { -- Gitblit v1.8.0