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

@@ -1,6 +1,5 @@
package com.iailab.module.shasteel.job.task;

import com.alibaba.fastjson.JSONArray;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
@@ -120,29 +119,30 @@
                    // 氧气系统优化调度决策
                    StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE05);
                    String scheduleObj = scheduleScheme.getScheduleObj();
                    String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
                    /*String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
                    String faAdvice = entry.getValue().getResult().get("faAdvice").toString();
                    String hongAdvice = entry.getValue().getResult().get("hongAdvice").toString();
                    String runAdvice = entry.getValue().getResult().get("runAdvice").toString();
                    JSONArray adviceValues = JSONArray.parseArray(entry.getValue().getResult().get("adviceValues").toString());
                    List<BigDecimal> adviceValueList = new ArrayList<>();
                    if (!CollectionUtils.isEmpty(adviceValues)) {
                        for (int i = 0; i < adviceValues.size(); i++) {
                            adviceValueList.add(new BigDecimal(adviceValues.get(i).toString()));
                        }
                    }
                    if(!yingdiAdvice.equals("压力正常")){
                        saveScheduleSuggest("盈德中压调整建议", yingdiAdvice, scheduleObj, scheduleTime, adviceValueList.get(0), scheduleScheme.getAdjustRate());
                        saveScheduleSuggest("盈德中压调整建议", yingdiAdvice, scheduleObj, scheduleTime);
                    }
                    if(!faAdvice.equals("压力正常")){
                        saveScheduleSuggest("法夜空调整建议", faAdvice, scheduleObj, scheduleTime, adviceValueList.get(1), scheduleScheme.getAdjustRate());
                        saveScheduleSuggest("法夜空调整建议", faAdvice, scheduleObj, scheduleTime);
                    }
                    if(!hongAdvice.equals("压力正常")){
                        saveScheduleSuggest("宏昌调整建议", hongAdvice, scheduleObj, scheduleTime, adviceValueList.get(2), scheduleScheme.getAdjustRate());
                        saveScheduleSuggest("宏昌调整建议", hongAdvice, scheduleObj, scheduleTime);
                    }
                    if(!runAdvice.equals("压力正常")){
                        saveScheduleSuggest("润忠调整建议", runAdvice, scheduleObj, scheduleTime, adviceValueList.get(3), scheduleScheme.getAdjustRate());
                        saveScheduleSuggest("润忠调整建议", runAdvice, scheduleObj, scheduleTime);
                    }*/

                    double[][] adviceValues = (double[][])entry.getValue().getResult().get("adviceValues");
                    logger.info("adviceValues=" + Arrays.toString(adviceValues));
                    String advice = entry.getValue().getResult().get("advice").toString();
                    if(!advice.contains("压力正常")){
                        saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, new BigDecimal(adviceValues[0][0]), scheduleScheme.getAdjustRate());
                    }

                } else if (entry.getKey().equals(CODE01)) {
                    StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE05);
                    String scheduleObj = scheduleScheme.getScheduleObj();
@@ -162,6 +162,7 @@

    private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime) {
        if (StringUtils.isBlank(content)) {
            logger.info(title + "调整值为空，不产生建议");
            return;
        }

@@ -176,19 +177,20 @@

    private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate) {
        if (StringUtils.isBlank(content)) {
            logger.info(title + "调整值为空，不产生建议");
            return;
        }
        if (adjustValue == null || adjustValue.doubleValue() == 0) {
            logger.info(title + "调整值为空，不产生建议");
            return;
        }
        if (gasAdjustMode.containsKey(scheduleObj) && gasAdjustMode.get(scheduleObj).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
                gasLastSugTime.containsKey(scheduleObj) && (scheduleTime.getTime() - gasLastSugTime.get(scheduleObj).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
        if (gasAdjustMode.containsKey(title) && gasAdjustMode.get(title).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
                gasLastSugTime.containsKey(title) && (scheduleTime.getTime() - gasLastSugTime.get(title).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
            logger.info("调整建议在有效期内");
            return;
        }
        gasAdjustMode.put(scheduleObj,  adjustValue.compareTo(BigDecimal.ZERO));
        gasLastSugTime.put(scheduleObj, scheduleTime);
        gasAdjustMode.put(title,  adjustValue.compareTo(BigDecimal.ZERO));
        gasLastSugTime.put(title, scheduleTime);

        ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
        suggest.setTitle(title);