吉安感知网项目-后端
linwei
4 days ago d032522d3b4fcd78d5fe5cb32f50858d86fd81d1
fix(gd): 移除操作时间参数验证并使用当前时间

- 移除了 GdClueDisposeRecordAddParam 中 operateTime 字段的 @NotNull 验证注解
- 删除了服务层中对操作时间为空的业务逻辑校验
- 将记录创建时的操作时间统一设置为系统当前时间
- 确保所有处置记录的时间戳保持一致性和准确性
2 files modified
12 ■■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdClueDisposeRecordAddParam.java 3 ●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueDisposeRecordServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdClueDisposeRecordAddParam.java
@@ -67,7 +67,6 @@
    /**
     * 实际操作时间(必填)
     */
    @NotNull(message = "操作时间不能为空")
    @ApiModelProperty(value = "实际操作时间", required = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date operateTime;
@@ -93,4 +92,4 @@
    @ApiModelProperty(value = "目标事件状态(当updateEventStatus=true时必填)")
    private Integer targetEventStatus;
}
}
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueDisposeRecordServiceImpl.java
@@ -113,9 +113,6 @@
        if (addParam.getRecordType() == null) {
            throw new RuntimeException("记录类型不能为空");
        }
        if (addParam.getOperateTime() == null) {
            throw new RuntimeException("操作时间不能为空");
        }
        // 2. 查询事件信息
        GdClueEventEntity eventEntity = gdClueEventService.getById(addParam.getEventId());
@@ -154,7 +151,7 @@
                    oldStatus,
                    addParam.getTargetEventStatus(),
                    addParam.getDisposeContent(),
                    addParam.getOperateTime()
                    new Date()
            );
        }
@@ -164,7 +161,7 @@
        recordEntity.setRecordType(addParam.getRecordType());
        recordEntity.setDisposeContent(addParam.getDisposeContent());
        recordEntity.setAttachUrl(addParam.getAttachUrl());
        recordEntity.setOperateTime(addParam.getOperateTime());
        recordEntity.setOperateTime(new Date());
        recordEntity.setDisposeStatus(eventEntity.getEventStatus());
        recordEntity.setDisposeUser(AuthUtil.getUserId());
        recordEntity.setDisposeDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -176,4 +173,4 @@
        return save(recordEntity);
    }
}
}