From da8f4f3307e81eb0d0430b13388ba06503a4bff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=94=BF?= <3443290081@qq.com> Date: Tue, 17 Mar 2026 11:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/local/mysql.yml | 2 +- .../pojo/dto/dataModel/UserModelContentDTO.java | 8 -------- .../com/sz/admin/monitor/pojo/po/AlgorithmTask.java | 7 +------ .../main/java/com/sz/admin/monitor/pojo/po/Camera.java | 7 +------ .../com/sz/admin/monitor/pojo/po/CameraSnapshot.java | 6 ------ .../main/java/com/sz/admin/monitor/pojo/po/Preset.java | 7 +------ .../sz/admin/monitor/pojo/po/UserModelContentDO.java | 10 ---------- .../monitor/service/impl/IpChannelServiceImpl.java | 3 +-- 8 files changed, 5 insertions(+), 45 deletions(-) diff --git a/config/local/mysql.yml b/config/local/mysql.yml index 3f603b3..e0bf6bc 100644 --- a/config/local/mysql.yml +++ b/config/local/mysql.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:13306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java index 2a70ad2..b2d2789 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java @@ -35,12 +35,4 @@ public class UserModelContentDTO { * 模型内容 */ private String modelContentId; - /** - * 添加时间 - */ - private Date addTime; - /** - * 修改时间 - */ - private Date updateTime; } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/AlgorithmTask.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/AlgorithmTask.java index b941a71..2dda545 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/AlgorithmTask.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/AlgorithmTask.java @@ -71,12 +71,7 @@ public class AlgorithmTask implements Serializable { @Column(typeHandler = JacksonTypeHandler.class) private JsonNode userData; - /** - * 逻辑删除标识：0-正常，1-已删除 - */ - @Column(isLogicDelete = true) - @Schema(description = "是否删除") - private String isDeleted; + /** * 创建时间 diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Camera.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Camera.java index 0f0c7d6..8b5b8a6 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Camera.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Camera.java @@ -79,12 +79,7 @@ public class Camera implements Serializable { @Schema(description = "在线状态：1-在线, 0-离线") private Integer status; - /** - * 逻辑删除标识：0-正常，1-已删除 - */ - @Column(isLogicDelete = true) - @Schema(description = "是否删除") - private String isDeleted; + @Schema(description = "创建时间") private LocalDateTime createTime; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CameraSnapshot.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CameraSnapshot.java index 80e482c..e73d124 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CameraSnapshot.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CameraSnapshot.java @@ -45,12 +45,6 @@ public class CameraSnapshot implements Serializable { @Schema(description = "0-正常, 1-移位") private Integer isAbnormal; - /** - * 逻辑删除标识：0-正常，1-已删除 - */ - @Column(isLogicDelete = true) - @Schema(description = "是否删除") - private String isDeleted; @Schema(description = "抓拍时间") private LocalDateTime createTime; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Preset.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Preset.java index 153e786..fbd24e4 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Preset.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Preset.java @@ -44,12 +44,7 @@ public class Preset { @Schema(description = "上报的url") private String presetUrl; - /** - * 逻辑删除标识：0-正常，1-已删除 - */ - @Column(isLogicDelete = true) - @Schema(description = "是否删除") - private String isDeleted; + @Schema(description = "创建时间") private LocalDateTime createdTime; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java index 7a4b8b3..4df0188 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java @@ -45,16 +45,6 @@ public class UserModelContentDO implements Serializable { */ @Schema(description = "模型内容") private String modelContentId; - /** - * 添加时间 - */ - @Schema(description = "添加时间") - private Date addTime; - /** - * 修改时间 - */ - @Schema(description = "修改时间") - private Date updateTime; public static final String ID="id"; public static final String USER_ID="user_id"; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/IpChannelServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/IpChannelServiceImpl.java index 1431dd2..3d1e8c0 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/IpChannelServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/IpChannelServiceImpl.java @@ -194,7 +194,7 @@ public class IpChannelServiceImpl extends ServiceImpl impl if (hcPlayControlEnum == null) { throw new BusinessException(AdminResponseEnum.DEVICE_PTZ_CONTROL_FAIL, null, "PTZ控制失败"); } - return manageNVR.ptzCon(id.intValue(), hcPlayControlEnum.getCode().toString(), String.valueOf(speed), String.valueOf(startFlag)); + return manageNVR. ptzCon(id.intValue(), hcPlayControlEnum.getCode().toString(), String.valueOf(speed), String.valueOf(startFlag)); } @Override @@ -336,7 +336,6 @@ public class IpChannelServiceImpl extends ServiceImpl impl algorithmTaskDTO.setUserData(userDataDto); // DTO转PO AlgorithmTask algorithmTask = BeanCopyUtils.copy(algorithmTaskDTO, AlgorithmTask.class); - algorithmTask.setIsDeleted("F"); algorithmTask.setCreateTime(createTime); ObjectMapper mapper = new ObjectMapper(); try {