From f5ec1f3326f75e18222859a534ed5a249f5e2cc3 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 04 六月 2025 17:35:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
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 f4507f5..beea74c 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
@@ -18,7 +18,10 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @author PanZhibao
@@ -37,7 +40,6 @@
@Override
public void create(StScheduleSuggestSaveReqVO createReqVO) {
StScheduleSuggestEntity entity = BeanUtils.toBean(createReqVO, StScheduleSuggestEntity.class);
- entity.setId(UUID.randomUUID().toString());
entity.setStatus(ScheduleSuggestStatusEnum.S0.getCode());
baseDao.insert(entity);
}
@@ -104,6 +106,16 @@
}
@Override
+ public Boolean cancelUseSuggest(StAlarmAndSuggestReqVO reqVO) {
+ StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
+ entity.setId(reqVO.getId());
+ entity.setStatus(ScheduleSuggestStatusEnum.S0.getCode());
+ entity.setHandleTime(new Date());
+ baseDao.updateById(entity);
+ return true;
+ }
+
+ @Override
public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
entity.setId(reqVO.getId());
--
Gitblit v1.9.3