Skip to content

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

改bug

parent 3cb60f6b
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 27 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java
View file @ 22033d5f
......@@ -124,7 +124,7 @@ public class BigScreenController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num);
}
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 ? "1" : "0");
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "1" : "0");
item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0);
item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1);
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 @ 22033d5f
......@@ -263,7 +263,7 @@ public class ConfigureController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num);
}
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 ? "正常" : "异常");
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "正常" : "异常");
item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0);
item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1);
Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));
......@@ -322,9 +322,9 @@ public class ConfigureController extends AbstractBaseController {
int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num);
}
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 ? "正常" : "异常");
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && (Integer) item.get("isAlarm") == 0 ? "正常" : "异常");
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;
}).collect(Collectors.toList());
return CommonResponseUtil.success(resultMap);
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 22033d5f
......@@ -2237,7 +2237,7 @@
<select id="getFireTeamInfoBy117" resultType="java.util.Map">
SELECT
ifnull( count( 0 ), 0 ) AS `total`,
ifnull( sum(( SELECT count( 0 ) FROM `d_duty_details` `duty` WHERE ( `duty`.`user_id` = `cou`.`sequence_nbr` ))), 0 ) AS `on_duty`,
ifnull( sum(( SELECT count( 0 ) FROM `d_duty_details` `duty` WHERE ( `duty`.`user_id` = `cou`.`amos_org_id` ))), 0 ) AS `on_duty`,
'志愿消防队' as typeName
FROM
( SELECT * FROM `cb_org_usr` WHERE `cb_org_usr`.`is_firefighters` = 1 AND `cb_org_usr`.`type_code` = 117
......@@ -2249,7 +2249,7 @@
<select id="getFireTeamInfoBy116" resultType="java.util.Map">
SELECT
ifnull( count( 0 ), 0 ) AS `total`,
ifnull( sum(( SELECT count( 0 ) FROM `d_duty_details` `duty` WHERE ( `duty`.`user_id` = `cou`.`sequence_nbr` ))), 0 ) AS `on_duty`,
ifnull( sum(( SELECT count( 0 ) FROM `d_duty_details` `duty` WHERE ( `duty`.`user_id` = `cou`.`amos_org_id` ))), 0 ) AS `on_duty`,
'专职驻站消防队' as typeName
FROM
( SELECT * FROM `cb_org_usr` WHERE `cb_org_usr`.`is_firefighters` = 1 AND `cb_org_usr`.`type_code` = 116
......@@ -2623,19 +2623,24 @@
<select id="getPressurePumpInfo" resultType="java.util.Map">
SELECT
ed.`name`,
CONCAT( ws.`name`, ed.area ) area,
es.iot_code,
es.id
ed.`name`,
concat_ws( '-', ws.full_name, ed.area ) area,
es.iot_code,
es.id,
IFNULL( sum( `status` ), 0 ) AS isAlarm
FROM
wl_equipment_detail ed
LEFT JOIN wl_equipment_specific es ON es.equipment_detail_id = ed.id and es.iot_code is not null
LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
WHERE
ed.`code` LIKE '92010800%'
<if test="bizOrgCode != null and bizOrgCode != ''" >
AND es.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
ed.`code` LIKE '92010800%'
AND es.iot_code IS NOT NULL
<if test="bizOrgCode != null and bizOrgCode != ''" >
AND es.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
GROUP BY
es.id
</select>
<select id="queryPressureNowStateBySpecificId" resultType="java.util.Map">
......@@ -2653,21 +2658,26 @@
<select id="getPressurePumpInfo3Small" resultType="java.util.Map">
SELECT
ed.`name`,
CONCAT( ws.`name`, ed.area ) area,
es.iot_code,
es.id
ed.`name`,
concat_ws( '-', ws.full_name, ed.area ) area,
es.iot_code,
es.id,
IFNULL( sum( `status` ), 0 ) AS isAlarm
FROM
wl_equipment_detail ed
LEFT JOIN wl_equipment_specific es ON es.equipment_detail_id = ed.id and es.iot_code is not null
LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET(fs.id,es.system_id)
wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, es.system_id )
LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
WHERE
ed.`code` LIKE '92010800%'
AND es.biz_org_code like concat(#{bizOrgCode}, '%')
ed.`code` LIKE '92010800%'
AND es.iot_code IS NOT NULL
AND es.biz_org_code like concat(#{bizOrgCode}, '%')
<if test="systemCode!=null and systemCode!=''">
AND fs.code = #{systemCode,jdbcType=VARCHAR}
</if>
GROUP BY
es.id
</select>
<select id="exportEquipmentList" resultType="com.yeejoin.equipmanage.common.entity.vo.EquipmentExportVO">
SELECT
......
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