|
@@ -50,6 +50,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.slibra.common.constant.MyConstants.*;
|
|
|
import static com.slibra.common.enums.BusinessEnum.BigModelWarningTypeRemarkEnum.TWO_YC_WARNING;
|
|
|
+import static com.slibra.common.enums.BusinessEnum.WarningCategoryEnum.CS_TP_YC;
|
|
|
|
|
|
/**
|
|
|
* 定时任务调度测试
|
|
@@ -1223,7 +1224,7 @@ public class RyTask
|
|
|
chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
|
|
|
chartsDataList.add(chartBasic);
|
|
|
}
|
|
|
- handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig, tXinyiRobot.getTpRccJqr(), tXinyiIndustry, chartsDataList, date);
|
|
|
+ handleXinYiWarningsYC(cszlBzz, split, cszlGkz, CS_TP_YC.getCode(), hour, normConfig, tXinyiRobot.getTpRccJqr(), tXinyiIndustry, chartsDataList, date);
|
|
|
}else if(BusinessEnum.BigModelForecastEnum.NH3.getCode().equals(task)){
|
|
|
//同时调用跃渊的预测接口 保存记录值
|
|
|
try {
|
|
@@ -1469,11 +1470,38 @@ public class RyTask
|
|
|
shWarningPrompt =shWarningPrompt.replace("#{2}", String.valueOf(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getWarningVal(), INT_2)));
|
|
|
shWarningPrompt =shWarningPrompt.replace("#{3}", String.valueOf(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getForecastVal(), INT_2)));*/
|
|
|
StringBuilder prompt = new StringBuilder(YC_WARNING_PROMPT_1);
|
|
|
- prompt.append(xinyiWarningRecord.getReason());
|
|
|
- prompt.append(YC_WARNING_PROMPT_2).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
- prompt.append(YC_WARNING_PROMPT_3).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
- prompt.append(YC_WARNING_PROMPT_4).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getForecastVal(), INT_2));
|
|
|
- prompt.append(YC_WARNING_PROMPT_5);
|
|
|
+ if(CS_TP_YC.getCode().equalsIgnoreCase(xinyiWarningRecord.getCategory())){
|
|
|
+ log.info("进入了需要特殊处理的预警:二沉池正磷酸盐");
|
|
|
+ prompt.append(xinyiWarningRecord.getReason());
|
|
|
+ prompt.append(YC_WARNING_PROMPT_2).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_3).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_4).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getForecastVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_6);
|
|
|
+ //查询最近7天的二沉池正磷酸盐数据
|
|
|
+ List<HashMap<String, Object>> list = this.xinyiRobotMapper.selectAvg7Datas();
|
|
|
+ if(!CollectionUtils.isEmpty(list)){
|
|
|
+ for (HashMap<String, Object> map : list) {
|
|
|
+ prompt.append(map.get("DATE")).append(map.get("VAL")).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ prompt.append(";");
|
|
|
+ prompt.append(YC_WARNING_PROMPT_7);
|
|
|
+ //查询最近7天的进水总磷数据
|
|
|
+ List<TXinyiDaily> tXinyiDailies = this.xinyiDailyMapper.selectNRecords(7);
|
|
|
+ if(!CollectionUtils.isEmpty(tXinyiDailies)){
|
|
|
+ for (TXinyiDaily tXinyiDaily : tXinyiDailies) {
|
|
|
+ prompt.append(tXinyiDaily.getTestDate()).append(tXinyiDaily.getJsTp()).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ prompt.append(";");
|
|
|
+ prompt.append(YC_WARNING_PROMPT_8);
|
|
|
+ }else{//
|
|
|
+ prompt.append(xinyiWarningRecord.getReason());
|
|
|
+ prompt.append(YC_WARNING_PROMPT_2).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_3).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_4).append(DecimalUtils.getAbsAndScale(xinyiWarningRecord.getForecastVal(), INT_2));
|
|
|
+ prompt.append(YC_WARNING_PROMPT_5);
|
|
|
+ }
|
|
|
historyDates.add(prompt.toString());
|
|
|
// 获取输出流
|
|
|
ManagedChannel channel = null;
|