应急-资源-消防修改格式

src/main/java/com/sooka/sponest/data/digitalfirecontrol/controller/FireControlBigDataController.java

@@ -1,8 +1,11 @@
 package com.sooka.sponest.data.digitalfirecontrol.controller;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestFirehydrant;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestWatercrane;
@@ -23,7 +26,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Auther: mjq
@@ -38,6 +44,8 @@ public class FireControlBigDataController extends BaseController {
 
     @Autowired
     private IFireControlBigDataService iFireControlBigDataService;
+    @Resource
+    private DeptLevelUtil deptLevelUtil;
 
     /**
      * 水鹤数量按部门分组
@@ -103,7 +111,11 @@ public class FireControlBigDataController extends BaseController {
     @ApiOperation(value = "远端调用查询泡沫液数量按部门分组", notes = "远端调用查询泡沫液数量按部门分组")
     @PostMapping("/selectBigDataFirecontrolFoamLiquidDeptCount")
     public R selectBigDataFirecontrolFoamLiquidDeptCount(@RequestBody CenterdataTFirecontrolFoamLiquid centerdataTFirecontrolFoamLiquid) {
-        return R.ok(iFireControlBigDataService.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid));
+        List<Map<String,Object>> mapList = iFireControlBigDataService.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
+        if (StringUtils.isNull(centerdataTFirecontrolFoamLiquid.getDeptId())){
+            centerdataTFirecontrolFoamLiquid.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()),mapList,"reserves"));
     }
 
     /**
@@ -112,7 +124,15 @@ public class FireControlBigDataController extends BaseController {
     @ApiOperation(value = "可视化获取基本联动力量列表", notes = "可视化获取基本联动力量列表")
     @PostMapping("/getbasiclinkageforeList")
     public AjaxResult getbasiclinkageforeList(@RequestBody CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolOtherLinkageForce) {
-        return AjaxResult.success(iFireControlBigDataService.getbasiclinkageforeList(centerdataTFirecontrolOtherLinkageForce));
+        List<Map<String,Object>> mapList = iFireControlBigDataService.getbasiclinkageforeList(centerdataTFirecontrolOtherLinkageForce);
+        if (StringUtils.isNull(centerdataTFirecontrolOtherLinkageForce.getDeptId())){
+            centerdataTFirecontrolOtherLinkageForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("forkliftNum");
+        addKeys.add("fightingNum");
+        addKeys.add("ton");
+        return AjaxResult.success(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolOtherLinkageForce.getDeptId()),mapList,addKeys));
     }
 
 
@@ -143,7 +163,11 @@ public class FireControlBigDataController extends BaseController {
     @ApiOperation(value = "远端调用查询消防力量管理数量按部门分组", notes = "远端调用查询消防力量管理数量按部门分组")
     @PostMapping("/selectBigDataFireforceDeptCount")
     public R selectBigDataFireforceDeptCount(@RequestBody CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
-        return R.ok(iFireControlBigDataService.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce));
+        List<Map<String,Object>> list = iFireControlBigDataService.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
+        if (StringUtils.isNull(centerdataTFirecontrolFireForce.getDeptId())){
+            centerdataTFirecontrolFireForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFireForce.getDeptId()),list,"value"));
     }
 
     /**
@@ -152,7 +176,15 @@ public class FireControlBigDataController extends BaseController {
     @ApiOperation(value = "查询水鹤+取水口+消火栓远端调用", notes = "查询水鹤+取水口+消火栓远端调用")
     @PostMapping("/selectBigDataNumWithDeptCount")
     public R selectBigDataNumWithDeptCount(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
-        return R.ok(iFireControlBigDataService.selectBigDataNumWithDeptCount(visuForestCloudMapVO));
+        List<Map<String,Object>> list = iFireControlBigDataService.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
+        if (StringUtils.isNull(visuForestCloudMapVO.getDeptId())){
+            visuForestCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("fireHydrant");
+        addKeys.add("waterIntake");
+        addKeys.add("waterCranes");
+        return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(visuForestCloudMapVO.getDeptId()),list,addKeys));
     }
 
     /**
@@ -164,7 +196,11 @@ public class FireControlBigDataController extends BaseController {
     @ApiOperation(value = "重点场所统计", notes = "重点场所统计")
     @PostMapping("/selectKeyLocations")
     public R selectKeyLocations(@RequestBody DataVisuFireCloudMapVO dataVisuFireCloudMapVO){
-        return R.ok(iFireControlBigDataService.selectKeyLocations(dataVisuFireCloudMapVO));
+        List<Map<String,Object>> list = iFireControlBigDataService.selectKeyLocations(dataVisuFireCloudMapVO);
+        if (StringUtils.isNull(dataVisuFireCloudMapVO.getDeptId())){
+            dataVisuFireCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(dataVisuFireCloudMapVO.getDeptId()),list,"num"));
     }
 
 }

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/FireControlBigDataServiceImpl.java

@@ -38,8 +38,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
 
     @Autowired
     private FireControlBigDataMapper fireControlBigDataMapper;
-    @Resource
-    private DeptLevelUtil deptLevelUtil;
+
 
     /**
      * 水鹤数量按部门分组
@@ -120,26 +119,14 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     @Override
     public List<Map<String,Object>> selectBigDataFirecontrolFoamLiquidDeptCount(CenterdataTFirecontrolFoamLiquid centerdataTFirecontrolFoamLiquid) {
         setSookaDataBase(centerdataTFirecontrolFoamLiquid);
-        List<Map<String,Object>> mapList = fireControlBigDataMapper.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
-        if (StringUtils.isNull(centerdataTFirecontrolFoamLiquid.getDeptId())){
-            centerdataTFirecontrolFoamLiquid.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()),mapList,"reserves");
+        return fireControlBigDataMapper.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
     }
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
-        List<Map<String,Object>> mapList = fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
-        if (StringUtils.isNull(centerdataTFirecontrolBasicLinkageForce.getDeptId())){
-            centerdataTFirecontrolBasicLinkageForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        List<String> addKeys = new ArrayList<>();
-        addKeys.add("forkliftNum");
-        addKeys.add("fightingNum");
-        addKeys.add("ton");
-        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()),mapList,addKeys);
+        return fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
     }
 
     /**
@@ -169,11 +156,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     @Override
     public List<Map<String,Object>> selectBigDataFireforceDeptCount(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         setSookaDataBase(centerdataTFirecontrolFireForce);
-        List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
-        if (StringUtils.isNull(centerdataTFirecontrolFireForce.getDeptId())){
-            centerdataTFirecontrolFireForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFireForce.getDeptId()),list,"value");
+        return fireControlBigDataMapper.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
     }
 
     /**
@@ -183,15 +166,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     @Override
     public List<Map<String,Object>> selectBigDataNumWithDeptCount(VisuForestCloudMapVO visuForestCloudMapVO) {
         setSookaDataBase(visuForestCloudMapVO);
-        List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
-        if (StringUtils.isNull(visuForestCloudMapVO.getDeptId())){
-            visuForestCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        List<String> addKeys = new ArrayList<>();
-        addKeys.add("fireHydrant");
-        addKeys.add("waterIntake");
-        addKeys.add("waterCranes");
-        return deptLevelUtil.getDeptLevel(String.valueOf(visuForestCloudMapVO.getDeptId()),list,addKeys);
+        return fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
     }
 
     /**
@@ -204,11 +179,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     @Override
     public List<Map<String,Object>> selectKeyLocations(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
         setSookaDataBase(dataVisuFireCloudMapVO);
-        List<Map<String,Object>> list = fireControlBigDataMapper.selectKeyLocations(dataVisuFireCloudMapVO);
-        if (StringUtils.isNull(dataVisuFireCloudMapVO.getDeptId())){
-            dataVisuFireCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(String.valueOf(dataVisuFireCloudMapVO.getDeptId()),list,"num");
+        return fireControlBigDataMapper.selectKeyLocations(dataVisuFireCloudMapVO);
     }
 
 }

src/main/java/com/sooka/sponest/data/digitalresource/controller/ResourceBigDataController.java

@@ -1,7 +1,12 @@
 package com.sooka.sponest.data.digitalresource.controller;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGrid;
 import com.sooka.sponest.data.digitalresource.domain.*;
@@ -17,7 +22,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 数字资源大屏统一Controller
@@ -29,6 +39,8 @@ public class ResourceBigDataController extends BaseController {
 
     @Autowired
     private IResourceBigDataService resourceBigDataService;
+    @Resource
+    private DeptLevelUtil deptLevelUtil;
 
     /**
      * 矿臧资源统计图--柱状图
@@ -38,9 +50,12 @@ public class ResourceBigDataController extends BaseController {
 
     @ApiOperation(value = "查询垃圾站数量按类型分组远端调用", notes = "查询垃圾站数量按部门分组远端调用")
     @PostMapping("/selectDepositResourcesCount")
-    public R selectDepositResourcesCount() {
-        CenterdataTResourcesDeposit centerdataTResourcesDeposit = new CenterdataTResourcesDeposit();
-        return R.ok(resourceBigDataService.selectDepositResourcesCount(centerdataTResourcesDeposit));
+    public R selectDepositResourcesCount(@RequestBody CenterdataTResourcesDeposit centerdataTResourcesDeposit) {
+        List<Map<String, Object>> mapList = resourceBigDataService.selectDepositResourcesCount(centerdataTResourcesDeposit);
+        if (StringUtils.isNull(centerdataTResourcesDeposit.getDeptId())){
+            centerdataTResourcesDeposit.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTResourcesDeposit.getDeptId()),mapList,"value"));
     }
 
     /**
@@ -96,7 +111,7 @@ public class ResourceBigDataController extends BaseController {
     /**
      * 地质灾害易发区统计图--饼图
      *
-     * @param centerdataTResourcesGeologicHazard
+     * @param
      * @return
      */
 
@@ -155,6 +170,12 @@ public class ResourceBigDataController extends BaseController {
     @ApiOperation("远端调用查询日常巡护")
     @PostMapping("/getHydraulicPatrolTask")
     public R getHydraulicPatrolTask(@RequestBody CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask) throws IOException {
-        return R.ok(resourceBigDataService.selectHydraulicPatrolTask(centerdataTHydraulicPatrolTask));
+        if (StringUtils.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
+            centerdataTHydraulicPatrolTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("realLength");
+        addKeys.add("patrolTrajectory");
+        return  R.ok(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()),resourceBigDataService.selectHydraulicPatrolTask(centerdataTHydraulicPatrolTask),addKeys));
     }
 }

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -49,11 +49,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     @Override
     public List<Map<String, Object>> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit) {
         setSookaDataBase(centerdataTResourcesDeposit);
-        List<Map<String, Object>> mapList = digitalResourcesBigDataMapper.selectDepositResourcesCount(centerdataTResourcesDeposit);
-        if (StringUtils.isNull(centerdataTResourcesDeposit.getDeptId())){
-            centerdataTResourcesDeposit.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTResourcesDeposit.getDeptId()),mapList,"value");
+        return digitalResourcesBigDataMapper.selectDepositResourcesCount(centerdataTResourcesDeposit);
     }
 
     /**
@@ -197,13 +193,8 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         for (Map<String, Object> stringObjectMap : hydraulicPatrolTask) {
             stringObjectMap.put("patrolTrajectory",getPlanLength(MapUtils.getString(stringObjectMap,"patrolTrajectory")));
         }
-        if (StringUtils.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
-            centerdataTHydraulicPatrolTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        }
-        List<String> addKeys = new ArrayList<>();
-        addKeys.add("realLength");
-        addKeys.add("patrolTrajectory");
-        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()),hydraulicPatrolTask,addKeys);
+
+        return hydraulicPatrolTask;
 
     }
     private String getPlanLength(String patrolTrajectory) {

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

@@ -54,7 +54,7 @@
         where 1=1 ${params.dataScope}
 
     </select>
-    <select id="selectCategoryClassificationList" parameterType="CenterdataTEmergencyMaterial" resultType="java.util.Map">
+    <select id="selectCategoryClassificationList" parameterType="CenterdataTEmergencyMaterial" resultType="java.util.LinkedHashMap">
         SELECT
             dict.dict_label AS name,
             COUNT( a.id ) AS value
@@ -181,9 +181,9 @@
         WHERE
             DATE_FORMAT( a.patrol_time, '%Y-%m' )= DATE_FORMAT(#{day},'%Y-%m')
     </select>
-    <select id="getBigDataForteam" resultType="Map" parameterType="CenterdataTEmergencyTeam">
+    <select id="getBigDataForteam" resultType="java.util.LinkedHashMap" parameterType="CenterdataTEmergencyTeam">
         select
-           COUNT(x.id) count,x.team_nature,y.dict_label
+           y.dict_label, COUNT(x.id) count, x.team_nature
         FROM
             centerdata_t_emergency_team x
             left JOIN
@@ -199,7 +199,7 @@
         GROUP BY
         x.team_nature
     </select>
-    <select id="getBigDataFortwarehouse" resultType="Map" parameterType="CenterdataTEmergencyTeam">
+    <select id="getBigDataFortwarehouse" resultType="java.util.LinkedHashMap" parameterType="CenterdataTEmergencyTeam">
       select
             x.dept_id,d.dept_name,COUNT(x.id) count
       from
@@ -216,9 +216,9 @@
         count desc
 
     </select>
-    <select id="getBigDataFortenterprises" resultType="Map" parameterType="CenterdataTEmergencyTeam">
+    <select id="getBigDataFortenterprises" resultType="java.util.LinkedHashMap" parameterType="CenterdataTEmergencyTeam">
      select
-        x.category,y.dict_label,COUNT(x.id) count
+        y.dict_label,x.category,COUNT(x.id) count
      from
         centerdata_t_emergency_idlh_enterprises x
         LEFT JOIN

src/main/resources/mapper/digitalfirecontrol/FireControlBigDataMapper.xml

@@ -38,7 +38,7 @@
         LIMIT 8
     </select>
 
-    <select id="geFireControltTotal" parameterMap="pm_VisuForestCloudMapVO" resultType="map">
+    <select id="geFireControltTotal" parameterMap="pm_VisuForestCloudMapVO" resultType="java.util.LinkedHashMap">
         select '水鹤' name,count(*) value from centerdata_t_forest_watercrane a
             left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
@@ -116,7 +116,7 @@
         group by a.dept_id,a.dept_name
     </select>
     <select id="selectBigDataFirecontrolFoamLiquidDeptCount" parameterType="CenterdataTFirecontrolFoamLiquid"
-            resultType="java.util.Map">
+            resultType="java.util.LinkedHashMap">
         SELECT
 	    d.ancestors AS ancestors,
 	    a.dept_id AS deptId,
@@ -131,13 +131,13 @@
     </select>
 
     <select id="getbasiclinkageforeList" parameterType="CenterdataTFirecontrolBasicLinkageForce"
-            resultType="map">
+            resultType="java.util.LinkedHashMap">
        SELECT d.ancestors ancestors,a.dept_id deptId,a.forklift_num forkliftNum,a.fire_fighting_truck_num fightingNum,a.fire_fighting_truck_tonnage ton
         from centerdata_t_firecontrol_basic_linkage_force a
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         WHERE  1=1 ${params.dataScope}
     </select>
-    <select  id="getOtherlinkageforceList" parameterType="CenterdataTFirecontrolOtherLinkageForce" resultType="java.util.Map">
+    <select  id="getOtherlinkageforceList" parameterType="CenterdataTFirecontrolOtherLinkageForce" resultType="java.util.LinkedHashMap">
         SELECT
             a.dept_name AS 'name',
                 count( a.id )
@@ -159,14 +159,14 @@
         group by a.dept_name,a.dept_id
     </select>
 
-    <select id="selectBigDataFireforceDeptCount" resultType="java.util.Map">
+    <select id="selectBigDataFireforceDeptCount" resultType="java.util.LinkedHashMap">
         select d.ancestors ancestors, a.dept_id deptId,count(a.id) value from centerdata_t_firecontrol_fire_force a
         left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
         group by a.dept_id
     </select>
 
-    <select id="selectBigDataNumWithDeptCount" parameterMap="pm_VisuForestCloudMapVO" resultType="map">
+    <select id="selectBigDataNumWithDeptCount" parameterMap="pm_VisuForestCloudMapVO" resultType="java.util.LinkedHashMap">
         SELECT a.ancestors,a.deptId,
              sum(CASE WHEN a.`name` = '消火栓' THEN a.value ELSE 0 END) AS 'fireHydrant',
              sum(CASE WHEN a.`name` = '取水口' THEN a.value ELSE 0 END) AS 'waterIntake',
@@ -199,7 +199,7 @@
         ) a GROUP BY a.ancestors,a.deptId
     </select>
 
-    <select id="selectKeyLocations" resultType="java.util.Map">
+    <select id="selectKeyLocations" resultType="java.util.LinkedHashMap">
         SELECT d.ancestors ancestors,a.dept_id deptId,count(a.id) num
         FROM centerdata_t_firecontrol_fire_key_places a
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id

src/main/resources/mapper/digitalresource/DigitalResourcesBigDataMapper.xml

@@ -238,7 +238,7 @@
         group by a.disaster_type
     </select>
     <select id="getGeologicHazard" parameterType="CenterdataTResourcesGeologicHazard"
-            resultType="java.util.Map">
+            resultType="java.util.LinkedHashMap">
         select dict.dict_label name ,count(a.id) value from ${database_system}.sys_dict_data dict
         left join centerdata_t_resources_geologic_hazard a on dict.dict_value = a.disaster_type
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
@@ -256,7 +256,7 @@
         group by a.construction_type
     </select>
 
-    <select id="selectResourcesLandInfoCount" parameterType="CenterdataTResourcesLandInfo"  resultType="java.util.Map">
+    <select id="selectResourcesLandInfoCount" parameterType="CenterdataTResourcesLandInfo"  resultType="java.util.LinkedHashMap">
         select dict.dict_label name,IFNULL(sum(a.area),0) value from ${database_system}.sys_dict_data dict
         left join (select a.* from centerdata_t_resources_land_info a left join ${database_system}.sys_dept d on
         a.dept_id=d.dept_id
@@ -269,7 +269,7 @@
         group by dict.dict_value
     </select>
 
-    <select id="selectFarmBasicFarmlandCount"  resultType="java.util.Map">
+    <select id="selectFarmBasicFarmlandCount"  resultType="java.util.LinkedHashMap">
         select
         a.dept_id deptId,d.ancestors,
         <foreach item="item" collection="map.dictList" open="" separator="," close="">
@@ -299,4 +299,4 @@
        </where>
        GROUP BY a.id
    </select>
-</mapper>
+</mapper>