优化统计 水鹤、消火栓、取水口调用消防接口，删除多余接口做到复用

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

@@ -51,13 +51,12 @@ public class EmergencyBigDataController extends BaseController {
     }
 
     /**
-     * 查询所有资源
+     * 查询数据中台所有资源
      *
      * @param vo
      * @return
      * @Version 1.0
-     * @author pengyu
-     * @since 2023/3/22 14:30
+     * @author phy
      */
     @ApiOperation(value = "查询所有资源",notes = "查询所有资源")
     @PostMapping("/getEmergencyResourceCount")
@@ -131,22 +130,4 @@ public class EmergencyBigDataController extends BaseController {
     public R<List<Map<String,Object>>> getBigDataFortenterprises(CenterdataTEmergencyTeam centerdataTEmergencyTeam){
         return R.ok(emergencyBigDataService.getBigDataFortenterprises(centerdataTEmergencyTeam));
     }
-
-    /**
-     * 查询应急物资
-     */
-    @ApiOperation(value = "查询应急物资",notes = "查询应急物资")
-    @GetMapping("/getBigDataForMaterial")
-    public R<List<Map<String,Object>>> getBigDataForMaterial(CenterdataTEmergencyTeam centerdataTEmergencyTeam) {
-        return R.ok(emergencyBigDataService.getBigDataForMaterial(centerdataTEmergencyTeam));
-    }
-
-    /**
-     * 数据中台统计
-     */
-    @ApiOperation(value = "数据中台统计",notes = "数据中台统计")
-    @PostMapping("/getEmergencyAllCount")
-    public R<List<VisuEmergencyCenterDataCountBO>> getEmergencyAllCount(@RequestBody VisuEmergencyCenterDataVO vo) {
-        return R.ok(emergencyBigDataService.getEmergencyAllCount(vo));
-    }
 }

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

