|
@@ -568,16 +568,16 @@ public class AsyncTask {
|
|
//污泥负荷=[Ls]=24*([BOD_in]-[BOD_off])*[Q_in]/[MLSS]/([V_hao]+[V_que]+[V_yan])/2 kgBOD/(kgMLSS·d)
|
|
//污泥负荷=[Ls]=24*([BOD_in]-[BOD_off])*[Q_in]/[MLSS]/([V_hao]+[V_que]+[V_yan])/2 kgBOD/(kgMLSS·d)
|
|
//2024年6月27日17:18:33 直接从计算结果拿到
|
|
//2024年6月27日17:18:33 直接从计算结果拿到
|
|
BigDecimal fm = xinyiCalculate.getFM();
|
|
BigDecimal fm = xinyiCalculate.getFM();
|
|
- //todo 污泥负荷内控下限值 没有(先用上限制)
|
|
|
|
- BigDecimal wnfhnkSxz = normConfig.getWnfhnkSxz();
|
|
|
|
- if(!Objects.isNull(fm) && !Objects.isNull(wnfhnkSxz)){
|
|
|
|
- handleXinYiWarningsSH(wnfhnkSxz, fm, BusinessEnum.WarningCategoryEnum.WNFH.getCode(), tXinyiIndustry, normConfig, true);
|
|
|
|
|
|
+ //2024年6月28日17:17:03 已经配置了新的
|
|
|
|
+ BigDecimal wnfhnkXxz = normConfig.getWnfhnkXxz();
|
|
|
|
+ if(!Objects.isNull(fm) && !Objects.isNull(wnfhnkXxz)){
|
|
|
|
+ handleXinYiWarningsSH(wnfhnkXxz, fm, BusinessEnum.WarningCategoryEnum.WNFH.getCode(), tXinyiIndustry, normConfig, true);
|
|
}
|
|
}
|
|
|
|
|
|
//万吨水产泥率(todo 没有计算规则,只能从日报获取)
|
|
//万吨水产泥率(todo 没有计算规则,只能从日报获取)
|
|
|
|
|
|
|
|
|
|
- //挥发性污泥浓度占比(VSS/SS)
|
|
|
|
|
|
+ //挥发性污泥浓度占比(MLVSS/MLSS)
|
|
//特殊:小于
|
|
//特殊:小于
|
|
BigDecimal hfxwnndzb = xinyiCalculate.getHFXWNNDZB();
|
|
BigDecimal hfxwnndzb = xinyiCalculate.getHFXWNNDZB();
|
|
BigDecimal hfxwnndzbSjz = normConfig.getHfxwnndzbSjz();
|
|
BigDecimal hfxwnndzbSjz = normConfig.getHfxwnndzbSjz();
|
|
@@ -626,15 +626,23 @@ public class AsyncTask {
|
|
handleXinYiWarningsSH(hycrjyNkz, shcHyTwoDo, BusinessEnum.WarningCategoryEnum.HYQDO_TWO.getCode(), tXinyiIndustry, normConfig, true);
|
|
handleXinYiWarningsSH(hycrjyNkz, shcHyTwoDo, BusinessEnum.WarningCategoryEnum.HYQDO_TWO.getCode(), tXinyiIndustry, normConfig, true);
|
|
}
|
|
}
|
|
|
|
|
|
- //气水比(需要从日报获取数据)
|
|
|
|
- /*BigDecimal gfjgzts = normConfig.getGFJGZTS();
|
|
|
|
- BigDecimal gfjckll = normConfig.getGFJCKLL();
|
|
|
|
- BigDecimal shcqbSjz = normConfig.getShcqbSjz();
|
|
|
|
- if(!Objects.isNull(gfjgzts) && !Objects.isNull(gfjckll) && !Objects.isNull(shcqbSjz) && !Objects.isNull(jsSlq)){
|
|
|
|
- BigDecimal qsb = gfjgzts.multiply(gfjckll).divide(jsSlq, 4, RoundingMode.HALF_UP);
|
|
|
|
- BigDecimal shcqbNkz = normConfig.getShcqbNkz();
|
|
|
|
- handleXinYiWarningsSH(shcqbSjz, qsb, shcqbNkz, BusinessEnum.WarningCategoryEnum.WHLB.getCode(), tXinyiIndustry, normConfig);
|
|
|
|
- }*/
|
|
|
|
|
|
+ //气水比(暂时没有计算)todo
|
|
|
|
+
|
|
|
|
+ //二沉池表面负荷
|
|
|
|
+ BigDecimal eccBmfh = xinyiCalculate.getEccBmfh();
|
|
|
|
+ BigDecimal eccbmfhznkzXxz = normConfig.getEccbmfhznkzXxz();
|
|
|
|
+ if(!Objects.isNull(eccBmfh) && !Objects.isNull(eccbmfhznkzXxz)){
|
|
|
|
+ handleXinYiWarningsSH(eccbmfhznkzXxz, eccBmfh, BusinessEnum.WarningCategoryEnum.ECC_BMFH.getCode(), tXinyiIndustry, normConfig, true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //二沉池固体负荷
|
|
|
|
+ BigDecimal eccGtfh = xinyiCalculate.getEccGtfh();
|
|
|
|
+ BigDecimal eccgtfhnkxxz = normConfig.getECCGTFHNKXXZ();
|
|
|
|
+ if(!Objects.isNull(eccGtfh) && !Objects.isNull(eccgtfhnkxxz)){
|
|
|
|
+ handleXinYiWarningsSH(eccgtfhnkxxz, eccGtfh, BusinessEnum.WarningCategoryEnum.ECC_GTFH.getCode(), tXinyiIndustry, normConfig, true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //反冲洗水量(暂时没有计算)todo
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|