From cf94db394cd239a0b51c95467511aa3cc752fe1f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 03 四月 2025 09:18:24 +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 | 5 +++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 5 +++--
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 6 +++---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 4 ++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
index 5186674..f1bbe8d 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -153,8 +153,8 @@
@Operation(summary = "获取")
List<Object[]> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO);
- @PostMapping(PREFIX + "/schedule-suggest/update-status")
- @Operation(summary = "修改调度建议状态")
- Boolean updateSuggestStatus(@RequestBody StAlarmAndSuggestReqVO reqVO);
+ @PostMapping(PREFIX + "/schedule-suggest/use-suggest")
+ @Operation(summary = "采纳建议")
+ Boolean useSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);
}
\ No newline at end of file
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 50f8413..d54714e 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
@@ -886,8 +886,8 @@
}
@Override
- public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO) {
- return stScheduleSuggestService.updateSuggestStatus(reqVO);
+ public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
+ return stScheduleSuggestService.useSuggest(reqVO);
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java
index de7c43b..c5abe36 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java
@@ -39,5 +39,5 @@
List<StScheduleSuggestEntity> getList(List<String> scheduleObjList, Date predictTime);
- Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO);
+ Boolean useSuggest(StAlarmAndSuggestReqVO reqVO);
}
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 45037e1..998bf44 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
@@ -96,10 +96,11 @@
}
@Override
- public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO) {
+ public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
entity.setId(reqVO.getId());
- entity.setStatus(reqVO.getStatus());
+ entity.setStatus(ScheduleSuggestStatusEnum.S1.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/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index 430c810..6c60377 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -78,7 +78,8 @@
Date dateTime = new Date();
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, true,
+ columnItem.getDataLength() > 1 ? (columnItem.getDataLength() - 1) : columnItem.getDataLength(), columnItem.getGranularity());
break;
case PLAN:
dateTime = originalTime;
@@ -111,7 +112,7 @@
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, true, 0, columnItem.getGranularity());
break;
case PLAN:
dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());
--
Gitblit v1.9.3