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

@@ -79,6 +79,8 @@

    private static final String CODE_CONS = "consumpOxygenTest";

    private static final String CODE_OXYGEN = "shaOxygenPlanDetection";

    @Override
    public void run(String params) {
        logger.info("RunScheduleOnaOptTask，参数为：{}", params);
@@ -149,7 +151,7 @@

                    String advice = entry.getValue().getResult().get("advice").toString();
                    if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
                        saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate());
                        saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate(), scheduleScheme.getModelId(), scheduleScheme.getId());
                    }

                } else if (entry.getKey().equals(CODE01)) {
@@ -165,8 +167,19 @@
                }else if (entry.getKey().equals(CODE_CONS)) {
                    StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE_CONS);
                    String scheduleObj = scheduleScheme.getScheduleObj();
                    BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("advicevalues").toString());
                    BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("adviceValues").toString());
                    logger.info("耗氧异常检测 adviceValues=" + adviceValues);

                    String advice = entry.getValue().getResult().get("advice").toString();
                    if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
                        saveAlarmMessage("耗氧异常检测", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate());
                    }
                }
                else if (entry.getKey().equals(CODE_OXYGEN)) {
                    StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE_OXYGEN);
                    String scheduleObj = scheduleScheme.getScheduleObj();
                    BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("adviceValues").toString());
                    logger.info("耗氧异常检测（检修计划检测） adviceValues=" + adviceValues);

                    String advice = entry.getValue().getResult().get("advice").toString();
                    if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
@@ -197,7 +210,7 @@
        mcsApi.createScheduleSuggest(suggest);
    }

    private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate) {
    private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate, String modelId,  String schemeId) {
        if (StringUtils.isBlank(content)) {
            logger.info(title + "调整值为空，不产生建议");
            return;
@@ -219,6 +232,8 @@
        suggest.setContent(content);
        suggest.setScheduleObj(scheduleObj);
        suggest.setScheduleTime(scheduleTime);
        suggest.setModelId(modelId);
        suggest.setSchemeId(schemeId);
        suggest.setSort(0);
        mcsApi.createScheduleSuggest(suggest);
    }