提交直流中心相关查询接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -49,4 +49,6 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
     List<Map<String, Object>> getWaterTypeByBizOrgCode(String bizOrgCode);
 
     Page<WaterResourceDto> pageByDefect(Page<WaterResourceDto> page, @Param("nameOrCode") String nameOrCode, @Param("bizOrgCode") String bizOrgCode, @Param("systemName") String systemName);
+
+    Map<String, Object> getWaterResourceInfoList(@Param("map") Map<String, Object> map);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -193,4 +193,44 @@
         <if test="bizOrgCode != null and bizOrgCode != ''">and biz_org_code like concat( #{bizOrgCode}, '%')</if>
         order by cb_water_resource.rec_date desc
     </select>
+
+    <select id="getWaterResourceInfoList" resultType="java.util.Map">
+        SELECT
+        (
+            SELECT
+                COUNT(DISTINCT cwr.sequence_nbr)
+            FROM
+                cb_water_resource cwr
+            WHERE
+                cwr.is_delete = 1
+                AND cwr.resource_type = #{map.fireHydrant}
+                <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                    AND cwr.biz_org_code = #{map.bizOrgCode}
+                </if>
+        ) AS fireHydrant,
+        (
+            SELECT
+                COUNT(DISTINCT cwr.sequence_nbr)
+            FROM
+            cb_water_resource cwr
+            WHERE
+            cwr.is_delete = 1
+            AND cwr.resource_type = #{map.firePool}
+            <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                AND cwr.biz_org_code = #{map.bizOrgCode}
+            </if>
+        ) AS firePool,
+        (
+            SELECT
+                COUNT(DISTINCT cwr.sequence_nbr)
+            FROM
+            cb_water_resource cwr
+            WHERE
+            cwr.is_delete = 1
+            AND cwr.resource_type = #{map.fireWaterTank}
+            <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                AND cwr.biz_org_code = #{map.bizOrgCode}
+            </if>
+        ) AS fireWaterTank
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java

@@ -202,4 +202,16 @@ public class EquipmentSpecificAlarm extends BaseEntity {
     @TableField(value = "emergency_level_describe")
     private String emergencyLevelDescribe;
 
-}
+    /**
+     * 机构/部门名称
+     */
+    @TableField(exist = false)
+    private String bizOrgName;
+
+    /**
+     * 机构编码
+     */
+    @TableField(exist = false)
+    private String bizOrgCode;
+
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -226,4 +226,12 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
 
     @TableField(value = "defect_batch_id")
     private String defectBatchId;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    @TableField(value = "biz_org_name")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    @TableField(value = "biz_org_code")
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -150,4 +150,16 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private Integer isTrend;
 
+    /**
+     * 机构/部门名称
+     */
+    @TableField(exist = false)
+    private String bizOrgName;
+
+    /**
+     * 机构编码
+     */
+    @TableField(exist = false)
+    private String bizOrgCode;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -21,9 +21,11 @@ import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
@@ -32,6 +34,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -69,6 +73,9 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     @Autowired
     EquipFeignClient equipFeignClient;
 
+    @Value("classpath:/json/equipmentWaterCode.json")
+    private org.springframework.core.io.Resource equipmentWaterCode;
+
     /**
      * 分页查询
      */
@@ -510,4 +517,35 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         }
         return list;
     }
