消防大数据统计

src/main/java/com/sooka/sponest/data/digitalenvironment/service/impl/EnvironmentBigDataServiceImpl.java

@@ -173,7 +173,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
     public List<Map<String,Object>> leaveField(EnvironmentBigDataVo environmentBigDataVo) {
         setSookaDataBase(environmentBigDataVo);
         List<Map<String,Object>> list = centerdataTEnvironmentBigDataMapper.leaveField(environmentBigDataVo);
-        return deptLevelUtil.getDeptLevel(list);
+        return deptLevelUtil.getDeptLevel(list,environmentBigDataVo.getDeptId());
     }
 
     @DataScopeMutiDept(deptAlias = "d")

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

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.digitalfirecontrol.service.impl;
 
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
@@ -21,8 +20,6 @@ import com.sooka.sponest.data.utils.DeptLevelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -99,7 +96,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFirecontrolFoamLiquidDeptCount(CenterdataTFirecontrolFoamLiquid centerdataTFirecontrolFoamLiquid) {
         setSookaDataBase(centerdataTFirecontrolFoamLiquid);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
-        return deptLevelUtil.getDeptLevel(mapList);
+        return deptLevelUtil.getDeptLevel(mapList,centerdataTFirecontrolFoamLiquid.getDeptId().toString());
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -107,7 +104,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
-        return deptLevelUtil.getDeptLevel(mapList);
+        return deptLevelUtil.getDeptLevel(mapList,centerdataTFirecontrolBasicLinkageForce.getDeptId().toString());
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -132,7 +129,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFireforceDeptCount(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         setSookaDataBase(centerdataTFirecontrolFireForce);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
-        return deptLevelUtil.getDeptLevel(list);
+        return deptLevelUtil.getDeptLevel(list,centerdataTFirecontrolFireForce.getDeptId().toString());
     }
 
     /**
@@ -143,7 +140,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataNumWithDeptCount(VisuForestCloudMapVO visuForestCloudMapVO) {
         setSookaDataBase(visuForestCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
-        return deptLevelUtil.getDeptLevel(list);
+        return deptLevelUtil.getDeptLevel(list,visuForestCloudMapVO.getDeptId().toString());
     }
 
     /*
@@ -157,6 +154,6 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectKeyLocations(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
         setSookaDataBase(dataVisuFireCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectKeyLocations(dataVisuFireCloudMapVO);
-        return deptLevelUtil.getDeptLevel(list);
+        return deptLevelUtil.getDeptLevel(list,dataVisuFireCloudMapVO.getDeptId().toString());
     }
 }

src/main/java/com/sooka/sponest/data/utils/DeptLevelUtil.java

@@ -10,12 +10,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component
 public class DeptLevelUtil {
@@ -25,8 +23,10 @@ public class DeptLevelUtil {
     @Autowired
     private RemoteDeptService remoteDeptService;
 
-    public List<Map<String,Object>> getDeptLevel(List<Map<String,Object>> list) {
-        String deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId().toString();
+    public List<Map<String,Object>> getDeptLevel(List<Map<String,Object>> list,String deptId) {
+        if (StringUtils.isEmpty(deptId)){
+            deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId().toString();
+        }
         List<SysDept> sysDeptList = remoteDeptService.selectChildrenCountyOrVillagesDeptListByDeptId(deptId).getData();
         if (StringUtils.isEmpty(list)){
             return null;