Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java

@@ -9,8 +9,6 @@
import com.iailab.module.ansteel.coking.entity.CokingTraceSuggestEntity;
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.ChartParamDTO;
import org.apache.commons.lang3.StringUtils;
@@ -58,12 +56,6 @@

    @Autowired
    private McsApi mcsApi;

    @Autowired
    private DataPointApi dataPointApi;

    @Autowired
    private IndItemApi indItemApi;

    private final static String process = "备煤工序";


 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java

@@ -9,8 +9,6 @@
import com.iailab.module.ansteel.coking.entity.CokingTraceSuggestEntity;
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.ChartParamDTO;
import org.apache.commons.lang3.StringUtils;
@@ -81,8 +79,7 @@
    }};

    private static final String jsonStr="{\"result\":{" +
            "      \"steamTotal1\":\"2#干熄焦蒸汽发生量因空气导入量偏高、锅炉入口温度偏低而减少13t，经模型计算，建议调整空气导入量，预计可使主蒸汽流量指标升高20m3/h\",\n" +
            "      \"steamTotal2\":\"2#干熄焦蒸汽发生量因空气导入量偏高、锅炉入口温度偏低而减少13m3/h，经模型计算，建议调整循环风机转速，预计可使主蒸汽流量指标升高32m3/h\",\n" +
            "      \"steamTotal\":\"2#干熄焦蒸汽发生量因空气导入量偏高、锅炉入口温度偏低而减少13t，经模型计算，建议调整空气导入量，预计可使主蒸汽流量指标升高20m3/h\",\n" +
            "      \"steamRow0\":[[14,20],[14,30],[14,35]],\n" +
            "      \"steamRow1\":[[10,5],[11,15],[21,20]],\n" +
            "      \"steamRow2\":[[74,8],[36,18],[35,34]],\n" +
@@ -173,18 +170,16 @@

    public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) {
        List<CokingTraceSuggestEntity> entityList = new ArrayList<>();
        for(int i=1;i<=2;i++){
            String steamTotal = result.get("steamTotal"+i).toString();
            if(StringUtils.isNotBlank(steamTotal)){
                CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
                suggestEntity.setRelId(relId);
                suggestEntity.setProcess(process);
                suggestEntity.setSugObj(i+"#");
                suggestEntity.setClock(clock);
                suggestEntity.setContent(steamTotal);
                suggestEntity.setCreateDate(new Date());
                entityList.add(suggestEntity);
            }
        String steamTotal = result.get("steamTotal").toString();
        if(StringUtils.isNotBlank(steamTotal)){
            CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
            suggestEntity.setRelId(relId);
            suggestEntity.setProcess(process);
            suggestEntity.setSugObj("GXJ");
            suggestEntity.setClock(clock);
            suggestEntity.setContent(steamTotal);
            suggestEntity.setCreateDate(new Date());
            entityList.add(suggestEntity);
        }
        cokingTraceSuggestService.insert(entityList);
    }
@@ -213,7 +208,7 @@
            entity.setRelId(relId);
            entity.setProcess(process);
            entity.setClock(clock);
            entity.setSugObj("");
            entity.setSugObj("GXJ");

            entity.setInd1Name(steamIndexMaps.get(rowArr.getJSONArray(0).get(0).toString()));
            entity.setInd1Value(rowArr.getJSONArray(0).get(1).toString());