Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

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

@@ -81,8 +81,6 @@ 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) {
@@ -103,14 +101,8 @@ 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, sumNum,  rootElement, presetQuerySipReqList);
+            addCatch(cmdType + "_" + sn, num,  rootElement, presetQuerySipReqList);
             try {
                 responseAck(request, Response.OK);
             } catch (InvalidArgumentException | ParseException | SipException e) {

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

数据库/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_device_id_device_id unique (terminal_db_id, channel_id)
+                               constraint uk_jt_channel_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_device_id_device_id unique (terminal_db_id, channel_id)
+                                constraint uk_jt_channel_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_device_id_device_id unique (terminal_db_id, channel_id)
+                               constraint uk_jt_channel_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_device_id_device_id unique (terminal_db_id, channel_id)
+                                constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
 );
 
 ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS jtt_proxy_port integer;