iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -71,9 +71,9 @@ @Operation(summary = "添加调度建议") Boolean createScheduleSuggest(@RequestBody ScheduleSuggestRespDTO dto); @GetMapping(PREFIX + "/schedule-suggest/list") @PostMapping(PREFIX + "/schedule-suggest/list") @Operation(summary = "获取调度建议列表") List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestParam Map<String, Object> params); List<ScheduleSuggestRespDTO> listScheduleSuggest(@RequestBody ScheduleSuggestReqDTO vo); @PostMapping(PREFIX + "/predict-model-setting/modify") @Operation(summary = "修改预测模型设置参数") iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/ScheduleSuggestReqDTO.java
@@ -24,7 +24,7 @@ private String modelId; @Schema(description = "调整对象") private String adjustObj; private String scheduleObj; @Schema(description = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -599,8 +599,8 @@ } @Override public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) { return Collections.emptyList(); public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO vo) { return stScheduleSuggestService.list(vo); } @Override iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -144,13 +144,20 @@ } @GetMapping("/schedule-suggest/last-limit") @Operation(summary = "根据监控对象获取最新预警信息") @Operation(summary = "根据监控对象获取最新调度建议") public CommonResult<List<ScheduleSuggestRespDTO>> getLastLimitScheduleSuggest(HttpServletResponse response, HttpServletRequest request, @RequestParam("scheduleObj") String scheduleObj, @RequestParam("limit") Integer limit) { List<ScheduleSuggestRespDTO> data = mcsApi.getLastLimitScheduleSuggest(scheduleObj, limit); return CommonResult.success(data); } @PostMapping("/schedule-suggest/list") @Operation(summary = "获取调度建议") public CommonResult<List<ScheduleSuggestRespDTO>> listScheduleSuggest(@RequestBody ScheduleSuggestReqDTO vo) { List<ScheduleSuggestRespDTO> list = mcsApi.listScheduleSuggest(vo); return CommonResult.success(list); } @PostMapping("/alarm-suggest/page") @Operation(summary = "获取预警信息和调度建议分页列表") public CommonResult<PageResult<StAlarmAndSuggestRespVO>> getAlarmAndSuggestPage(@RequestBody StAlarmAndSuggestPageReqVO reqVO) { iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StScheduleSuggestService.java
@@ -2,6 +2,8 @@ import com.iailab.framework.common.pojo.PageResult; import com.iailab.framework.common.service.BaseService; import com.iailab.module.model.api.mcs.dto.ScheduleSuggestReqDTO; import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO; import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity; import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestPageReqVO; import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO; @@ -30,4 +32,6 @@ List<StScheduleSuggestEntity> getList(String scheduleObj, Integer limit); void cleanScheduleSuggest(Map<String, Date> tMap); List<ScheduleSuggestRespDTO> list(ScheduleSuggestReqDTO vo); } iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java
@@ -4,12 +4,16 @@ 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.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 java.util.Date; @@ -69,4 +73,13 @@ 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); } }