From e3612171f8cda9507ece64ab8f90b8ea6e6dc94e Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期五, 23 五月 2025 15:06:06 +0800
Subject: [PATCH] 新增忽略建议和取消建议原因
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java | 4 +---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java | 3 +++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java | 5 +++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java | 3 +++
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java | 3 +++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java | 3 ++-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java | 2 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 1 +
10 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java
index 6624e3d..8d63a38 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java
@@ -16,6 +16,9 @@
@Schema(description = "操作（已采纳,取消采纳，已忽略等）")
private String operate;
+ @Schema(description = "原因")
+ private String reason;
+
@Schema(description = "处理人ID")
private String handlerId;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 88fb800..e6fd4b6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -1013,6 +1013,7 @@
public Boolean saveSuggestOperationRecord(SuggestOperationRecordReqVO reqVO) {
StSuggestOperationRecordReqVO operationRecordVo = new StSuggestOperationRecordReqVO();
operationRecordVo.setOperate(reqVO.getOperate());
+ operationRecordVo.setReason(reqVO.getReason());
operationRecordVo.setHandler(reqVO.getHandler());
operationRecordVo.setHandlerId(reqVO.getHandlerId());
//获取建议信息
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java
index caadc08..65a871f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java
@@ -15,7 +15,8 @@
public enum ScheduleSuggestStatusEnum {
S0(0, "未处理"),
- S1(1, "已采纳");
+ S1(1, "已采纳"),
+ S2(2, "已忽略");
private Integer code;
private String desc;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java
index e770e52..3dc1215 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java
@@ -69,6 +69,11 @@
private String operate;
/**
+ * 原因
+ */
+ private String reason;
+
+ /**
* 处理人ID
*/
private String handlerId;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java
index f2dab4a..861c99d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java
@@ -23,7 +23,7 @@
private String id;
/**
- * 模型ID
+ * 快照配置ID
*/
private String confId;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java
index 6cf4835..f4507f5 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java
@@ -8,10 +8,8 @@
import com.iailab.module.model.api.mcs.dto.ScheduleSuggestReqDTO;
import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
-import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO;
import com.iailab.module.model.common.enums.ScheduleSuggestStatusEnum;
import com.iailab.module.model.mcs.sche.dao.StScheduleSuggestDao;
-import com.iailab.module.model.mcs.sche.entity.StScheduleSchemeEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestPageReqVO;
@@ -109,7 +107,7 @@
public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
entity.setId(reqVO.getId());
- entity.setStatus(ScheduleSuggestStatusEnum.S0.getCode());
+ entity.setStatus(ScheduleSuggestStatusEnum.S2.getCode());
entity.setHandleTime(new Date());
baseDao.updateById(entity);
return true;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java
index 8908bd5..51c6f0c 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java
@@ -10,6 +10,7 @@
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.UUID;
@@ -29,6 +30,7 @@
public void create(StSuggestOperationRecordReqVO reqVo) {
StSuggestOperationRecordEntity entity = BeanUtils.toBean(reqVo, StSuggestOperationRecordEntity.class);
entity.setId(UUID.randomUUID().toString());
+ entity.setHandleTime(new Date());
baseDao.insert(entity);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java
index 68cade9..0d52f2e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java
@@ -45,6 +45,9 @@
@Schema(description = "操作（已采纳,取消采纳，已忽略等）")
private String operate;
+ @Schema(description = "原因")
+ private String reason;
+
@Schema(description = "处理人ID")
private String handlerId;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java
index 67560ac..0104b4d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java
@@ -47,6 +47,9 @@
@Schema(description = "操作（已采纳,取消采纳，已忽略等）")
private String operate;
+ @Schema(description = "原因")
+ private String reason;
+
@Schema(description = "处理人ID")
private String handlerId;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java
index 2bb615e..8d1c729 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java
@@ -14,7 +14,7 @@
@Schema(description = "ID")
private String id;
- @Schema(description = "模型ID")
+ @Schema(description = "快照配置ID")
private String confId;
@Schema(description = "数据类型（DATAPOINT,IND,PLAN,PREDICTITEM）")
--
Gitblit v1.9.3