Ver código fonte

给前端返回的JSON带key和value的 时候,因逻辑调整,改key的中文名字

王苗苗 1 mês atrás
pai
commit
ff28a07d5f

+ 2 - 1
slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -466,7 +466,8 @@ public class RyTask
         basic.put("报警值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getWarningVal(), INT_2));
         basic.put("标准值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getDesignVal(), INT_2));
         basic.put("管控值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getControlVal(), INT_2));
-        basic.put("报警次数", count > MAX_COUNT ? MAX_COUNT_STR : count);
+//        basic.put("报警次数", count > MAX_COUNT ? MAX_COUNT_STR : count);
+        basic.put("持续时间", count > MAX_COUNT ? MAX_COUNT_STR : count);
         if(tXinyiWarningRecord.getType() != 2)
             basic.put("状态", status == 0 ? "报警中" : status == 1 ? "用户关闭" : status == 2 ? "系统关闭" : "应急处理中");
         else

+ 2 - 1
slibra-system/src/main/java/com/slibra/business/res/ShowValueCSBasic.java

@@ -34,7 +34,8 @@ public class ShowValueCSBasic {
     @JSONField(ordinal = 6, name = "报警级别")
     private String f;
 
-    @JSONField(ordinal = 7, name = "报警次数")
+//    @JSONField(ordinal = 7, name = "报警次数")
+    @JSONField(ordinal = 7, name = "持续时间")
     private String g;
 
     @JSONField(ordinal = 8, name = "数据来源")

+ 2 - 1
slibra-system/src/main/java/com/slibra/business/res/ShowValueJSBasic.java

@@ -34,7 +34,8 @@ public class ShowValueJSBasic {
     @JSONField(ordinal = 6, name = "报警级别")
     private String f;
 
-    @JSONField(ordinal = 7, name = "报警次数")
+//    @JSONField(ordinal = 7, name = "报警次数")
+    @JSONField(ordinal = 7, name = "持续时间")
     private String g;
 
     @JSONField(ordinal = 8, name = "数据来源")

+ 2 - 1
slibra-system/src/main/java/com/slibra/business/res/ShowValueSHBasic.java

@@ -36,7 +36,8 @@ public class ShowValueSHBasic {
     @JSONField(ordinal = 6, name = "报警级别")
     private String f;
 
-    @JSONField(ordinal = 7, name = "报警次数")
+//    @JSONField(ordinal = 7, name = "报警次数")
+    @JSONField(ordinal = 7, name = "持续时间")
     private String g;
 
     @JSONField(ordinal = 8, name = "数据来源")