Skip to content

A
amos-boot-biz
Commit da14c887 authored by zhangsen's avatar zhangsen
Browse files
Options

稳压泵bug

parent 81f6b425
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @ da14c887
...@@ -324,9 +324,8 @@ public class ConfigureController extends AbstractBaseController { ...@@ -324,9 +324,8 @@ public class ConfigureController extends AbstractBaseController {
int num = collect.size(); int num = collect.size();
item.put("startAndStopNum", num); item.put("startAndStopNum", num);
} }
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "正常" : "异常"); resultMap.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? (resultMap.get("normalNum") + 1) : resultMap.get("normalNum"));
resultMap.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? (resultMap.get("normalNum") + 1) : resultMap.get("normalNum")); resultMap.put("unNormalNum", (Integer) item.get("startAndStopNum") > 1 || Integer.parseInt(String.valueOf(item.get("isAlarm"))) > 0 ? (resultMap.get("unNormalNum") + 1) : resultMap.get("unNormalNum"));
resultMap.put("unNormalNum", (Integer) item.get("startAndStopNum") > 1 ? (resultMap.get("unNormalNum") + 1) : resultMap.get("unNormalNum"));
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return CommonResponseUtil.success(resultMap); return CommonResponseUtil.success(resultMap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment