From fbe8d4c023163130e498c2b51c8bdebab6c0fbf2 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 16 四月 2025 11:35:29 +0800 Subject: [PATCH] 自动调整 放到MdkApi中 --- iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/MdkApi.java | 5 +++++ iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 4 ---- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 8 -------- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 10 ++++++++++ 4 files changed, 15 insertions(+), 12 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 87c6276..f3c1584 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 @@ -161,10 +161,6 @@ @Operation(summary = "获取15分钟内最新预警建议信息") List<ScheduleSuggestRespDTO> getLastSuggest(@RequestParam Map<String, Object> params); - @PostMapping(PREFIX + "/predict-item/autoAdjustByCode") - @Operation(summary = "自动调整") - Boolean autoAdjustByCode(@RequestBody MmPredictAutoAdjustReqVO reqVO); - @PostMapping(PREFIX + "/predict-data/time-value") @Operation(summary = "根据预测时间获取最后预测值") Map<String, BigDecimal> getPredictValueByTime(PredictLastValueReqVO reqVO); diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/MdkApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/MdkApi.java index 541d1dc..ef95ca2 100644 --- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/MdkApi.java +++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/MdkApi.java @@ -1,5 +1,6 @@ package com.iailab.module.model.api.mdk; +import com.iailab.module.model.api.mcs.dto.MmPredictAutoAdjustReqVO; import com.iailab.module.model.api.mdk.dto.*; import com.iailab.module.model.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; @@ -48,4 +49,8 @@ @PostMapping(PREFIX + "/schedule-model/out") @Operation(summary = "调度模型数据下发") Boolean scheduleModelOut(@RequestBody MdkScheduleRespDTO dto); + + @PostMapping(PREFIX + "/predict-item/autoAdjustByCode") + @Operation(summary = "预测自动调整") + Boolean autoAdjustByCode(@RequestBody MmPredictAutoAdjustReqVO reqVO); } 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 2640d3e..9da578f 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 @@ -117,9 +117,6 @@ @Autowired private StScheduleModelSettingService stScheduleModelSettingService; - - @Autowired - private MmPredictAutoAdjustConfigService autoAdjustService; private int HOUR_MINS = 60; @Override @@ -973,11 +970,6 @@ @Override public List<ScheduleSuggestRespDTO> getLastSuggest(Map<String, Object> params) { return stScheduleSuggestService.getLastSuggest(params); - } - - @Override - public Boolean autoAdjustByCode(MmPredictAutoAdjustReqVO reqVO) { - return autoAdjustService.autoAdjustByCode(reqVO.getConfigCode(), reqVO.getAdjustStartTime()); } 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/api/MdkApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java index 2df511e..af2698a 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.iailab.module.data.api.point.DataPointApi; import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO; +import com.iailab.module.model.api.mcs.dto.MmPredictAutoAdjustReqVO; import com.iailab.module.model.api.mcs.dto.StScheduleModelOutDTO; import com.iailab.module.model.api.mdk.MdkApi; import com.iailab.module.model.api.mdk.dto.*; @@ -13,6 +14,7 @@ import com.iailab.module.model.enums.PredictItemTypeEnum; import com.iailab.module.model.mcs.pre.entity.DmModuleEntity; import com.iailab.module.model.mcs.pre.service.DmModuleService; +import com.iailab.module.model.mcs.pre.service.MmPredictAutoAdjustConfigService; import com.iailab.module.model.mcs.pre.service.MmPredictItemService; import com.iailab.module.model.mcs.sche.entity.StAdjustConfigDetEntity; import com.iailab.module.model.mcs.sche.entity.StAdjustConfigEntity; @@ -80,6 +82,9 @@ @Autowired private RedisTemplate<String, Object> redisTemplate; + + @Autowired + private MmPredictAutoAdjustConfigService autoAdjustService; public static final long offset = 60 * 3L; @@ -409,4 +414,9 @@ } return true; } + + @Override + public Boolean autoAdjustByCode(MmPredictAutoAdjustReqVO reqVO) { + return autoAdjustService.autoAdjustByCode(reqVO.getConfigCode(), reqVO.getAdjustStartTime()); + } } \ No newline at end of file -- Gitblit v1.9.3