完善行政区划管理

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

@@ -313,6 +313,7 @@ public interface CommonGBChannelMapper {
             " select " +
             "    coalesce(gb_device_id, device_id) as id," +
             "    coalesce(gb_name, name) as label, " +
+            "    id as db_id, " +
             "    1 as type, " +
             "    true as is_leaf " +
             " from wvp_device_channel " +
@@ -341,4 +342,18 @@ public interface CommonGBChannelMapper {
 
     @SelectProvider(type = ChannelProvider.class, method = "queryByIdsOrCivilCode")
     List<CommonGBChannel> queryByIdsOrCivilCode(@Param("civilCode") String civilCode, @Param("ids") List<Integer> ids);
+
+    @Update(value = {" <script>" +
+            " UPDATE wvp_device_channel " +
+            " SET gb_civil_code = null" +
+            " WHERE id in "+
+            " <foreach collection='channelList'  item='item'  open='(' separator=',' close=')' > #{item.gbId}</foreach>" +
+            " </script>"})
+    int removeCivilCodeByChannels(List<CommonGBChannel> channelList);
+
+    @SelectProvider(type = ChannelProvider.class, method = "queryByCivilCode")
+    List<CommonGBChannel> queryByCivilCode(@Param("civilCode") String civilCode);
+
+    @SelectProvider(type = ChannelProvider.class, method = "queryByGbDeviceIds")
+    List<CommonGBChannel> queryByGbDeviceIds(List<Integer> deviceIds);
 }

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

@@ -70,6 +70,7 @@ public interface RegionMapper {
             " device_id as id," +
             " name as label, " +
             " parent_device_id," +
+            " id as db_id," +
             " 0 as type," +
             " false as is_leaf" +
             " from wvp_common_region " +

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java

@@ -132,6 +132,24 @@ public class ChannelProvider {
         return sqlBuild.toString() ;
     }
 
+    public String queryByGbDeviceIds(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(getBaseSelectSql());
+        sqlBuild.append("where device_db_id in ( ");
+
+        Collection<Integer> ids = (Collection<Integer>)params.get("deviceIds");
+        boolean first = true;
+        for (Integer id : ids) {
+            if (!first) {
+                sqlBuild.append(",");
+            }
+            sqlBuild.append(id);
+            first = false;
+        }
+        sqlBuild.append(" )");
+        return sqlBuild.toString() ;
+    }
+
     public String queryByIdsOrCivilCode(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append(getBaseSelectSql());
@@ -157,4 +175,11 @@ public class ChannelProvider {
         }
         return sqlBuild.toString() ;
     }
+
+    public String queryByCivilCode(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(getBaseSelectSql());
+        sqlBuild.append("where gb_civil_code = #{civilCode} ");
+        return sqlBuild.toString() ;
+    }
 }