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

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

@@ -29,7 +29,7 @@ public interface IEmergencyBigDataService {
      *
      * @return
      */
-    List selectPersonnelList();
+    List<Map<String,Object>> selectPersonnelList();
 
     /**
      * 查询数据中台所有资源
@@ -46,7 +46,7 @@ public interface IEmergencyBigDataService {
      *
      * @return
      */
-    List selectCategoryClassificationList();
+    List<Map<String,Object>> selectCategoryClassificationList();
 
     /**
      * 高危企业分布

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/IFireControlBigDataService.java

@@ -59,8 +59,9 @@ public interface IFireControlBigDataService {
 
     /**
      * 基本联动力量
+     * @return
      */
-    List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce);
+    List<Map<String,Object>> getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce);
 
     /**
      * 其他力量统计

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

@@ -1,10 +1,7 @@
 package com.sooka.sponest.data.digitalfirecontrol.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-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.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestFirehydrant;
@@ -22,8 +19,6 @@ import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeather
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -124,7 +119,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
+    public List<Map<String, Object>> getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
         return fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
     }

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

@@ -22,7 +22,7 @@
             a.inspection_name
     </select>
 
-    <select id="selectPersonnelList" parameterType="CenterdataTEmergencyPerson" resultType="java.util.Map">
+    <select id="selectPersonnelList" parameterType="CenterdataTEmergencyPerson" resultType="java.util.LinkedHashMap">
         SELECT
             COUNT( a.id ) AS value,
             b.dict_label  AS name