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

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

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

src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java

@@ -346,38 +346,41 @@ public interface DeviceMapper {
 
     @Select(" <script>" +
             "SELECT " +
-            "id, " +
-            "device_id, " +
             "coalesce(custom_name, name) as name, " +
-            "password, " +
+            "id" +
-            "manufacturer, " +
+            ",device_id" +
-            "model, " +
+            ",manufacturer" +
-            "firmware, " +
+            ",model" +
-            "transport," +
+            ",firmware" +
-            "stream_mode," +
+            ",transport" +
-            "ip,"+
+            ",stream_mode" +
-            "sdp_ip,"+
+            ",on_line" +
-            "local_ip,"+
+            ",register_time" +
-            "port,"+
+            ",keepalive_time" +
-            "host_address,"+
+            ",ip" +
-            "expires,"+
+            ",create_time" +
-            "register_time,"+
+            ",update_time" +
-            "keepalive_time,"+
+            ",port" +
-            "create_time,"+
+            ",expires" +
-            "update_time,"+
+            ",subscribe_cycle_for_catalog" +
-            "charset,"+
+            ",subscribe_cycle_for_mobile_position" +
-            "subscribe_cycle_for_catalog,"+
+            ",mobile_position_submission_interval" +
-            "subscribe_cycle_for_mobile_position,"+
+            ",subscribe_cycle_for_alarm" +
-            "mobile_position_submission_interval,"+
+            ",host_address" +
-            "subscribe_cycle_for_alarm,"+
+            ",charset" +
-            "ssrc_check,"+
+            ",ssrc_check" +
-            "as_message_channel,"+
+            ",geo_coord_sys" +
-            "broadcast_push_after_ack,"+
+            ",media_server_id" +
-            "geo_coord_sys,"+
+            ",sdp_ip" +
-            "on_line,"+
+            ",local_ip" +
-            "media_server_id,"+
+            ",password" +
-            "server_id,"+
+            ",as_message_channel" +
-            "(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
+            ",heart_beat_interval" +
+            ",heart_beat_count" +
+            ",position_capability" +
+            ",broadcast_push_after_ack" +
+            ",server_id" +
+            ",(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
             " FROM wvp_device de" +
             " where 1 = 1 "+
             " <if test='status != null'> AND de.on_line=${status}</if>"+

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