Skip to content

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

稳压泵转换问题

parent 22033d5f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java
View file @ 1c72033d
...@@ -124,7 +124,7 @@ public class BigScreenController extends AbstractBaseController { ...@@ -124,7 +124,7 @@ public class BigScreenController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size(); int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num); item.put("startAndStopNum", num);
} }
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "1" : "0"); item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "1" : "0");
item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0); item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0);
item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1); item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1);
Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id")); Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @ 1c72033d
...@@ -263,7 +263,7 @@ public class ConfigureController extends AbstractBaseController { ...@@ -263,7 +263,7 @@ public class ConfigureController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size(); int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num); item.put("startAndStopNum", num);
} }
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "正常" : "异常"); item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "正常" : "异常");
item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0); item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0);
item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1); item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1);
Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id")); Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));
...@@ -322,7 +322,7 @@ public class ConfigureController extends AbstractBaseController { ...@@ -322,7 +322,7 @@ public class ConfigureController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size(); int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num); item.put("startAndStopNum", num);
} }
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "正常" : "异常"); item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "正常" : "异常");
resultMap.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? (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 ? (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;
......
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