Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/EmergencyEquipTypeEnum.java

@@ -67,4 +67,12 @@ public enum EmergencyEquipTypeEnum {
         }
         return enumList;
     }
+
+    public static List<String> getCodeList() {
+        List<String> codeList = new ArrayList<>();
+        for (EmergencyEquipTypeEnum c: EmergencyEquipTypeEnum.values()) {
+            codeList.add(c.getCode());
+        }
+        return codeList;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.equipmanage.common.entity.dto.FireResourceStatsDTO;
 import com.yeejoin.equipmanage.service.IFireResourceSupervisionService;
+import com.yeejoin.equipmanage.service.ISocialPowerService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,9 @@ public class FireResourceSupervisionController extends BaseController {
     @Autowired
     private IFireResourceSupervisionService iFireResourceSupervisionService;
 
+    @Autowired
+    private ISocialPowerService socialPowerService;
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "消防系统、监测部件、消防车辆统计信息查询", notes = "聚合接口: 消防系统、监测部件、消防车辆统计信息查询")
     @RequestMapping(value = "/stats", method = RequestMethod.GET)
@@ -48,4 +52,24 @@ public class FireResourceSupervisionController extends BaseController {
         }};
         return ResponseHelper.buildResponse(result);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "资源总览统计信息查询", notes = "资源总览统计信息查询")
+    @RequestMapping(value = "/statistic", method = RequestMethod.GET)
+    public ResponseModel<Object> statistic(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+        if (StringUtils.isBlank(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtils.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
+        }
+        FireResourceStatsDTO fireEquipStats = iFireResourceSupervisionService.getFireEquipStats(bizOrgCode);
+        FireResourceStatsDTO fireCarStats = iFireResourceSupervisionService.getFireCarStats(bizOrgCode);
+        FireResourceStatsDTO socialPowerStats = socialPowerService.getStatistics(bizOrgCode);
+
+        Map<String, FireResourceStatsDTO> result = new HashMap<String, FireResourceStatsDTO>() {{
+            put("fireEquipStats", fireEquipStats);
+            put("fireCarStats", fireCarStats);
+            put("socialPowerStats", socialPowerStats);
+        }};
+        return ResponseHelper.buildResponse(result);
+    }
 }

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

@@ -723,4 +723,6 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     List<Map<String, Object>> getEquipmentAndEquipSpeTree(@Param("bizOrgCode")String bizOrgCode, @Param("systemCode") String systemCode);
 
     Page<Map<String, Object>> getEquipmentsBySystemInfo(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("equipmentCode") String equipmentCode);
+
+    Map<String, Object> getEquipStats(@Param("bizOrgCode") String bizOrgCode, @Param("list") List<String> list);
 }

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

@@ -23,4 +23,6 @@ public interface IFireResourceSupervisionService {
      * @param bizOrgCode 机构编码
      */
     FireResourceStatsDTO getFireCarStats(String bizOrgCode);
+
+    FireResourceStatsDTO getFireEquipStats(String bizOrgCode);
 }

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

 package com.yeejoin.equipmanage.service.impl;
 
 import com.yeejoin.equipmanage.common.entity.dto.FireResourceStatsDTO;
+import com.yeejoin.equipmanage.common.enums.EmergencyEquipTypeEnum;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.service.IFireResourceSupervisionService;
 import lombok.extern.slf4j.Slf4j;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -50,6 +52,18 @@ public class IFireResourceSupervisionServiceImpl implements IFireResourceSupervi
         return buildFireResourceStatsDTO(resultMap);
     }
 
+    /**
+     * 消防器材 按照需求统计消火栓、灭火器、消防铲、正压式空气呼吸器、消防斧、消防桶
+     *
+     * @param bizOrgCode 机构编码
+     */
+    @Override
+    public FireResourceStatsDTO getFireEquipStats(String bizOrgCode) {
+        List<String> list = EmergencyEquipTypeEnum.getCodeList();
+        Map<String, Object> resultMap = fireFightingSystemMapper.getEquipStats(bizOrgCode, list);
+        return buildFireResourceStatsDTO(resultMap);
+    }
+
     private FireResourceStatsDTO buildFireResourceStatsDTO(Map<String, Object> resultMap) {
         FireResourceStatsDTO fireResourceStats = new FireResourceStatsDTO();
         fireResourceStats.setTotalCounts(Long.valueOf(resultMap.get("totalCount").toString()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireResourceSupervisionServiceImpl.java

@@ -67,7 +67,7 @@ public class FireResourceSupervisionServiceImpl implements IFireResourceSupervis
     @Override
     public Map<String, Map<String, String>> getPersonInfo(String bizOrgCode) {
         List<Map<String, Object>> maps = fireResourceSupervisionMapper.selectPersonnelStats(bizOrgCode);
-        Long attendanceCount = fireResourceSupervisionMapper.selectTodayAttendance(bizOrgCode);
+//        Long attendanceCount = fireResourceSupervisionMapper.selectTodayAttendance(bizOrgCode);
         Map<String, Map<String, String>> result = new HashMap<>();
         for (Map<String, Object> map : maps) {
             Object peopleType = map.get("peopleType");

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

@@ -6479,4 +6479,26 @@
             </if>
         </where>
     </select>
+
+    <select id="getEquipStats" resultType="java.util.Map">
+        SELECT
+            count(1) AS totalCount,
+            0 AS yellowCodeCount,
+            0 AS redCodeCount
+        FROM
+        wl_equipment_specific wes
+        LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        <where>
+            <if test="list != null and list.size > 0">
+                <foreach collection="sysIds" item="item" index="index" open="(" close=")" separator="OR">
+                    wes.equipment_code LIKE CONCAT(#{item}, '%')
+                </foreach>
+            </if>
+            <if test="bizOrgCode!=null and bizOrgCode!=''">
+                AND wes.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
+            </if>
+            AND wed.equipment_name is not null
+        </where>
+        ORDER BY CONVERT(bizOrgName USING gbk) ASC
+    </select>
 </mapper>