shasteel-biz/src/main/java/com/iailab/module/shasteel/api/controller/admin/DataController.java

@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
@@ -62,8 +63,10 @@
    );
    @GetMapping("/alarm-suggest/page")
    @Operation(summary = "预警与建议信息")
    public CommonResult<PageResult<StAlarmAndSuggestRespVO>> queryAlarmAndSuggestPage() {
    public CommonResult<PageResult<StAlarmAndSuggestRespVO>> queryAlarmAndSuggestPage(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
        StAlarmAndSuggestPageReqVO reqVO = new StAlarmAndSuggestPageReqVO();
        reqVO.setPageNo(pageNo);
        reqVO.setPageSize(pageSize);
        reqVO.setTitle(titleList);
        reqVO.setContentKey(contentKeyList);
        PageResult<StAlarmAndSuggestRespVO> page = mcsApi.getAlarmAndSuggestPage(reqVO);

 shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleO2ExecuteTask.java

对比新文件
@@ -0,0 +1,94 @@
package com.iailab.module.shasteel.job.task;

import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.AlarmMessageRespDTO;
import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
import com.iailab.module.model.enums.ScheduleTriggerMethodEnum;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import java.util.*;

/**
 * 氧气优化指标
 * 定时触发，30 0/1 * * * ?
 *
 * @author Jay
 */
@Component("runScheduleO2ExecuteTask")
public class RunScheduleO2ExecuteTask implements ITask {
    private Logger logger = LoggerFactory.getLogger(getClass());

    @Autowired
    private McsApi mcsApi;

    @Autowired
    private MdkApi mdkApi;

    @Override
    public void run(String params) {
        logger.info("RunScheduleO2ExecuteTask，参数为：{}", params);
        try {
            Calendar calendar = Calendar.getInstance();
            calendar.set(Calendar.MILLISECOND, 0);
            calendar.set(Calendar.SECOND, 0);
            Date scheduleTime = calendar.getTime();
            if (StringUtils.isEmpty(params)) {
                logger.info("参数为空");
                return;
            }

            // 根据条件查找方案
            List<StScheduleSchemeDTO> schemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.JOB.getCode(), params);
            if (CollectionUtils.isEmpty(schemeList)) {
                logger.info("方案为空");
                return;
            }
            for (StScheduleSchemeDTO scheme : schemeList) {
                MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
                dto.setScheduleTime(scheduleTime);
                dto.setScheduleCode(scheme.getCode());
                MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
                if (mdkScheduleRespDTO.getResult().get("faWarning") != null &&
                        StringUtils.isNotEmpty(mdkScheduleRespDTO.getResult().get("faWarning").toString())) {
                    this.saveAlarmMessage("法液空合同执行度", mdkScheduleRespDTO.getResult().get("faWarning"), scheme.getScheduleObj(), scheduleTime);
                }
                if (mdkScheduleRespDTO.getResult().get("yingWarning") != null &&
                        StringUtils.isNotEmpty(mdkScheduleRespDTO.getResult().get("yingWarning").toString())) {
                    this.saveAlarmMessage("盈德合同执行度", mdkScheduleRespDTO.getResult().get("yingWarning"), scheme.getScheduleObj(), scheduleTime);
                }
            }
            logger.info(params + "调度方案执行完成");
        } catch (Exception ex) {
            logger.error("RunScheduleO2ExecuteTask运行异常");
            ex.printStackTrace();
        }
        logger.info("RunScheduleO2ExecuteTask运行完成");
    }

    private void saveAlarmMessage(String title, Object content, String scheduleObj, Date scheduleTime) {
        if (content == null) {
            logger.info(title + "预警信息为空，不产生预警");
            return;
        }
        String contentStr = content.toString();
        if (StringUtils.isBlank(contentStr)) {
            logger.info(title + "预警信息为空，不产生预警");
            return;
        }
        AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
        alarm.setTitle(title);
        alarm.setContent(contentStr);
        alarm.setAlarmObj(scheduleObj);
        alarm.setAlarmType("");
        alarm.setAlarmTime(scheduleTime);
        mcsApi.createAlarmMessage(alarm);
    }
}