ソースを参照

修改工具类

Wang-Xiao-Ran 1 年間 前
コミット
aa465fd4d9

+ 0 - 1
src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/AgricultureBigDataServiceImpl.java

@@ -8,7 +8,6 @@ import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmAgricultu
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureBigDataBO;
 import com.sooka.sponest.data.digitalagriculture.mapper.AgricultureBigDataMapper;
 import com.sooka.sponest.data.digitalagriculture.service.IAgricultureBigDataService;
-import com.sooka.sponest.data.utils.DeptLevelUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 0 - 3
src/main/java/com/sooka/sponest/data/digitalenvironment/service/impl/EnvironmentBigDataServiceImpl.java

@@ -2,7 +2,6 @@ package com.sooka.sponest.data.digitalenvironment.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
@@ -21,11 +20,9 @@ import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestWeatherinf
 import com.sooka.sponest.data.generalbusiness.domain.bo.CenterdataTForestWeatherinformationBigDataBO;
 import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeatherinformationBigDataVO;
 import com.sooka.sponest.data.utils.DataConstants;
-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.ArrayList;
 import java.util.HashMap;
 import java.util.List;

+ 0 - 1
src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/FireControlBigDataServiceImpl.java

@@ -16,7 +16,6 @@ import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestWeatherinformation;
 import com.sooka.sponest.data.generalbusiness.domain.bo.CenterdataTForestWeatherinformationBigDataBO;
 import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeatherinformationBigDataVO;
-import com.sooka.sponest.data.utils.DeptLevelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 0 - 7
src/main/java/com/sooka/sponest/data/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -1,15 +1,10 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestCar;
-import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyMaterial;
-import com.sooka.sponest.data.digitalfirecontrol.domain.vo.DataVisuFireCloudMapVO;
 import com.sooka.sponest.data.digitalforest.domain.*;
 import com.sooka.sponest.data.digitalforest.domain.bo.GridUserGwCount;
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
@@ -20,13 +15,11 @@ import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestWeatherinformation;
 import com.sooka.sponest.data.generalbusiness.domain.bo.CenterdataTForestWeatherinformationBigDataBO;
 import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeatherinformationBigDataVO;
-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.*;
-import java.util.stream.Collectors;
 
 /**
  * @Auther: mjq

+ 0 - 1
src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -13,7 +13,6 @@ import com.sooka.sponest.data.digitalresource.service.IResourceBigDataService;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicOutletSewage;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicPatrolTask;
 import com.sooka.sponest.data.other.land.domain.CenterdataTResourcesLand;
-import com.sooka.sponest.data.utils.DeptLevelUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 0 - 1
src/main/java/com/sooka/sponest/data/digitalwater/service/impl/WaterBigDataServiceImpl.java

@@ -10,7 +10,6 @@ import com.sooka.sponest.data.digitalwater.domain.*;
 import com.sooka.sponest.data.digitalwater.mapper.WaterBigDataMapper;
 import com.sooka.sponest.data.digitalwater.service.IWaterBigDataService;
 import com.sooka.sponest.data.other.hydroenergy.domain.CenterdataTResourcesHydroenergy;
-import com.sooka.sponest.data.utils.DeptLevelUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 0 - 66
src/main/java/com/sooka/sponest/data/utils/DeptLevelUtil.java

@@ -1,66 +0,0 @@
-package com.sooka.sponest.data.utils;
-
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteDeptService;
-import com.ruoyi.system.api.domain.SysDept;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class DeptLevelUtil {
-
-    private static final Logger log = LoggerFactory.getLogger(DeptLevelUtil.class);
-
-    @Autowired
-    private RemoteDeptService remoteDeptService;
-
-    public List<Map<String,Object>> getDeptLevel(List<Map<String,Object>> list,String deptId) {
-        if (StringUtils.isEmpty(deptId)||"null".equals(deptId)){
-            deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId().toString();
-        }
-        List<SysDept> sysDeptList = remoteDeptService .selectChildrenCountyOrVillagesDeptListByDeptId(deptId).getData();
-        if (StringUtils.isEmpty(list)){
-            return null;
-        }
-        if (!list.get(0).containsKey("ancestors")||!list.get(0).containsKey("deptId")){
-            log.error("入参没有key:'ancestors'或没有key:'deptId'");
-            return new ArrayList<>();
-        }
-        List<Map<String,Object>> mapList = new ArrayList<>();
-        for (SysDept sysDept : sysDeptList){//部门
-            Map<String,Object> map = new HashMap<>();
-            //map中增加key
-            for (String key : list.get(0).keySet()) {
-                if (!key.equals("ancestors")&&!key.equals("deptId")&&!key.equals("name")){
-                    map.put(key,0);
-                }
-            }
-            for (Map<String,Object> ancestors : list){//资源数据
-                if (ancestors.get("ancestors").toString().concat(",").concat(ancestors.get("deptId").toString()).contains(sysDept.getAncestors().concat(",").concat(sysDept.getDeptId().toString()))){
-                    for (String key : ancestors.keySet()) {
-                        if (!key.equals("ancestors")&&!key.equals("deptId")&&!key.equals("name")){
-                            map.put(key,new BigDecimal(map.get(key).toString()).add(new BigDecimal(ancestors.get(key).toString())));
-                        }
-                    }
-                }
-                if (ancestors.containsKey("name")){
-                    map.put("name",ancestors.get("name"));
-                }
-            }
-            map.put("deptId",sysDept.getDeptId());
-            map.put("deptName",sysDept.getDeptName());
-            map.put("deptType",sysDept.getDeptType());
-            mapList.add(map);
-        }
-        return mapList;
-    }
-}