@@ -28,6 +28,14 @@ public interface EmergencyBigDataMapper {
 
     List selectPersonnelList(CenterdataTEmergencyPerson centerdataTEmergencyPerson);
 
+    /**
+     * 查询数据中台所有资源
+     *
+     * @param vo
+     * @return
+     * @Version 1.0
+     * @author phy
+     */
     List getEmergencyResourceCount(VisuEmergencyCenterDataVO vo);
 
     List selectCategoryClassificationList(CenterdataTEmergencyMaterial centerdataTEmergencyMaterial);
@@ -65,13 +73,6 @@ public interface EmergencyBigDataMapper {
 
     List<Map<String, Object>> getBigDataFortenterprises(CenterdataTEmergencyTeam team);
 
-    /**
-     * 查询应急物资
-     */
-    List<Map<String, Object>> getBigDataForMaterial(CenterdataTEmergencyTeam team);
 
-    /**
-     * 数据中台统计
-     */
-    List getEmergencyAllCount(VisuEmergencyCenterDataVO vo);
+
 }

src/main/java/com/sooka/sponest/data/digitalemergency/service/IEmergencyBigDataService.java

@@ -23,13 +23,12 @@ public interface IEmergencyBigDataService {
     List selectPersonnelList();
 
     /**
-     * 查询所有资源
+     * 查询数据中台所有资源
      *
      * @param vo
      * @return
      * @Version 1.0
-     * @author pengyu
-     * @since 2023/3/22 14:30
+     * @author phy
      */
     List getEmergencyResourceCount(VisuEmergencyCenterDataVO vo);
 
@@ -58,14 +57,5 @@ public interface IEmergencyBigDataService {
 
     List<Map<String,Object>> getBigDataFortenterprises(CenterdataTEmergencyTeam team);
 
-    /**
-     * 查询应急物资
-     */
-    List<Map<String,Object>> getBigDataForMaterial(CenterdataTEmergencyTeam team);
-
-    /**
-     * 数据中台统计
-     */
-    List getEmergencyAllCount(VisuEmergencyCenterDataVO vo);
 
 }

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

@@ -2,12 +2,14 @@ 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;
@@ -24,9 +26,11 @@ import java.util.Map;
  * @version: 1.0
  */
 @Service
-public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEmergencyBigDataService {
+public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEmergencyBigDataService{
     @Autowired
     private EmergencyBigDataMapper emergencyBigDataMapper;
+    @Autowired
+    private FireControlBigDataMapper fireControlBigDataMapper;
     /**
      * 获取行业高危企业
      *
@@ -38,18 +42,49 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
         setSookaDataBase(tBasicEnterindesmapCount);
         return emergencyBigDataMapper.selectIndustryHighList(tBasicEnterindesmapCount);
     }
+
+    /**
+     * 查询数据中台人员资源
+     *
+     * @param
+     * @return
+     * @Version 1.0
+     * @author phy
+     */
     @Override
     public List selectPersonnelList() {
         CenterdataTEmergencyPerson centerdataTEmergencyPerson=new CenterdataTEmergencyPerson();
         setSookaDataBase(centerdataTEmergencyPerson);
         return emergencyBigDataMapper.selectPersonnelList(centerdataTEmergencyPerson);
     }
+
+    /**
+     * 查询数据中台所有资源
+     *
+     * @param vo
+     * @return
+     * @Version 1.0
+     * @author phy
+     */
     @Override
-    @DataScopeMutiDept(deptAlias = "d", userAlias = "u")
+    @DataScopeMutiDept(deptAlias = "d")
     public List getEmergencyResourceCount(VisuEmergencyCenterDataVO vo) {
         setSookaDataBase(vo);
-        return emergencyBigDataMapper.getEmergencyResourceCount(vo);
+        VisuForestCloudMapVO visuForestCloudMapVO = new VisuForestCloudMapVO();
+        setSookaDataBase(visuForestCloudMapVO);
+        List list = emergencyBigDataMapper.getEmergencyResourceCount(vo);
+        list.addAll(fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO));
+        return list;
     }
+
+    /**
+     * 查询数据中台物资资源
+     *
+     * @param
+     * @return
+     * @Version 1.0
+     * @author phy
+     */
     @Override
     public List selectCategoryClassificationList() {
         CenterdataTEmergencyMaterial centerdataTEmergencyMaterial = new CenterdataTEmergencyMaterial();
@@ -113,24 +148,4 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
         setSookaDataBase(team);
         return emergencyBigDataMapper.getBigDataFortenterprises(team);
     }
-
-    /**
-     * 查询应急物资
-     */
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<Map<String, Object>> getBigDataForMaterial(CenterdataTEmergencyTeam team) {
-        setSookaDataBase(team);
-        return emergencyBigDataMapper.getBigDataForMaterial(team);
-    }
-
-    /**
-     * 数据中台统计
-     */
-    @Override
-    @DataScopeMutiDept(deptAlias = "d", userAlias = "u")
-    public List getEmergencyAllCount(VisuEmergencyCenterDataVO vo) {
-        setSookaDataBase(vo);
-        return emergencyBigDataMapper.getEmergencyAllCount(vo);
-    }
 }

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

@@ -57,8 +57,7 @@
         SELECT
             'centerdata_t_emergency_warehouse' resourceTable,
             '应急仓库' resourceName,
-            count(*) count,
-            'icon-centerdata_t_emergency_warehouse' icon
+            count(*) count
         FROM
             onest_data.centerdata_t_emergency_warehouse a
             LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
@@ -69,8 +68,7 @@
         SELECT
             'centerdata_t_emergency_team' resourceTable,
             '应急队伍' resourceName,
-            count(*) count,
-            'icon-centerdata_t_emergency_team' icon
+            count(*) count
         FROM
             onest_data.centerdata_t_emergency_team a
             LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
@@ -81,29 +79,25 @@
         SELECT
             'centerdata_t_emergency_idlh_enterprises' resourceTable,
             '危化企业' resourceName,
-            count(*) count,
-            'icon-centerdata_t_emergency_idlh_enterprises' icon
+            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>
     <select id="selectCategoryClassificationList" parameterType="CenterdataTEmergencyMaterial" resultType="java.util.Map">
         SELECT
@@ -287,164 +281,5 @@
       order by
         count desc
     </select>
-    <select id="getBigDataForMaterial" resultType="Map" parameterType="CenterdataTEmergencyTeam">
-      select
-        x.material_type,y.dict_label,COUNT(x.id) count
-     from
-        centerdata_t_emergency_material x
-        LEFT JOIN
-        ${database_system}.sys_dict_data y
-        ON
-        x.material_type = y.dict_value and y.dict_type = 'emergency_material_type'
-        LEFT JOIN
-        ${database_system}.sys_dept d
-        ON
-        x.dept_id = d.dept_id
-      where true
-        ${params.dataScope}
-      GROUP BY
-        x.material_type
-      order by
-        count desc
-    </select>
-    <select id="getEmergencyAllCount" parameterMap="resourceParm" resultMap="countResult">
-    SELECT
-	'centerdata_t_emergency_warehouse' resourceTable,
-	'应急仓库' resourceName,
-	count(*) count,
-	'icon-centerdata_t_emergency_warehouse' icon
-    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,
-	'icon-centerdata_t_emergency_team' icon
-    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,
-	'icon-centerdata_t_emergency_idlh_enterprises' icon
-    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,
-	'icon-centerdata_t_emergency_material' icon
-    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}
-    UNION
-    SELECT
-	'centerdata_t_forest_firehydrant' resourceTable,
-	'地上消火栓' resourceName,
-	count(*) count,
-	'icon-centerdata_t_forest_firehydrant_1' icon
-    FROM
-	onest_data.centerdata_t_forest_firehydrant 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
-    a.firehydrant_type = "firehydrant_1"
-    AND
-	1 = 1 ${params.dataScope}
-    UNION
-    SELECT
-	'centerdata_t_forest_firehydrant' resourceTable,
-	'地下消火栓' resourceName,
-	count(*) count,
-	'icon-centerdata_t_forest_firehydrant_2' icon
-    FROM
-	onest_data.centerdata_t_forest_firehydrant 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
-  a.firehydrant_type = "firehydrant_2"
-    AND
-	1 = 1 ${params.dataScope}
-    UNION
-    SELECT
-	'centerdata_t_forest_firehydrant' resourceTable,
-	'室内消火栓' resourceName,
-	count(*) count,
-	'icon-centerdata_t_forest_firehydrant_3' icon
-    FROM
-	onest_data.centerdata_t_forest_firehydrant 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
-    a.firehydrant_type = "firehydrant_3"
-    AND
-	1 = 1 ${params.dataScope}
-    UNION
-    SELECT
-	'centerdata_t_forest_watercrane' resourceTable,
-	'水鹤' resourceName,
-	count(*) count,
-	'icon-centerdata_t_forest_watercrane' icon
-    FROM
-	onest_data.centerdata_t_forest_watercrane 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_forest_waterintake' resourceTable,
-	'取水口' resourceName,
-	count(*) count,
-	'icon-centerdata_t_forest_waterintake' icon
-    FROM
-	onest_data.centerdata_t_forest_waterintake 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_firecontrol_foam_liquid' resourceTable,
-	'泡沫液' resourceName,
-	count(*) count,
-	'icon-centerdata_t_firecontrol_foam_liquid' icon
-    FROM
-	onest_data.centerdata_t_firecontrol_foam_liquid 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_firecontrol_fire_force' resourceTable,
-	'消防力量' resourceName,
-	count(*) count,
-	'icon-centerdata_t_firecontrol_fire_force' icon
-    FROM
-	onest_data.centerdata_t_firecontrol_fire_force 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>
 </mapper>