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

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

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

pom.xml

@@ -178,24 +178,6 @@
         </dependency>
 
 		<!-- kingbase人大金仓 -->
-		<!-- 手动下载驱动后安装 -->
-		<!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
- -->
-<!--		<dependency>-->
-<!--			<groupId>com.kingbase</groupId>-->
-<!--			<artifactId>kingbase8</artifactId>-->
-<!--			<version>8.6.0</version>-->
-<!--			<scope>system</scope>-->
-<!--			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>com.kingbase</groupId>-->
-<!--			<artifactId>kingbase8</artifactId>-->
-<!--			<version>8.6.0</version>-->
-<!--			<scope>system</scope>-->
-<!--			<systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>-->
-<!--		</dependency>-->
-
         <dependency>
             <groupId>cn.com.kingbase</groupId>
             <artifactId>kingbase8</artifactId>

src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteDecodeException.java

@@ -1,8 +1,11 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class InviteDecodeException extends RuntimeException{
     private int code;
     private String msg;

src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlayException.java

@@ -1,8 +1,10 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class PlayException extends RuntimeException{
     private int code;
     private String msg;

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java

@@ -233,7 +233,13 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
             log.info("[更新多个离线设备信息] 参数为空");
             return;
         }
-        deviceMapper.offlineByList(offlineDevices);
+        int limitCount = 400;
+        for (int i = 0; i < offlineDevices.size(); i += limitCount) {
+            int end = Math.min(i + limitCount, offlineDevices.size());
+            List<Device> batchList = offlineDevices.subList(i, end);
+            deviceMapper.offlineByList(batchList);
+        }
+
         for (Device device : offlineDevices) {
             device.setOnLine(false);
             redisCatchStorage.updateDevice(device);

src/main/java/com/genersoft/iot/vmp/media/event/hook/Hook.java

@@ -1,12 +1,14 @@
 package com.genersoft.iot.vmp.media.event.hook;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * zlm hook事件的参数
  * @author lin
  */
-@Data
+@Getter
+@Setter
 public class Hook {
 
     private HookType hookType;

src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java

@@ -29,6 +29,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 
@@ -361,11 +362,12 @@ public class CloudRecordController {
     @ResponseBody
     @GetMapping("/download/zip")
     public void downloadZipFileFromUrl(HttpServletResponse response, Integer[] ids) {
-        log.info("[下载指定录像文件的压缩包] 查询 ids->{}", ids);
+        String idsStr = StringUtils.arrayToCommaDelimitedString(ids);
+        log.info("[下载指定录像文件的压缩包] 查询 ids->{}", idsStr);
         List<Integer> arrayList = new ArrayList<>(List.of(ids));
         List<CloudRecordUrl> cloudRecordItemList = cloudRecordService.getUrlListByIds(arrayList);
         if (ObjectUtils.isEmpty(cloudRecordItemList)) {
-            log.warn("[下载指定录像文件的压缩包] 未找到录像文件，ids->{}", ids);
+            log.warn("[下载指定录像文件的压缩包] 未找到录像文件，ids->{}", idsStr);
             return;
         }
 

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