From f590dc8f301dc87d11f125ad3b8f93e014c62782 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 04 六月 2025 17:19: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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 6cf4835..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
@@ -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;
@@ -20,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
@@ -39,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);
}
@@ -106,7 +106,7 @@
}
@Override
- public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
+ public Boolean cancelUseSuggest(StAlarmAndSuggestReqVO reqVO) {
StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
entity.setId(reqVO.getId());
entity.setStatus(ScheduleSuggestStatusEnum.S0.getCode());
@@ -116,6 +116,16 @@
}
@Override
+ public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
+ StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
+ entity.setId(reqVO.getId());
+ entity.setStatus(ScheduleSuggestStatusEnum.S2.getCode());
+ entity.setHandleTime(new Date());
+ baseDao.updateById(entity);
+ return true;
+ }
+
+ @Override
public List<ScheduleSuggestRespDTO> getLastSuggest(Map<String, Object> params) {
return baseDao.getLastSuggest(params);
}
--
Gitblit v1.9.3