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 | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 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 b0276da..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
@@ -4,18 +4,24 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.common.util.object.BeanUtils;
+import com.iailab.framework.common.util.object.ConvertUtils;
+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.common.enums.ScheduleSuggestStatusEnum;
import com.iailab.module.model.mcs.sche.dao.StScheduleSuggestDao;
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;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
/**
* @author PanZhibao
@@ -34,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);
}
@@ -69,4 +74,59 @@
public void cleanScheduleSuggest(Map<String, Date> tMap) {
baseDao.cleanScheduleSuggest(tMap);
}
+
+ @Override
+ public List<ScheduleSuggestRespDTO> list(ScheduleSuggestReqDTO vo) {
+ QueryWrapper<StScheduleSuggestEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(StringUtils.isNotBlank(vo.getScheduleObj()),"schedule_obj", vo.getScheduleObj())
+ .ge(null != vo.getStartTime(),"schedule_time",vo.getStartTime())
+ .le(null != vo.getEndTime(),"schedule_time",vo.getEndTime());
+ return ConvertUtils.sourceToTarget(baseDao.selectList(queryWrapper),ScheduleSuggestRespDTO.class);
+ }
+
+ @Override
+ public List<StScheduleSuggestEntity> getList(List<String> scheduleObjList, Date predictTime) {
+ if (CollectionUtils.isEmpty(scheduleObjList)) {
+ return new ArrayList<>();
+ }
+ QueryWrapper<StScheduleSuggestEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("schedule_obj", scheduleObjList);
+ queryWrapper.eq("schedule_time", predictTime);
+ return baseDao.selectList(queryWrapper);
+ }
+
+ @Override
+ public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
+ StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
+ entity.setId(reqVO.getId());
+ entity.setStatus(ScheduleSuggestStatusEnum.S1.getCode());
+ entity.setHandleTime(new Date());
+ baseDao.updateById(entity);
+ return true;
+ }
+
+ @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());
+ 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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3