+
+    public List<Map<String, Object>> getWaterResourceInfoList(String bizOrgCode) {
+        String json = null;
+        try {
+            json = IOUtils.toString(equipmentWaterCode.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map> mapList = JSONObject.parseArray(json, Map.class);
+        Map<String, Object> map = new HashMap<>();
+        mapList.forEach(x -> map.put(String.valueOf(x.get("name")), x.get("type")));
+        map.put("bizOrgCode", bizOrgCode);
+        Map<String, Object> result = waterResourceMapper.getWaterResourceInfoList(map);
+        List<Map<String, Object>> list = new ArrayList<>();
+        result.keySet().forEach(x -> {
+            Map<String, Object> tempMap = new HashMap<>();
+            if ("fireHydrant".equals(String.valueOf(x))) {
+                tempMap.put("name", "消火栓");
+                tempMap.put("total", result.get("fireHydrant"));
+            } else if ("firePool".equals(String.valueOf(x))) {
+                tempMap.put("name", "消防水池");
+                tempMap.put("total", result.get("firePool"));
+            } else {
+                tempMap.put("name", "消防水箱");
+                tempMap.put("total", result.get("fireWaterTank"));
+            }
+            tempMap.put("code", x);
+            list.add(tempMap);
+        });
+        return  list;
+    }
 }

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

@@ -3,15 +3,14 @@ package com.yeejoin.equipmanage.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
+import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -36,6 +35,12 @@ public class DCenterController extends AbstractBaseController {
     @Autowired
     IEquipmentSpecificAlarmService iEquipmentSpecificAlarmService;
 
+    @Autowired
+    IFireFightingSystemService fireFightingSystemService;
+
+    @Autowired
+    IEquipmentSpecificSerivce specificService;
+
     /**
      * 直流中心告警列表分页，用于直流中心大数据查询分页，不建议再扩展联表查询
      *
@@ -59,4 +64,26 @@ public class DCenterController extends AbstractBaseController {
     }
 
 
+    /**
+     * 获取消防系统总体运行情况
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取消防系统告警状态信息", notes = "获取消防系统告警状态信息")
+    @GetMapping(value = "/system/running/info")
+    public ResponseModel getSystemRunningInfoList() throws Exception {
+        return CommonResponseUtil.success(fireFightingSystemService.getSystemRunningInfoList());
+    }
+
+    /**
+     * 获取消防设备数量
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取消防设备数量", notes = "获取消防设备数量")
+    @GetMapping(value = "/equip/info")
+    public ResponseModel getEquipmentStatisticsInfo(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) throws Exception {
+        return CommonResponseUtil.success(specificService.getEquipmentStatisticsInfo(bizOrgCode));
+    }
+
 }

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

@@ -903,14 +903,4 @@ public class FireFightingSystemController extends AbstractBaseController {
         return fireFightingSystemService.getSystemAlarmInfoList(startDate, endDate);
     }
 
-    /**
-     * 获取消防系统总体运行情况
-     * @throws Exception
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取消防系统告警状态信息", notes = "获取消防系统告警状态信息")
-    @GetMapping(value = "/running/info")
-    public Object getSystemRunningInfoList() throws Exception {
-        return fireFightingSystemService.getSystemRunningInfoList();
-    }
 }

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

@@ -238,4 +238,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     Map<String, Object> getPaomoSysInfo();
 
     Map<String, Object> getWaterSysInfo();
+
+    Map<String, Object> getEquipmentStatisticsInfo(@Param("map") Map<String, Object> map);
 }

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

@@ -244,4 +244,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     Map<String, Object> getPaomoSysInfo(String startDate, String endDate);
 
     Map<String, Object> getWaterSysInfo(String startDate, String endDate);
+
+    List<Map<String, Object>> getEquipmentStatisticsInfo(String bizOrgCode);
 }

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

 package com.yeejoin.equipmanage.service.impl;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -15,11 +17,13 @@ import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.catalina.util.IOTools;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -217,6 +221,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
+    @Value("classpath:/json/equipmentCode.json")
+    private Resource equipmentCode;
+
 
     private final String injection = "{\n" +
             "\n" +
@@ -487,7 +494,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
             if (0 < alarms.size()) {
                 alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
-                        +  null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                        +  (null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription()))).collect(Collectors.toList());
                 equipmentSpecificAlarmService.updateBatchById(alarms);
             }
         }
@@ -1929,4 +1936,36 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public Map<String, Object> getWaterSysInfo(String startDate, String endDate) {
         return equipmentSpecificMapper.getWaterSysInfo();
     }
+
+    @Override
+    public List<Map<String, Object>> getEquipmentStatisticsInfo(String bizOrgCode) {
+        String json = null;
+        try {
+            json = IOUtils.toString(equipmentCode.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map> mapList = JSONObject.parseArray(json, Map.class);
+        Map<String, Object> map = new HashMap<>();
+        mapList.forEach(x -> map.put(String.valueOf(x.get("name")), x.get("code")));
+        map.put("bizOrgCode", bizOrgCode);
+        Map<String, Object> result = equipmentSpecificMapper.getEquipmentStatisticsInfo(map);
+        List<Map<String, Object>> list = new ArrayList<>();
+        result.keySet().forEach(x -> {
+            Map<String, Object> tempMap = new HashMap<>();
+            if ("extinguisher".equals(String.valueOf(x))) {
+                tempMap.put("name", "灭火器");
+                tempMap.put("total", result.get("extinguisher"));
+            } else if ("car".equals(String.valueOf(x))) {
+                tempMap.put("name", "消防车");
+                tempMap.put("total", result.get("car"));
+            } else {
+                tempMap.put("name", "泡沫罐");
+                tempMap.put("total", result.get("foamtank"));
+            }
+            tempMap.put("code", x);
+            list.add(tempMap);
+        });
+        return  list;
+    }
 }

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

@@ -2055,19 +2055,19 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 Map<String, Object> resultMap = new HashMap<>();
                 if (SystemTypeEnum.fireWaterSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireWaterSys.getDesc());
-                    resultMap.put("total", x.get("sysTotalNum"));
+                    resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("waterSysNum"));
                 } else if (SystemTypeEnum.fireCAFSSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireCAFSSys.getDesc());
-                    resultMap.put("total", x.get("sysTotalNum"));
+                    resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("cafsSysNum"));
                 } else if (SystemTypeEnum.fireAlarmSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireAlarmSys.getDesc());
-                    resultMap.put("total", x.get("sysTotalNum"));
+                    resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("fireAlarmSysNum"));
                 } else {
                     resultMap.put("name", SystemTypeEnum.fireONLSys.getDesc());
-                    resultMap.put("total", x.get("sysTotalNum"));
+                    resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("onlSysNum"));
                 }
                 resultList.add(resultMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/EquipmentController.java

@@ -61,4 +61,11 @@ public class EquipmentController extends BaseController {
     public ResponseModel<Long> getMaintenanceId(@RequestParam() String userId) {
         return ResponseHelper.buildResponse(equipmentService.getMaintenanceId(userId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/water/resource")
+    @ApiOperation(value = "查询人员绑定维保单位id")
+    public ResponseModel getWaterResourceList(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+        return ResponseHelper.buildResponse(equipmentService.getWaterResourceInfoList(bizOrgCode));
+    }
 }

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

@@ -13,7 +13,10 @@ import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StopWatch;
@@ -21,6 +24,9 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -42,6 +48,7 @@ public class EquipmentServiceImpl {
 
     @Autowired
     private RedisUtils redisUtils;
+
     public List<MenuFrom> getFireSystemList() {
         // 导出模板增加权限
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
@@ -134,4 +141,8 @@ public class EquipmentServiceImpl {
             return null;
         }
     }
+
+    public List<Map<String, Object>> getWaterResourceInfoList(String bizOrgCode){
+        return waterResourceServiceImpl.getWaterResourceInfoList(bizOrgCode);
+    }
 }

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

+[
+  {
+    "code": "3104",
+    "name": "extinguisher"
+  },
+  {
+    "code": "92031900",
+    "name": "car"
+  },
+  {
+    "code": "210",
+    "name": "foamtank"
+  }
+]
\ No newline at end of file

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

@@ -62,7 +62,9 @@
 			wesi.emergency_level as emergencyLevel,
 			wesi.emergency_level_describe as emergencyLevelDescribe,
 			TRIM(CONCAT_WS(' ',wes.position,sd.description)) AS location,
-			sd.warehouse_structure_id AS buildId
+			sd.warehouse_structure_id AS buildId,
+            wes.biz_org_name AS bizOrgName,
+            wes.biz_org_code AS bizOrgCode
         FROM
             wl_equipment_specific_index AS wesi
             LEFT JOIN wl_equipment_specific AS wes

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

@@ -1970,4 +1970,43 @@
         ORDER BY
         `c`.`click_date`
     </select>
+    <select id="getEquipmentStatisticsInfo" resultType="java.util.Map">
+        SELECT
+            (
+                SELECT
+                    COUNT(DISTINCT wes.id)
+                FROM
+                    `wl_equipment_specific` wes
+                        LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+                WHERE
+                    wed.`code` LIKE CONCAT(#{map.extinguisher},'%')
+                    <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                        AND wes.biz_org_code = #{map.bizOrgCode}
+                    </if>
+            ) AS 'extinguisher',
+                (
+                    SELECT
+                        COUNT(DISTINCT wes.id)
+                    FROM
+                        `wl_equipment_specific` wes
+                            LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+                    WHERE
+                        wed.`code` LIKE CONCAT(#{map.car},'%')
+                        <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                            AND wes.biz_org_code = #{map.bizOrgCode}
+                        </if>
+                    ) AS 'car',
+                (
+                    SELECT
+                        COUNT(DISTINCT c.id)
+                    FROM
+                        `wl_car` c
+                            LEFT JOIN wl_equipment we ON we.id = c.equipment_id
+                    WHERE
+                        we.`code` LIKE CONCAT(#{map.foamtank},'%')
+                        <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
+                            AND c.biz_org_code = #{map.bizOrgCode}
+                        </if>
+                    ) AS 'foamtank'
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/json/equipmentWaterCode.json

+[
+  {
+    "type": "hydrant",
+    "name": "fireHydrant"
+  },
+  {
+    "type": "pool",
+    "name": "firePool"
+  },
+  {
+    "type": "waterTank",
+    "name": "fireWaterTank"
+  }
+]
\ No newline at end of file