|
@@ -3440,7 +3440,7 @@ public class AsyncTask {
|
|
|
}
|
|
|
|
|
|
//拼接决策的最近4小时的值
|
|
|
- String last4Str = this.getJsNh3StrByList(tXinyiIndustries);
|
|
|
+ String last4Str = this.getCsCodStrByList(tXinyiIndustries);
|
|
|
|
|
|
//报警设备故障
|
|
|
if (existsCsCodDeviceErr(csBzz, currentVal, category, tXinyiIndustry, normConfig, cwrwfhz, tXinyiIndustries, nowDate, last4Str, csGkz))
|
|
@@ -4210,7 +4210,7 @@ public class AsyncTask {
|
|
|
}
|
|
|
|
|
|
//拼接决策的最近8小时的值
|
|
|
- String last8Str = this.getJsNh3StrByList(tXinyiIndustries);
|
|
|
+ String last8Str = this.getJsTnStrByList(tXinyiIndustries);
|
|
|
|
|
|
//单点突变-异常升高报警
|
|
|
if (existsJsZDYCSG(jsBzz, currentVal, category, tXinyiIndustry, normConfig, cwrwfhz, tXinyiIndustries, nowDate, last8Str))
|
|
@@ -5499,6 +5499,36 @@ public class AsyncTask {
|
|
|
|
|
|
|
|
|
|
|
|
+ private String getJsTnStrByList(List<TXinyiIndustry> tXinyiIndustries) {
|
|
|
+// return StringUtil.join(tXinyiIndustries.stream().map(TXinyiIndustry::getJsNh3).collect(Collectors.toList()) , "mg/L、");
|
|
|
+ int size = tXinyiIndustries.size();
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (int i = 0; i < size; i++) {
|
|
|
+ TXinyiIndustry tXinyiIndustry = tXinyiIndustries.get(i);
|
|
|
+ if(i < size - 1)
|
|
|
+ sb.append(DecimalUtils.getAbsAndScale(tXinyiIndustry.getJsTn(), INT_2)).append("mg/L、");
|
|
|
+ else
|
|
|
+ sb.append(DecimalUtils.getAbsAndScale(tXinyiIndustry.getJsTn(), INT_2)).append("mg/L。");
|
|
|
+ }
|
|
|
+ return sb.toString();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ private String getCsCodStrByList(List<TXinyiIndustry> tXinyiIndustries) {
|
|
|
+// return StringUtil.join(tXinyiIndustries.stream().map(TXinyiIndustry::getJsNh3).collect(Collectors.toList()) , "mg/L、");
|
|
|
+ int size = tXinyiIndustries.size();
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (int i = 0; i < size; i++) {
|
|
|
+ TXinyiIndustry tXinyiIndustry = tXinyiIndustries.get(i);
|
|
|
+ if(i < size - 1)
|
|
|
+ sb.append(DecimalUtils.getAbsAndScale(tXinyiIndustry.getCsCod(), INT_2)).append("mg/L、");
|
|
|
+ else
|
|
|
+ sb.append(DecimalUtils.getAbsAndScale(tXinyiIndustry.getCsCod(), INT_2)).append("mg/L。");
|
|
|
+ }
|
|
|
+ return sb.toString();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
private String getJsNh3StrByList(List<TXinyiIndustry> tXinyiIndustries) {
|
|
|
// return StringUtil.join(tXinyiIndustries.stream().map(TXinyiIndustry::getJsNh3).collect(Collectors.toList()) , "mg/L、");
|
|
|
int size = tXinyiIndustries.size();
|