应急代码优化 list->List<Map<String, Object>> 数据合并迁移到controller

src/main/java/com/sooka/sponest/data/digitalemergency/controller/EmergencyBigDataController.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.digitalemergency.controller;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyTeam;
 import com.sooka.sponest.data.digitalemergency.domain.bo.VisuEmergencyCenterDataCountBO;
 import com.sooka.sponest.data.digitalemergency.domain.vo.CenterdataTEmergencyEnterpriseMessageBody;
@@ -10,6 +11,7 @@ import com.sooka.sponest.data.digitalemergency.domain.vo.DayBody;
 import com.sooka.sponest.data.digitalemergency.domain.vo.TBasicEnterindesmapCount;
 import com.sooka.sponest.data.digitalemergency.domain.vo.VisuEmergencyCenterDataVO;
 import com.sooka.sponest.data.digitalemergency.service.IEmergencyBigDataService;
+import com.sooka.sponest.data.digitalfirecontrol.service.IFireControlBigDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,8 @@ public class EmergencyBigDataController extends BaseController {
 
     @Autowired
     private IEmergencyBigDataService emergencyBigDataService;
+    @Autowired
+    private IFireControlBigDataService fireControlBigDataService;
 
     /**
      * 获取行业高危行业分布
@@ -65,6 +69,9 @@ public class EmergencyBigDataController extends BaseController {
     @ApiOperation(value = "查询所有资源",notes = "查询所有资源")
     @PostMapping("/getEmergencyResourceCount")
     public R<List<VisuEmergencyCenterDataCountBO>>getEmergencyResourceCount(@RequestBody VisuEmergencyCenterDataVO vo) {
+        VisuForestCloudMapVO visuForestCloudMapVO = new VisuForestCloudMapVO();
+        List list = emergencyBigDataService.getEmergencyResourceCount(vo);
+        list.addAll(fireControlBigDataService.geFireControltTotal(visuForestCloudMapVO));
         return R.ok(emergencyBigDataService.getEmergencyResourceCount(vo));
     }
 

src/main/java/com/sooka/sponest/data/digitalemergency/domain/vo/VisuEmergencyCenterDataVO.java

@@ -12,7 +12,5 @@ import lombok.Setter;
 public class VisuEmergencyCenterDataVO extends BaseBusinessEntity {
     @ApiModelProperty(value = "部门id", required = false)
     private Long deptId;
-    @ApiModelProperty(value = "返回资源数据库表", required = false)
-    private String resourceTable;
 
 }

src/main/java/com/sooka/sponest/data/digitalemergency/mapper/EmergencyBigDataMapper.java

@@ -24,14 +24,14 @@ public interface EmergencyBigDataMapper {
      *
      * @return
      */
-    List selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount);
+    List<Map<String, Object>> selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount);
 
     /**
      * 获取人员分布情况
      *
      * @return
      */
-    List selectPersonnelList(CenterdataTEmergencyPerson centerdataTEmergencyPerson);
+    List<Map<String, Object>> selectPersonnelList(CenterdataTEmergencyPerson centerdataTEmergencyPerson);
 
     /**
      * 查询数据中台所有资源
@@ -41,7 +41,7 @@ public interface EmergencyBigDataMapper {
      * @Version 1.0
      * @author phy
      */
-    List getEmergencyResourceCount(VisuEmergencyCenterDataVO vo);
+    List<Map<String, Object>> getEmergencyResourceCount(VisuEmergencyCenterDataVO vo);
 
     /**
      * 高危企业分布
@@ -49,7 +49,7 @@ public interface EmergencyBigDataMapper {
      * @param centerdataTEmergencyMaterial
      * @return
      */
-    List selectCategoryClassificationList(CenterdataTEmergencyMaterial centerdataTEmergencyMaterial);
+    List<Map<String, Object>> selectCategoryClassificationList(CenterdataTEmergencyMaterial centerdataTEmergencyMaterial);
 
     /**
      * 高危企业分布
@@ -57,7 +57,7 @@ public interface EmergencyBigDataMapper {
      * @param centerdataTEmergencyEnterpriseMessageBody
      * @return
      */
-    List selectHightEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody);
+    List<Map<String, Object>> selectHightEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody);
 
     /**
      * 企业分布
@@ -65,7 +65,7 @@ public interface EmergencyBigDataMapper {
      * @param centerdataTEmergencyEnterpriseMessageBody
      * @return
      */
-    List selectEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody);
+    List<Map<String, Object>> selectEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody);
 
     /**
      * 预警情况

src/main/java/com/sooka/sponest/data/digitalemergency/service/impl/EmergencyBigDataServiceImpl.java

@@ -2,14 +2,12 @@ package com.sooka.sponest.data.digitalemergency.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyMaterial;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyTeam;
 import com.sooka.sponest.data.digitalemergency.domain.vo.*;
 import com.sooka.sponest.data.digitalemergency.mapper.EmergencyBigDataMapper;
 import com.sooka.sponest.data.digitalemergency.service.IEmergencyBigDataService;
-import com.sooka.sponest.data.digitalfirecontrol.mapper.FireControlBigDataMapper;
 import com.sooka.sponest.data.other.person.domain.CenterdataTEmergencyPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,8 +27,6 @@ import java.util.Map;
 public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEmergencyBigDataService{
     @Autowired
     private EmergencyBigDataMapper emergencyBigDataMapper;
-    @Autowired
-    private FireControlBigDataMapper fireControlBigDataMapper;
 
     /**
      * 获取行业高危企业
@@ -39,7 +35,7 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      */
     @DataScopeMutiDept(deptAlias = "z")
     @Override
-    public List selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount) {
+    public List<Map<String, Object>> selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount) {
         setSookaDataBase(tBasicEnterindesmapCount);
         return emergencyBigDataMapper.selectIndustryHighList(tBasicEnterindesmapCount);
     }
