From fcb76a9ebc56575bb0d17a04e0d7c715976be6d6 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:41:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E6=89=93=E5=BC=80=E9=80=9A=E9=81=93=E9=80=89=E6=8B=A9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=AF=8F=E9=A1=B5=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/gb28181/chooseChannelForGb.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/gb28181/chooseChannelForGb.vue b/web_src/src/components/gb28181/chooseChannelForGb.vue index ceadc8c5..b21416c1 100644 --- a/web_src/src/components/gb28181/chooseChannelForGb.vue +++ b/web_src/src/components/gb28181/chooseChannelForGb.vue @@ -72,7 +72,7 @@ export default { online: "", choosed: "", currentPage: 0, - count: 15, + count: 10, total: 0, eventEnanle: false From 1885b2120c1650ae0cd9bc765a01e4a8b1974f01 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:44:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BF=87=E4=B8=8A=E7=BA=A7=E5=B9=B3=E5=8F=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=AC=A1=E5=88=9B=E5=BB=BA=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8C=89=E9=92=AE=E4=B8=8D=E4=BC=9A=E5=8F=98?= =?UTF-8?q?=E4=B8=BA'=E7=AB=8B=E5=8D=B3=E5=88=9B=E5=BB=BA'=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/platformEdit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/src/components/platformEdit.vue b/web_src/src/components/platformEdit.vue index aefa9ab6..4a916e8a 100644 --- a/web_src/src/components/platformEdit.vue +++ b/web_src/src/components/platformEdit.vue @@ -200,6 +200,7 @@ export default { this.platform = platform; this.onSubmit_text = "保存"; } else { + this.onSubmit_text = "立即创建"; } }, onSubmit: function () { From 217d42983e089e2e7840bd6cf0de3acfbe397107 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:49:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?parent=5Fplatform=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BB=E9=94=AE=E4=B8=BAserverGBId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/wvp.sqlite | Bin 49152 -> 49152 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite index 3694bad3c2e91495b55a82b7e46ecc96b73f3687..efb382c938cd77a98aa11976467af674228a2a0b 100644 GIT binary patch delta 657 zcmZo@U~Xt&o**rFo`HdZ2Z-5#mRCK0{59GC$g;MZVqddWEa=gW^7BIe4I;}k#q8EE(J4QE>5M?yu_rO zR3%O)AActukU(ByE|44I8W95K7N-`Kr53q6d8WVwC);vMAW3-!z$Ad0A*uuNi%OI@ zJ^eyl-Ccupcqi9!%hrR8PDw4xOiuMIK+*saf@px-Sqd};%^3xW#l_|MMQ}%eTwYO- zS(I9gWLS1;YC%Y5Zfbrh(0aIOB}IvO#XJRIH$em^%khW>gB%nP66K2S|Duv)pabE- zQCyN(QVO&LCJ+$h>FXF2so?DzsR8vaIB+z1ximLFVLQrf%NxO@0E{GtX1_Xiabsh~ zHs=yh5EmpCrRJ5y7vvjxU=f=9ic5|KB)6G^yNZ#`wVq8p(s=TD9*M~d zcmyPY;_-%9bg@l7$#ayStx*z`LKqmd!`Z~`C4su+C-33qW?VOM;wpCAMkzM&Ky9c| w3LHGHjS?`kH(%t_cbpi&&dLbX%(_{y;0ynv1cgls90H3u928i9f}CJM0Hx2ip#T5? delta 270 zcmZo@U~Xt&o**rFhJk^B2a1`1^w)_x#>!_H^z3i)a;;?GWP8HE%f=bOJDu$b&q=Pm zJWYJR_%`t+@g;2*6u8ekIgw@M#095>xmGd?05QlMFaWYAPW-$13ENR-Ii7JFW;P9M(;sVJ<3IafZi2>}aj6icZHw!v^;RgWB(?`ev From 8a4e915fe1273e181d44cd152bfcb09446944b18 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:51:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9catalog=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E5=93=8D=E5=BA=94=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transmit/request/impl/MessageRequestProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 1860ec7a..9ad928d6 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 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { 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， 不存在DeviceList则为查询请求 - // TODO 后续将代码拆分 + // if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求 + if (name == "Query") { // 区分是Response——查询响应，还是Query——查询请求 + // TODO 后续将代码拆分 ParentPlatform parentPlatform = storager.queryParentPlatById(deviceId); if (parentPlatform == null) { response404Ack(evt); From f34eb9c9e6b61b596d0085e9a2baec48628b23e1 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:53:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=80=9A=E9=81=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=BE=93=E5=87=BA=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9D=82=E4=B9=B1=E6=97=A0=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 2 ++ 1 file changed, 2 insertions(+) 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 5c871bdc..6d3b031b 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 @@ public interface DeviceChannelMapper { " WHERE 1=1 " + " AND subCount >0" + " AND subCount=0" + + " ORDER BY channelId ASC" + " "}) List queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online); @@ -96,6 +97,7 @@ public interface DeviceChannelMapper { " AND subCount=0 " + " AND platformId='${platformId}' " + " AND (platformId != '${platformId}' OR platformId is NULL ) " + + " ORDER BY deviceId, channelId ASC" + " "}) List queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform); From fede5969f9322191b50db3a1c81e0c1707310c0f Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Thu, 14 Jan 2021 23:56:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=80=9A=E9=81=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=BE=93=E5=87=BA=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9D=82=E4=B9=B1=E6=97=A0=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/storager/dao/PatformChannelMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c5e90918..cbc56fc3 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 @@ public interface PatformChannelMapper { */ @Select("") List findChannelRelatedPlatform(String platformId, List deviceAndChannelIds); From 1b200bcc904d088b31ceaf1e9261b5433d9322a6 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Fri, 15 Jan 2021 00:00:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B0=86=E4=B8=8A=E7=BA=A7=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=A0=87=E8=AF=86=E6=94=B9=E4=B8=BAserverGBId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/storager/dao/ParentPlatformMapper.java | 2 +- .../iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++--- .../iot/vmp/vmanager/platform/PlatformController.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) 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 70757576..6d5d83b2 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 @@ public interface ParentPlatformMapper { @Select("SELECT * FROM parent_platform WHERE enable=#{enable}") List 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/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java index 93d8c837..4547d76c 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 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @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 a75d753b..031fb09f 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 @@ public class PlatformController { } // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册 - ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId()); + // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId()); + ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId()); boolean updateResult = storager.updateParentPlatform(parentPlatform);