|
@@ -35,6 +35,7 @@ import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
|
|
|
import static com.slibra.common.constant.MyConstants.*;
|
|
|
+import static com.slibra.common.enums.BusinessEnum.BigModelWarningTypeRemarkEnum.*;
|
|
|
import static com.slibra.common.enums.BusinessEnum.WarningCategoryEnum.*;
|
|
|
|
|
|
@Component
|
|
@@ -984,7 +985,7 @@ public class AsyncTask {
|
|
|
tXinyiWarningRecord.setControlVal(sjscgkz);
|
|
|
tXinyiWarningRecord.setCreateBy(WARNING_DEFAULT_CREATE);
|
|
|
tXinyiWarningRecord.setCreateTime(DateUtils.getNowDate());
|
|
|
- tXinyiWarningRecord.setRemark("1");
|
|
|
+ tXinyiWarningRecord.setRemark(ONE_SH_WARNING.getCode());
|
|
|
|
|
|
|
|
|
if(normal){
|
|
@@ -1448,15 +1449,15 @@ public class AsyncTask {
|
|
|
int count = DateUtils.differentHoursByMillisecond(warningTime, DateUtils.getNowDate()) + 1;
|
|
|
ShowValueSHBasic showValueSHBasic = new ShowValueSHBasic();
|
|
|
|
|
|
- showValueSHBasic.setH("在线仪表");
|
|
|
+ showValueSHBasic.setH(ZAIXIANYIBIAO);
|
|
|
showValueSHBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
}else if("1".equals(remark)){
|
|
|
- showValueSHBasic.setH("在线仪表");
|
|
|
+ showValueSHBasic.setH(ZAIXIANYIBIAO);
|
|
|
}else if("2".equals(remark)){
|
|
|
- showValueSHBasic.setH("预测");
|
|
|
+ showValueSHBasic.setH(YVCE);
|
|
|
|
|
|
}else {
|
|
|
- showValueSHBasic.setH("连续检测");
|
|
|
+ showValueSHBasic.setH(LIANXUJIANCE);
|
|
|
showValueSHBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
}*/
|
|
|
|
|
@@ -1505,21 +1506,21 @@ public class AsyncTask {
|
|
|
basic.put("告警级别", tXinyiWarningRecord.getLevel());*/
|
|
|
|
|
|
|
|
|
- if(category.contains("出水")
|
|
|
+ if(category.contains(CHUSHUI)
|
|
|
|| ROBOT_ECCZLSY.getCode().equalsIgnoreCase(category)
|
|
|
|| ROBOT_XSY_2.getCode().equalsIgnoreCase(category)
|
|
|
|| ROBOT_XSY_1.getCode().equalsIgnoreCase(category)){
|
|
|
ShowValueCSBasic showValueCSBasic = new ShowValueCSBasic();
|
|
|
- if("0".equals(remark)){
|
|
|
- showValueCSBasic.setH("在线仪表");
|
|
|
+ if(ZERO_SZ_WARNING.getCode().equals(remark)){
|
|
|
+ showValueCSBasic.setH(ZAIXIANYIBIAO);
|
|
|
showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
- }else if("1".equals(remark)){
|
|
|
- showValueCSBasic.setH("在线仪表");
|
|
|
- }else if("2".equals(remark)){
|
|
|
- showValueCSBasic.setH("预测");
|
|
|
+ }else if(ONE_SH_WARNING.getCode().equals(remark)){
|
|
|
+ showValueCSBasic.setH(ZAIXIANYIBIAO);
|
|
|
+ }else if(BusinessEnum.BigModelWarningTypeRemarkEnum.TWO_YC_WARNING.getCode().equals(remark)){
|
|
|
+ showValueCSBasic.setH(YVCE);
|
|
|
|
|
|
}else {
|
|
|
- showValueCSBasic.setH("连续检测");
|
|
|
+ showValueCSBasic.setH(LIANXUJIANCE);
|
|
|
showValueCSBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
}
|
|
|
|
|
@@ -1537,16 +1538,16 @@ public class AsyncTask {
|
|
|
result.put("basic", showValueCSBasic);
|
|
|
}else{
|
|
|
ShowValueJSBasic showValueJSBasic = new ShowValueJSBasic();
|
|
|
- if("0".equals(remark)){
|
|
|
- showValueJSBasic.setH("在线仪表");
|
|
|
+ if(ZERO_SZ_WARNING.getCode().equals(remark)){
|
|
|
+ showValueJSBasic.setH(ZAIXIANYIBIAO);
|
|
|
showValueJSBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
- }else if("1".equals(remark)){
|
|
|
- showValueJSBasic.setH("在线仪表");
|
|
|
- }else if("2".equals(remark)){
|
|
|
- showValueJSBasic.setH("预测");
|
|
|
+ }else if(ONE_SH_WARNING.getCode().equals(remark)){
|
|
|
+ showValueJSBasic.setH(ZAIXIANYIBIAO);
|
|
|
+ }else if(BusinessEnum.BigModelWarningTypeRemarkEnum.TWO_YC_WARNING.getCode().equals(remark)){
|
|
|
+ showValueJSBasic.setH(YVCE);
|
|
|
|
|
|
}else {
|
|
|
- showValueJSBasic.setH("连续检测");
|
|
|
+ showValueJSBasic.setH(LIANXUJIANCE);
|
|
|
showValueJSBasic.setF(tXinyiWarningRecord.getLevel());
|
|
|
}
|
|
|
|
|
@@ -1664,7 +1665,7 @@ public class AsyncTask {
|
|
|
tXinyiWarningRecord.setControlVal(csGkz);
|
|
|
tXinyiWarningRecord.setCreateBy(WARNING_DEFAULT_CREATE);
|
|
|
tXinyiWarningRecord.setCreateTime(DateUtils.getNowDate());
|
|
|
- tXinyiWarningRecord.setRemark("0");
|
|
|
+ tXinyiWarningRecord.setRemark(ZERO_SZ_WARNING.getCode());
|
|
|
|
|
|
|
|
|
if(Objects.isNull(currentVal) || currentVal.compareTo(BigDecimal.ZERO) == 0){
|
|
@@ -1761,7 +1762,7 @@ public class AsyncTask {
|
|
|
|
|
|
tXinyiWarningRecord.setCreateBy(WARNING_DEFAULT_CREATE);
|
|
|
tXinyiWarningRecord.setCreateTime(DateUtils.getNowDate());
|
|
|
- tXinyiWarningRecord.setRemark("0");
|
|
|
+ tXinyiWarningRecord.setRemark(ZERO_SZ_WARNING.getCode());
|
|
|
|
|
|
|
|
|
if(Objects.isNull(currentVal) || currentVal.compareTo(BigDecimal.ZERO) == 0){
|
|
@@ -1954,7 +1955,7 @@ public class AsyncTask {
|
|
|
tXinyiWarningRecord.setControlVal(csGkz);
|
|
|
tXinyiWarningRecord.setCreateBy(WARNING_DEFAULT_CREATE);
|
|
|
tXinyiWarningRecord.setCreateTime(DateUtils.getNowDate());
|
|
|
- tXinyiWarningRecord.setRemark("3");
|
|
|
+ tXinyiWarningRecord.setRemark(THREE_HYS_WARNING.getCode());
|
|
|
|
|
|
|
|
|
if(Objects.isNull(currentVal)){
|