@@ -53,7 +49,7 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      * @author phy
      */
     @Override
-    public List selectPersonnelList() {
+    public List<Map<String, Object>> selectPersonnelList() {
         CenterdataTEmergencyPerson centerdataTEmergencyPerson=new CenterdataTEmergencyPerson();
         setSookaDataBase(centerdataTEmergencyPerson);
         return emergencyBigDataMapper.selectPersonnelList(centerdataTEmergencyPerson);
@@ -69,13 +65,9 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      */
     @Override
     @DataScopeMutiDept(deptAlias = "d")
-    public List getEmergencyResourceCount(VisuEmergencyCenterDataVO vo) {
+    public List<Map<String, Object>> getEmergencyResourceCount(VisuEmergencyCenterDataVO vo) {
         setSookaDataBase(vo);
-        VisuForestCloudMapVO visuForestCloudMapVO = new VisuForestCloudMapVO();
-        setSookaDataBase(visuForestCloudMapVO);
-        List list = emergencyBigDataMapper.getEmergencyResourceCount(vo);
-        list.addAll(fireControlBigDataMapper.geFireControltTotal(visuForestCloudMapVO));
-        return list;
+        return emergencyBigDataMapper.getEmergencyResourceCount(vo);
     }
 
     /**
@@ -87,7 +79,7 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      * @author phy
      */
     @Override
-    public List selectCategoryClassificationList() {
+    public List<Map<String, Object>> selectCategoryClassificationList() {
         CenterdataTEmergencyMaterial centerdataTEmergencyMaterial = new CenterdataTEmergencyMaterial();
         setSookaDataBase(centerdataTEmergencyMaterial);
         return emergencyBigDataMapper.selectCategoryClassificationList(centerdataTEmergencyMaterial);
@@ -100,7 +92,7 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      * @return
      */
     @Override
-    public List selectHightEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody) {
+    public List<Map<String, Object>> selectHightEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody) {
         centerdataTEmergencyEnterpriseMessageBody.setId(SecurityUtils.getUserId().toString());
         setSookaDataBase(centerdataTEmergencyEnterpriseMessageBody);
         return emergencyBigDataMapper.selectHightEnterpriseDistributionList(centerdataTEmergencyEnterpriseMessageBody);
@@ -113,7 +105,7 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      * @return
      */
     @Override
-    public List selectEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody) {
+    public List<Map<String, Object>> selectEnterpriseDistributionList(CenterdataTEmergencyEnterpriseMessageBody centerdataTEmergencyEnterpriseMessageBody) {
         centerdataTEmergencyEnterpriseMessageBody.setId(SecurityUtils.getUserId().toString());
         setSookaDataBase(centerdataTEmergencyEnterpriseMessageBody);
         return emergencyBigDataMapper.selectEnterpriseDistributionList(centerdataTEmergencyEnterpriseMessageBody);

src/main/resources/mapper/digitalemergency/EmergencyBigDataMapper.xml

@@ -4,8 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.sponest.data.digitalemergency.mapper.EmergencyBigDataMapper">
 
-    <resultMap id="countResult"
-               type="com.sooka.sponest.data.digitalemergency.domain.bo.VisuEmergencyCenterDataCountBO"></resultMap>
     <parameterMap id="resourceParm"
                   type="com.sooka.sponest.data.digitalemergency.domain.vo.VisuEmergencyCenterDataVO"></parameterMap>
 
@@ -40,49 +38,28 @@
             b.dict_label
     </select>
     <select id="getEmergencyResourceCount" parameterMap="resourceParm" resultType="map">
-        SELECT
-            'centerdata_t_emergency_warehouse' resourceTable,
-            '应急仓库' resourceName,
-            count(*) count
-        FROM
-            onest_data.centerdata_t_emergency_warehouse a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-            LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
-        WHERE
-            1 = 1 ${params.dataScope}
-        UNION
-        SELECT
-            'centerdata_t_emergency_team' resourceTable,
-            '应急队伍' resourceName,
-            count(*) count
-        FROM
-            onest_data.centerdata_t_emergency_team a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-            LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
-        WHERE
-            1 = 1 ${params.dataScope}
-        UNION
-        SELECT
-            'centerdata_t_emergency_idlh_enterprises' resourceTable,
-            '危化企业' resourceName,
-            count(*) count
-        FROM
-            onest_data.centerdata_t_emergency_idlh_enterprises a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-            LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
-        WHERE
-            1 = 1 ${params.dataScope}
-            UNION
-        SELECT
-            'centerdata_t_emergency_material' resourceTable,
-            '应急物资' resourceName,
-            count(*) count
-        FROM
-            onest_data.centerdata_t_emergency_material a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-            LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
-        WHERE
-            1 = 1 ${params.dataScope}
+        select '应急仓库' name,count(*) value from centerdata_t_emergency_warehouse a
+        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}
+        union all
+        select '应急队伍' name,count(*) value from centerdata_t_emergency_team a
+        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}
+        union all
+        SELECT a.dict_label name,count(b.firehydrant_type) value FROM ${database_system}.sys_dict_data a left join
+        (SELECT a.firehydrant_type FROM centerdata_t_forest_firehydrant a
+        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}) b on a.dict_value = b.firehydrant_type
+        where a.dict_type = 'firehydrant'
+        GROUP BY a.dict_value
+        union all
+        select '危化企业' name,count(*) value from centerdata_t_emergency_idlh_enterprises a
+        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}
+        union all
+        select '应急物资' name,count(*) value from centerdata_t_emergency_material a
+        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}
 
     </select>
     <select id="selectCategoryClassificationList" parameterType="CenterdataTEmergencyMaterial" resultType="java.util.Map">