Pre Merge pull request !34 from WangXuewen/master

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java

@@ -81,6 +81,8 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
                 }
                 return;
             }
+            Element sumNumElement = rootElement.element("SumNum");
+            int sumNum = Integer.parseInt(sumNumElement.getText());
             int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
             List<Preset> presetQuerySipReqList = new ArrayList<>();
             if (num > 0) {
@@ -101,8 +103,14 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
                     presetQuerySipReqList.add(presetQuerySipReq);
                 }
             }
+//            if (presetQuerySipReqList.size() == sumNum) {
+//                responseMessageHandler.handMessageEvent(rootElement, presetQuerySipReqList);
+//            }else {
+//                String sn = getText(element, "SN");
+//                addCatch(cmdType + "_" + sn, rootElement, presetQuerySipReqList);
+//            }
             String sn = getText(element, "SN");
-            addCatch(cmdType + "_" + sn, num,  rootElement, presetQuerySipReqList);
+            addCatch(cmdType + "_" + sn, sumNum,  rootElement, presetQuerySipReqList);
             try {
                 responseAck(request, Response.OK);
             } catch (InvalidArgumentException | ParseException | SipException e) {

数据库/2.7.4/初始化-mysql-2.7.4.sql

@@ -499,6 +499,6 @@ create table IF NOT EXISTS wvp_jt_channel (
                                name character varying(255),
                                update_time character varying(50) not null,
                                create_time character varying(50) not null,
-                               constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
+                               constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
 );
 

数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql

@@ -499,6 +499,6 @@ create table IF NOT EXISTS wvp_jt_channel (
                                 name character varying(255),
                                 update_time character varying(50) not null,
                                 create_time character varying(50) not null,
-                                constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
+                                constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
 );
 

数据库/2.7.4/更新-mysql-2.7.4.sql

@@ -32,7 +32,7 @@ create table IF NOT EXISTS wvp_jt_channel (
                                name character varying(255),
                                update_time character varying(50) not null,
                                create_time character varying(50) not null,
-                               constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
+                               constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
 );
 
 /*

数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql

@@ -31,7 +31,7 @@ create table IF NOT EXISTS wvp_jt_channel (
                                 name character varying(255),
                                 update_time character varying(50) not null,
                                 create_time character varying(50) not null,
-                                constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
+                                constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
 );
 
 ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS jtt_proxy_port integer;