|
|
@@ -1585,19 +1585,8 @@ public class AsyncTask {
|
|
|
BigDecimal cscodGkz = normConfig.getCscodGkz();
|
|
|
BigDecimal jsSlq = tXinyiIndustry.getJsSlq();
|
|
|
BigDecimal jsslSjz = normConfig.getJsslSjz();
|
|
|
- BigDecimal cszlBzz = normConfig.getCszlBzz();
|
|
|
- BigDecimal cszlGkz = normConfig.getCszlGkz();
|
|
|
- BigDecimal cszzBzz = normConfig.getCszzBzz();
|
|
|
- BigDecimal cszzGkz = normConfig.getCszzGkz();
|
|
|
- BigDecimal csadBzz = normConfig.getCsadBzz();
|
|
|
- BigDecimal csadGkz = normConfig.getCsadGkz();
|
|
|
- BigDecimal csSSBzz = normConfig.getCsssBzz();
|
|
|
- BigDecimal csssGkz = normConfig.getCsssGkz();
|
|
|
- BigDecimal jszlSjz = normConfig.getJszlSjz();
|
|
|
BigDecimal jszdSjz = normConfig.getJszdSjz();
|
|
|
- BigDecimal jscodSjz = normConfig.getJscodSjz();
|
|
|
BigDecimal jsadSjz = normConfig.getJsadSjz();
|
|
|
- BigDecimal jsSSSjz = normConfig.getJsssSjz();
|
|
|
|
|
|
//2025年02月20日11:19:17 累计的断点数量
|
|
|
int breakpointCount = 0;
|
|
|
@@ -1606,15 +1595,8 @@ public class AsyncTask {
|
|
|
List<TXinyiWarningRecord> noChangeList = new ArrayList<>();//连续不变集合
|
|
|
//2025年02月27日16:17:47 标识进出水的指标是否可以进行后续的报警
|
|
|
boolean csCodExecute = true;
|
|
|
- boolean csZLExecute = true;
|
|
|
- boolean csZDExecute = true;
|
|
|
- boolean csADExecute = true;
|
|
|
- boolean csSSExecute = true;
|
|
|
- boolean jsZLExecute = true;
|
|
|
- boolean jsCodExecute = true;
|
|
|
boolean jsZDExecute = true;
|
|
|
boolean jsADExecute = true;
|
|
|
- boolean jsSSExecute = true;
|
|
|
|
|
|
//出水cod超标报警
|
|
|
WarningMoreExceed warningMoreExceed = handleXinYiWarningsCsMore(cscodBzz, csCod, cscodGkz, CS_COD.getCode(), tXinyiIndustry, normConfig, getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsCod(), jsslSjz, normConfig.getJscodSjz()));
|
|
|
@@ -1699,24 +1681,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
|
|
@@ -1727,7 +1695,7 @@ public class AsyncTask {
|
|
|
closeWarning(tXinyiWarningRecord);
|
|
|
}
|
|
|
}
|
|
|
- }else{
|
|
|
+ }else{//存在多个指标断点的情况
|
|
|
//逻辑调整：要按指标报多指标断点 需要当前的集合和原来的集合判断，新的报警增加，如果之前有了报警则不处理
|
|
|
if(CollectionUtils.isEmpty(tXinyiWarningRecords)){
|
|
|
//新增的断点的数据全部都报警
|
|
|
@@ -1737,24 +1705,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
|
|
@@ -1781,24 +1735,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
|
|
@@ -1894,24 +1834,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
|
|
@@ -1922,7 +1848,7 @@ public class AsyncTask {
|
|
|
closeWarning(tXinyiWarningRecord);
|
|
|
}
|
|
|
}
|
|
|
- }else{
|
|
|
+ }else{//本地有多个连续不变的报警
|
|
|
//逻辑调整：要按指标报多指标断点 需要当前的集合和原来的集合判断，新的报警增加，如果之前有了报警则不处理
|
|
|
if(CollectionUtils.isEmpty(tXinyiWarningNoChangeMoreRecords)){
|
|
|
//新增的断点的数据全部都报警
|
|
|
@@ -1932,24 +1858,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
|
|
@@ -1976,24 +1888,10 @@ public class AsyncTask {
|
|
|
//额外判断当前的异常是哪个指标，并处理标识
|
|
|
if(BusinessEnum.WarningCategoryEnum.CS_COD.getCode().equals(category)){
|
|
|
csCodExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZL.getCode().equals(category)){
|
|
|
- csZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_ZD.getCode().equals(category)){
|
|
|
- csZDExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_AD.getCode().equals(category)){
|
|
|
- csADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.CS_SS.getCode().equals(category)){
|
|
|
- csSSExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_ZL.getCode().equals(category)){
|
|
|
- jsZLExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_COD.getCode().equals(category)){
|
|
|
- jsCodExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_ZD.getCode().equals(category)){
|
|
|
jsZDExecute = false;
|
|
|
}else if(BusinessEnum.WarningCategoryEnum.JS_AD.getCode().equals(category)){
|
|
|
jsADExecute = false;
|
|
|
- }else if(BusinessEnum.WarningCategoryEnum.JS_SS.getCode().equals(category)){
|
|
|
- jsSSExecute = false;
|
|
|
}else{
|
|
|
log.error("处理是否后续报警的报警类型是不支持的类型");
|
|
|
throw new ServiceException("处理是否后续报警的报警类型是不支持的类型");
|
