Skip to content

A
amos-boot-biz
Commit e020a329 authored by tianyiming's avatar tianyiming
Browse files
Options

修改bug

parent b04a7094
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ e020a329
...@@ -377,6 +377,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -377,6 +377,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
pressurePumpInfo.getRecords().stream( pressurePumpInfo.getRecords().stream(
).map(item -> { ).map(item -> {
item.put("startAndStopInterval", finalDiffMinute); item.put("startAndStopInterval", finalDiffMinute);
item.put("nameKey", pressurePumpStart);
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return CommonResponseUtil.success(pressurePumpInfo); return CommonResponseUtil.success(pressurePumpInfo);
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ e020a329
...@@ -4835,6 +4835,7 @@ ...@@ -4835,6 +4835,7 @@
<select id="getPipeNetworkBySuper" resultType="java.util.Map"> <select id="getPipeNetworkBySuper" resultType="java.util.Map">
SELECT SELECT
a.`name`, a.`name`,
'FHS_PipePressureDetector_PipePressure' nameKey,
(CASE WHEN (CASE WHEN
LENGTH(trim(a.area)) = 0 THEN '--' LENGTH(trim(a.area)) = 0 THEN '--'
ELSE ELSE
...@@ -5288,6 +5289,7 @@ ...@@ -5288,6 +5289,7 @@
<select id="getCenterWaterInfo" resultType="java.util.Map"> <select id="getCenterWaterInfo" resultType="java.util.Map">
SELECT SELECT
a.`name`, a.`name`,
'FHS_FirePoolDevice_WaterLevel,FHS_WirelessliquidDetector_WaterLevel' nameKey,
( (
CASE CASE
......
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