Commit 88bc9f6e authored by lisong's avatar lisong

修改接口返回

parent 7df4932e
...@@ -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 ? "正常" : "异常"); item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 ? "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"));
......
...@@ -4279,14 +4279,14 @@ ...@@ -4279,14 +4279,14 @@
CASE CASE
WHEN temp.notReturnd > 0 THEN WHEN temp.notReturnd > 0 THEN
'异常' ELSE '正常' '0' ELSE '1'
END AS STATUS END AS status
FROM FROM
( (
SELECT SELECT
fs.id, fs.id,
fs.NAME, fs.name,
fs.CODE, fs.code,
( SELECT COUNT( DISTINCT(wesa.iot_code) ) FROM wl_equipment_specific_alarm wesa WHERE FIND_IN_SET( fs.id, wesa.system_ids ) AND wesa.create_date like concat(DATE_FORMAT(NOW(),'%Y-%m-%d')) ) AS total, ( SELECT COUNT( DISTINCT(wesa.iot_code) ) FROM wl_equipment_specific_alarm wesa WHERE FIND_IN_SET( fs.id, wesa.system_ids ) AND wesa.create_date like concat(DATE_FORMAT(NOW(),'%Y-%m-%d')) ) AS total,
( SELECT COUNT( DISTINCT(wesa.iot_code) ) FROM wl_equipment_specific_alarm wesa WHERE FIND_IN_SET( fs.id, wesa.system_ids ) AND wesa.equipment_specific_index_value = 'true' AND wesa.create_date like concat(DATE_FORMAT(NOW(),'%Y-%m-%d'))) AS notReturnd ( SELECT COUNT( DISTINCT(wesa.iot_code) ) FROM wl_equipment_specific_alarm wesa WHERE FIND_IN_SET( fs.id, wesa.system_ids ) AND wesa.equipment_specific_index_value = 'true' AND wesa.create_date like concat(DATE_FORMAT(NOW(),'%Y-%m-%d'))) AS notReturnd
FROM FROM
......
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