Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -76,7 +76,7 @@
         )  s  group by date,bizOrgCode
     </select>
     <select id="queryPersonNum" resultType="java.lang.Integer">
-        select count(*) from cb_firefighters where biz_org_code  like #{bizOgrCode} AND people_type = '1601'
+        select count(*) from cb_firefighters where biz_org_code  like CONCAT('%',#{bizOgrCode}, '%') AND people_type = '1601'
            AND is_delete = 0 AND now()  > rec_date
 
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -5,9 +5,11 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.vo.IotDataVO;
+import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.service.IEmergencyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
@@ -65,7 +67,7 @@ public class EmergencyController extends AbstractBaseController {
 	public ResponseModel getCAFSWaterTankInfo() {
 		ReginParams reginParams = getSelectedOrgInfo();
 		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-		return CommonResponseUtil.success(iEmergencyService.getCAFSWaterTankInfo(bizOrgCode));
+		return CommonResponseUtil.success(iEmergencyService.getCAFSWaterTankInfo());
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -114,16 +116,11 @@ public class EmergencyController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation("泡沫罐列表")
 	@GetMapping(value = "/selectFoamTank")
-	public Page<Map<String, Object>> selectFoamTank(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
-													@RequestParam(value = "pageNumber") int pageNumber,
+	public Page<Map<String, Object>> selectFoamTank(@RequestParam(value = "pageNumber") int pageNumber,
 													@RequestParam(value = "pageSize") int pageSize
 													)  {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
-		if (ObjectUtils.isEmpty(bizOrgCode)){
-			ReginParams reginParams = getSelectedOrgInfo();
-			bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-		}
-		return iEmergencyService.selectFoamTank(page, bizOrgCode);
+		return iEmergencyService.selectFoamTank(page);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -560,6 +557,30 @@ public class EmergencyController extends AbstractBaseController {
 		return result;
 	}
 
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getEquipExpiryList")
+	@ApiOperation(httpMethod = "GET", value = "四横八纵-临期设备列表", notes = "四横八纵-临期设备列表")
+	public ResponseModel getEquipExpiryList(@ApiParam("临期天数-近多少天") @RequestParam(value = "expiryDayNum", required = false) Integer expiryDayNum) {
+		expiryDayNum = Objects.isNull(expiryDayNum) ? 180 : expiryDayNum;
+		return CommonResponseUtil.success(iEmergencyService.getEquipExpiryList(expiryDayNum));
+	}
 
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getEquipExpiryStatistics")
+	@ApiOperation(httpMethod = "GET", value = "四横八纵-临期设备统计", notes = "四横八纵-临期设备统计")
+	public ResponseModel getEquipExpiryStatistics(@ApiParam("临期天数-近多少天") @RequestParam(value = "expiryDayNum", required = false) Integer expiryDayNum) {
+		expiryDayNum = Objects.isNull(expiryDayNum) ? 180 : expiryDayNum;
+		return CommonResponseUtil.success(iEmergencyService.getEquipExpiryStatistics(expiryDayNum));
+	}
+
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getStockEquipStatistics")
+	@ApiOperation(httpMethod = "GET", value = "四横八纵-报废设备统计", notes = "四横八纵-报废设备统计")
+	public ResponseModel getStockEquipStatistics() {
+		return CommonResponseUtil.success(iEmergencyService.getStockEquipStatistics());
+	}
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -196,9 +197,40 @@ public class FireFightingSystemController extends AbstractBaseController {
     //查询系统下设备状态
     @RequestMapping(value = "/alarmSystem/info", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation("通过id查询消防系统信息")
-    public List<Map<String,Object>> getEquip() {
-        return fireFightingSystemService.getEquip();
+    @ApiOperation("通过systemCode查询消防系统信息")
+    public List<Map<String,Object>> getEquip(@RequestParam(required = false) String bizOrgCode,
+                                             @RequestParam(required = false) String systemCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getEquip(bizOrgCode, systemCode);
+    }
+
+    //查询系统下设备状态
+    @RequestMapping(value = "/getFireSystemEquipStatusList", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("通过systemCode、设备分类编码字符串查询消防系统信息")
+    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String bizOrgCode,
+                                                                 @RequestParam(required = false) String systemCode,
+                                                                 @RequestParam(required = false) String categoryCodes) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getFireSystemEquipStatusList(bizOrgCode, systemCode, categoryCodes);
     }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java

@@ -39,7 +39,7 @@ public interface EmergencyMapper extends BaseMapper{
      * @param bizOrgCode
      * @return
      */
-    Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode);
+    Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page);
 
     /**
      * 排油系统
@@ -59,7 +59,7 @@ public interface EmergencyMapper extends BaseMapper{
 
     List<Map<String, Object>> getSystemState(@Param("bizOrgCode") String bizOrgCode);
 
-    List<Map<String, Object>> getCAFSWaterTankInfo(@Param("bizOrgCode") String bizOrgCode);
+    List<Map<String, Object>> getCAFSWaterTankInfo();
 
     List<Map<String, Object>> selectAlarmAnalysis(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("dataType")String dataType, @Param("date")String date, @Param("list") List<String> codes);
 
@@ -77,7 +77,10 @@ public interface EmergencyMapper extends BaseMapper{
 
     List<Map<String, Object>> fireCannonSystemAlarmAnalysis(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("dataType")String dataType, @Param("date")String date, @Param("list") List<String> codes);
 
+    List<Map<String, String>> getEquipExpiryList(@Param("expiryDayNum") Integer expiryDayNum);
 
+    Map<String, Integer> getStockEquipStatistics();
 
+    List<Map<String, Object>> getEquipExpiryStatistics(@Param("expiryDayNum") Integer expiryDayNum);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -644,10 +644,11 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectAllDays();
 
-    List<Map<String, Object>> getEquip();
+    List<Map<String, Object>> getEquip(String bizOrgCode, String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes);
 
     List<Map<String, Object>> selectPressureDetails(@Param("bizOrgCode") String bizOrgCode);
 
     Map<String, Object> selectEquipmentSpecificById(@Param("id") String id);
-
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -20,7 +20,7 @@ public interface IEmergencyService {
     /**
      * @return
      */
-    List<Map<String, Object>> getCAFSWaterTankInfo(String bizOrgCode);
+    List<Map<String, Object>> getCAFSWaterTankInfo();
 
     Map<String, Object> emergencyMaterials();
 
@@ -28,7 +28,7 @@ public interface IEmergencyService {
 
     Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode,String code);
 
-    Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page, String bizOrgCode);
+    Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page);
 
     Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode, String code);
 
@@ -48,5 +48,9 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> fireCannonSystemAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType);
 
+    List<Map<String, Object>> getEquipExpiryStatistics(Integer expiryDayNum);
 
+    List<Map<String, String>> getEquipExpiryList(Integer expiryDayNum);
+
+    Map<String, Integer> getStockEquipStatistics();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -171,7 +171,10 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      */
     FireFightingSystemEntity getDetailByCode(String systemCode);
 
-    List<Map<String,Object>> getEquip();
+    List<Map<String,Object>> getEquip(String bizOrgCode, String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes);
+
     /**
      * 集成页面系统数据
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -49,8 +49,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
     }
 
     @Override
-    public List<Map<String, Object>> getCAFSWaterTankInfo(String bizOrgCode) {
-        List<Map<String, Object>> list = emergencyMapper.getCAFSWaterTankInfo(bizOrgCode);
+    public List<Map<String, Object>> getCAFSWaterTankInfo() {
+        List<Map<String, Object>> list = emergencyMapper.getCAFSWaterTankInfo();
 //        List<Map<String, Object>> res = new ArrayList();
 //        if (0 < list.size()) {
 //            list.forEach(x -> {
@@ -81,8 +81,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
     }
 
     @Override
-    public Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page, String bizOrgCode) {
-        return emergencyMapper.selectFoamTank(page, bizOrgCode);
+    public Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page) {
+        return emergencyMapper.selectFoamTank(page);
     }
 
     @Override
@@ -158,4 +158,25 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
     }
 
+
+    @Override
+    public List<Map<String, Object>> getEquipExpiryStatistics(Integer expiryDayNum) {
+        List<Map<String, Object>> equipExpiryStatistics = emergencyMapper.getEquipExpiryStatistics(expiryDayNum);
+        equipExpiryStatistics.forEach(item -> {
+            item.put("value", Integer.parseInt(item.get("value").toString()));
+        });
+        return equipExpiryStatistics;
+    }
+
+    @Override
+    public List<Map<String, String>> getEquipExpiryList(Integer expiryDayNum) {
+
+        return emergencyMapper.getEquipExpiryList(expiryDayNum);
+    }
+
+    @Override
+    public Map<String, Integer> getStockEquipStatistics() {
+        return emergencyMapper.getStockEquipStatistics();
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -982,22 +982,61 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<Map<String, Object>> getEquip() {
-        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip();
+    public List<Map<String, Object>> getEquip(String bizOrgCode, String systemCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(bizOrgCode, systemCode);
         List<Map<String, Object>> resList = new ArrayList<>();
         int i = 1;
         if (0 < list.size()) {
             for (Map<String, Object> m : list) {
+                List<Map<String, Object>> list1 = new ArrayList();
                 Map<String, Object> map = new HashMap<>();
+                Map<String, Object> statusMap = new HashMap<>();
                 map.put("key", i);
-                map.put("name", m.get("equipmentName"));
-                map.put("equipmentCode", m.get("equipmentCode"));
+                map.put("name", m.get("name"));
                 map.put("code", m.get("code"));
-                map.put("value", m.get("flag"));
-                map.put("unit", "");
+                map.put("systemTypeCode", systemCode);
+                map.put("img", m.get("shbzImg"));
+                statusMap.put("name", m.get("status"));
+                if ("正常".equals(String.valueOf(m.get("status")))) {
+                    statusMap.put("level", "success");
+                } else {
+                    statusMap.put("level", "warning");
+                }
+                list1.add(statusMap);
+                map.put("status", list1);
                 resList.add(map);
                 i++;
-            }
+            };
+        }
+        return resList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(bizOrgCode, systemCode, categoryCodes);
+        List<Map<String, Object>> resList = new ArrayList<>();
+        int i = 1;
+        if (0 < list.size()) {
+            for (Map<String, Object> m : list) {
+                List<Map<String, Object>> list1 = new ArrayList();
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> statusMap = new HashMap<>();
+                map.put("key", i);
+                map.put("name", m.get("name"));
+                map.put("code", m.get("code"));
+                map.put("systemTypeCode", systemCode);
+                map.put("img", m.get("shbzImg"));
+                statusMap.put("name", m.get("status"));
+                if ("正常".equals(String.valueOf(m.get("status")))) {
+                    statusMap.put("level", "success");
+                } else {
+                    statusMap.put("level", "warning");
+                }
+                list1.add(statusMap);
+                map.put("status", list1);
+                resList.add(map);
+                i++;
+            };
         }
         return resList;
     }
@@ -2145,6 +2184,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) {
+        if (!StringUtil.isNotEmpty(startDate)) {
+            startDate = null;
+        }
+        if (!StringUtil.isNotEmpty(endDate)) {
+            endDate = null;
+        }
         return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate);
     }
 

amos-boot-system-equip/src/main/resources/json/systemIndex.json

@@ -7,7 +7,7 @@
   },
   {
 
-    "code": "92990000",
+    "code": "92100000",
     "index": "OilLeak,Open,Fault"
 
   }

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2847,6 +2847,7 @@
         LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
         WHERE
         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}
@@ -2884,7 +2885,7 @@
         LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
         LEFT JOIN  wl_equipment_category wec on wec.id=eq.category_id
         <where>
-            and wec.industry_code = 2
+            wec.industry_code = 2
         <if test="dto.code!=null and dto.code!=''">
             and wesp.code = #{dto.code}
         </if>
@@ -4063,7 +4064,14 @@
 
             ) temp
             LEFT JOIN
+
+
+
+
             (
+
+
+
         SELECT temp.*,
         CASE
         WHEN wei.is_trend = 0 then "遥信"
@@ -4121,7 +4129,7 @@
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">
         SELECT
-        COUNT(1)
+            SUM(index_true_num)
         FROM
         wl_equipment_alarm_report_day report
         LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
@@ -4454,7 +4462,8 @@
         LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
         left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
         where
-        FIND_IN_SET(#{systemId},spec.system_id) AND equipment.is_iot = 1
+        FIND_IN_SET(#{systemId},spec.system_id)
+         AND equipment.is_iot = 1
         GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
         GROUP BY a1.system_id
         ) as b
@@ -5272,7 +5281,7 @@
                 END as 'status'
         FROM
             f_fire_fighting_system fs
-        where system_type_code IS NOT NULL
+        where system_type_code IS NOT NULL AND LENGTH(trim(system_type_code)) != 0
     </select>
     <select id="getSystemAlarmInfoList" resultType="java.util.Map">
         SELECT
@@ -5298,7 +5307,7 @@
         FROM
         `f_fire_fighting_system` `fs`
         where
-            fs.system_type_code IS NOT NULL
+            fs.system_type_code IS NOT NULL AND LENGTH(trim(fs.system_type_code)) != 0 AND fs.system_type_code != 'otherSys'
     </select>
 
     <select id="getSystemCountInfo" resultType="java.util.Map">
@@ -5608,29 +5617,68 @@
     <select id="getEquip" resultType="java.util.Map">
         SELECT
             spe.id,
-            det.`name` equipmentName,
-            spe.`code`,
-            det.`code` equipmentCode,
+            wle.`name`,
+            wle.`code`,
             (
                 CASE
                     ( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
                     WHEN 0 THEN
                         '正常' ELSE '异常'
                     END
-                ) flag
+                ) `status`,
+            wle.shbz_img shbzImg
         FROM
             wl_equipment_specific AS spe
                 LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
-                LEFT JOIN wl_stock_detail AS wlsd ON wlsd.equipment_detail_id = det.id
         WHERE
             fs.system_type_code IS NOT NULL
-            AND fs.system_type_code = 'fireAlarmSys'
-            AND wlsd.`status` = 1
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.system_type_code = #{systemCode}
+            </if>
         GROUP BY det.`code`
     </select>
 
+    <select id="getFireSystemEquipStatusList" resultType="java.util.Map">
+        SELECT
+            spe.id,
+            spe.`name`,
+            spe.`code`,
+            (
+                CASE
+                    ( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
+                    WHEN 0 THEN
+                        '正常' ELSE '异常'
+                    END
+                ) `status`,
+            wle.shbz_img shbzImg
+        FROM
+            wl_equipment_specific AS spe
+                LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
+                LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
+                LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
+        WHERE
+            fs.system_type_code IS NOT NULL
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.system_type_code = #{systemCode}
+            </if>
+            <if test="categoryCodes != null and categoryCodes.split(',').length >0">
+                AND
+                <foreach collection="categoryCodes.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
+                    LOCATE(#{item}, det.`code`) > 0
+                </foreach>
+            </if>
+        GROUP BY spe.id
+        ORDER BY spe.id
+    </select>
+
     <select id="selectPressureDetails" resultType="java.util.Map">
         SELECT
             ed.`name`,