|
|
@@ -5856,7 +5856,7 @@ public class AsyncTask {
|
|
|
BigDecimal jsTn = tXinyiIndustryCurrent.getJsTn();
|
|
|
BigDecimal jsNh3 = tXinyiIndustryCurrent.getJsNh3();
|
|
|
BigDecimal jsCod = tXinyiIndustryCurrent.getJsCod();
|
|
|
- if(!Objects.isNull(currentVal) && !Objects.isNull(jsCod1) && !Objects.isNull(jsTn) && !Objects.isNull(jsNh3) && !Objects.isNull(jsTp)){
|
|
|
+ if(!Objects.isNull(currentVal) && !Objects.isNull(jsCod1) && !Objects.isNull(jsTn) && !Objects.isNull(jsNh3) && !Objects.isNull(jsCod)){
|
|
|
BigDecimal divide1 = currentVal.subtract(jsCod1).divide(jsCod1, NUMBER_SCALE_4, RoundingMode.HALF_UP);
|
|
|
//2025年04月16日14:28:55 触发条件修改： 触发条件：（现在-前一小时）/前一小时*100%> 70% and 进水总磷 > 7.1 and 进水总氮<65 and 进水氨氮< 58 and 进水总氮<65 and 进水cod<630
|
|
|
if(divide1.compareTo(compareVal) > 0 && currentVal.compareTo(BigDecimal.valueOf(7.1)) > 0 && jsTn.compareTo(BigDecimal.valueOf(65)) < 0
|
