diff --git a/libs/jdbc-aarch/kingbase8-8.6.0.jar b/libs/jdbc-aarch/kingbase8-8.6.0.jar deleted file mode 100644 index 489bf53d9..000000000 Binary files a/libs/jdbc-aarch/kingbase8-8.6.0.jar and /dev/null differ diff --git a/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar b/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar deleted file mode 100644 index 28102eb91..000000000 Binary files a/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar and /dev/null differ diff --git a/libs/jdbc-aarch/postgresql-42.2.9.jar b/libs/jdbc-aarch/postgresql-42.2.9.jar deleted file mode 100644 index 62d0b6daf..000000000 Binary files a/libs/jdbc-aarch/postgresql-42.2.9.jar and /dev/null differ diff --git a/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar b/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar deleted file mode 100644 index f6077b618..000000000 Binary files a/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar and /dev/null differ diff --git a/libs/jdbc-x86/bcprov-jdk15on-1.70.jar b/libs/jdbc-x86/bcprov-jdk15on-1.70.jar deleted file mode 100644 index 0e4198e5a..000000000 Binary files a/libs/jdbc-x86/bcprov-jdk15on-1.70.jar and /dev/null differ diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jar b/libs/jdbc-x86/kingbase8-8.6.0.jar deleted file mode 100644 index ff4664ef2..000000000 Binary files a/libs/jdbc-x86/kingbase8-8.6.0.jar and /dev/null differ diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar b/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar deleted file mode 100644 index fcdf628ca..000000000 Binary files a/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar and /dev/null differ diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar b/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar deleted file mode 100644 index a0393586a..000000000 Binary files a/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar and /dev/null differ diff --git a/libs/jdbc-x86/postgresql-42.2.9.jar b/libs/jdbc-x86/postgresql-42.2.9.jar deleted file mode 100644 index 487cfc1e0..000000000 Binary files a/libs/jdbc-x86/postgresql-42.2.9.jar and /dev/null differ diff --git a/libs/jdbc-x86/postgresql-42.2.9.jre6.jar b/libs/jdbc-x86/postgresql-42.2.9.jre6.jar deleted file mode 100644 index 11e9f9976..000000000 Binary files a/libs/jdbc-x86/postgresql-42.2.9.jre6.jar and /dev/null differ diff --git a/libs/jdbc-x86/postgresql-42.2.9.jre7.jar b/libs/jdbc-x86/postgresql-42.2.9.jre7.jar deleted file mode 100644 index 522738dda..000000000 Binary files a/libs/jdbc-x86/postgresql-42.2.9.jre7.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 1ee0828fa..adba59602 100644 --- a/pom.xml +++ b/pom.xml @@ -179,24 +179,6 @@ - - - - - - - - - - - - - - - - - cn.com.kingbase kingbase8 diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteDecodeException.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteDecodeException.java index e9943f15f..c4021e903 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteDecodeException.java +++ b/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; diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlayException.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlayException.java index 89343940a..33ed79925 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlayException.java +++ b/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; diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/hook/Hook.java b/src/main/java/com/genersoft/iot/vmp/media/event/hook/Hook.java index 0d1c55a97..779dc6c79 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/event/hook/Hook.java +++ b/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; diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java index addd943b6..480570a5a 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java +++ b/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 arrayList = new ArrayList<>(List.of(ids)); List cloudRecordItemList = cloudRecordService.getUrlListByIds(arrayList); if (ObjectUtils.isEmpty(cloudRecordItemList)) { - log.warn("[下载指定录像文件的压缩包] 未找到录像文件，ids->{}", ids); + log.warn("[下载指定录像文件的压缩包] 未找到录像文件，ids->{}", idsStr); return; }