Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

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

@@ -196,9 +196,18 @@ 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 systemCode) {
+        return fireFightingSystemService.getEquip(systemCode);
+    }
+
+    //查询系统下设备状态
+    @RequestMapping(value = "/getFireSystemEquipStatusList", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("通过systemCode、设备分类编码字符串查询消防系统信息")
+    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String systemCode,
+                                                                 @RequestParam(required = false) String categoryCodes) {
+        return fireFightingSystemService.getFireSystemEquipStatusList(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 systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(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 systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(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 systemCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(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("code", m.get("equipmentCode"));
+                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 systemCode, String categoryCodes) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(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("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;
     }

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -613,4 +613,15 @@
         </sql>
     </changeSet>
 
+    <changeSet author="tianyiming" id="202301101653">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment" columnName="shbz_img"/>
+            </not>
+        </preConditions>
+        <comment>新增四横八纵图片属性字段</comment>
+        <sql>
+            ALTER TABLE `wl_equipment` ADD COLUMN `shbz_img` varchar(255) NULL COMMENT '四横八纵图片' AFTER `img`;</sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -5272,7 +5272,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
@@ -5617,20 +5617,54 @@
                     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="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="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`,