1.应急 右屏，调整

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -15,17 +15,11 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsM
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertUseUnitStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.ymt.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.AlertCalledMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.DispatchPaperMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.DispatchTaskMapper;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -75,9 +69,6 @@ public class YJDPStatisticsServiceImpl {
 
     private DispatchTaskMapper dispatchTaskMapper;
 
-
-    private DispatchPaperMapper dispatchPaperMapper;
-
     private RestHighLevelClient restHighLevelClient;
 
     private StCommonServiceImpl stCommonService;
@@ -98,13 +89,12 @@ public class YJDPStatisticsServiceImpl {
     private final static String ELEVATOR_EQU_DEFINE_CODES = "3410,3420,3430,3310,3320,3210,3220,3120,3130,3110";
 
 
-    public YJDPStatisticsServiceImpl(AlertCalledMapper alertCalledMapper, AlertRescueStatisticsMapper alertRescueStatisticsMapper, AlertUseUnitStatisticsMapper alertUseUnitStatisticsMapper, AlertStatisticsMapper alertStatisticsMapper, DispatchTaskMapper dispatchTaskMapper, DispatchPaperMapper dispatchPaperMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, DataDictionaryServiceImpl dataDictionaryService) {
+    public YJDPStatisticsServiceImpl(AlertCalledMapper alertCalledMapper, AlertRescueStatisticsMapper alertRescueStatisticsMapper, AlertUseUnitStatisticsMapper alertUseUnitStatisticsMapper, AlertStatisticsMapper alertStatisticsMapper, DispatchTaskMapper dispatchTaskMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, DataDictionaryServiceImpl dataDictionaryService) {
         this.alertCalledMapper = alertCalledMapper;
         this.alertRescueStatisticsMapper = alertRescueStatisticsMapper;
         this.alertUseUnitStatisticsMapper = alertUseUnitStatisticsMapper;
         this.alertStatisticsMapper = alertStatisticsMapper;
         this.dispatchTaskMapper = dispatchTaskMapper;
-        this.dispatchPaperMapper = dispatchPaperMapper;
         this.restHighLevelClient = restHighLevelClient;
         this.stCommonService = stCommonService;
         this.dataDictionaryService = dataDictionaryService;
@@ -215,88 +205,28 @@ public class YJDPStatisticsServiceImpl {
     public List<AlertPaperInfoDto> instantAlert(DPFilterParamDto dpFilterParamDto) {
         List<String> regionCodes = new ArrayList<>();
         regionCodes.add(dpFilterParamDto.getCityCode());
-        List<AlertPaperInfoDto> alertPaperInfoDtoList = this.getAlertPaperInfoList(this.authRegionCodeList(regionCodes), false);
-        return alertPaperInfoDtoList;
-    }
-
-    public List<AlertPaperInfoDto> getAlertPaperInfoList(List<String> regionCodes, Boolean isHistory) {
-        List<AlertPaperInfoDto> temp = alertCalledMapper.getAlertPaperInfoList(regionCodes, isHistory);
-        temp.forEach(t -> {
-            DispatchPaper paper = dispatchPaperMapper.selectOne(new LambdaQueryWrapper<DispatchPaper>().eq(DispatchPaper::getIsDelete, false).eq(DispatchPaper::getAlertId, t.getAlertId()));
-            if (paper != null) {
-                t.setFinishTime(paper.getFeedbackFinishTime());
-            }
-        });
-        return temp;
-    }
-
-    public List<String> getUserRegionCode() {
-        List<String> regionList = new ArrayList<>();
-        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-        CompanyModel userCompany = me.getCompanys().get(0);
-        String regions = userCompany.getRegionSeq();
-        if (regions != null) {
-            String[] regionsId = regions.split(",");
-            for (String regionId : regionsId) {
-                RegionModel region = Systemctl.regionClient.getRegion(Long.valueOf(regionId)).getResult();
-                regionList.add(region.getRegionCode() + "");
-            }
-        }
-        return regionList;
-    }
-
-    public List<String> authRegionCodeList(List<String> regionCodes) {
-        // 警情id 警情地址 警情状态 警情类型 警情发生时间
-        List<String> useRegionCode = this.getUserRegionCode();
-        if (regionCodes == null) {
-            regionCodes = useRegionCode;
-        } else {
-            // 判断传入regionCodes 是否越权
-            List<String> tempList = new ArrayList<>();
-            Iterator<String> regionIt = regionCodes.iterator();
-            while (regionIt.hasNext()) {
-                String tempCode = regionIt.next();
-                String districtCode = tempCode.substring(4, 6);
-                String provinceCode = tempCode.substring(2, 6);
-                if ("0000".equals(provinceCode)) {// 为省则默认使用用户现有权限查询数据
-                    regionCodes = useRegionCode;
-                } else {
-                    if ("00".equals(districtCode)) { // 为市
-                        if (!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
-                            for (String tempUsercode : useRegionCode) {
-                                if (tempUsercode.contains(tempCode.substring(0, 4))) {
-                                    tempList.add(tempUsercode);
-                                }
-                            }
-                            regionIt.remove();
-                        }
-                    } else { // 为区 不会出现越权情况
-
-                    }
-                }
-            }
-            regionCodes.addAll(tempList);
-        }
-        return regionCodes;
+        return alertCalledMapper.getAlertPaperInfoList(regionCodes, false);
     }
 
     public JSONObject trappedUserCount(DPFilterParamDto dpFilterParamDto) throws Exception {
-        String date = DateUtil.formatDate(DateTimeUtil.addMonths(new Date(), -1), "yyyy-MM");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("xdata", Arrays.asList("30分钟内到达次数", "超过30分钟到次数", "一级救援次数", "二级救援次数", "三级救援次数"));
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        if(orgCode == null){
+            jsonObject.put("ydata", Arrays.asList(0L,0L,0L,0L,0L));
+            return jsonObject;
+        }
+        String date = DateUtil.formatDate(DateTimeUtil.addMonths(new Date(), -1), "yyyy-MM");
         LambdaQueryWrapper<AlertRescueStatistics> lambda = new QueryWrapper<AlertRescueStatistics>().lambda();
         lambda.likeRight(AlertRescueStatistics::getSupervisoryUnitOrgCode, orgCode);
         lambda.eq(AlertRescueStatistics::getStatisticsDate, date);
         List<AlertRescueStatistics> alertRescueStatistics = alertRescueStatisticsMapper.selectList(lambda);
-
         List<Long> ydata = new ArrayList<>();
         ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLessNum).sum());
         ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getGreaterNum).sum());
         ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelOne).sum());
         ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelTwo).sum());
         ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelThree).sum());
-
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("xdata", Arrays.asList("30分钟内到达次数", "超过30分钟到次数", "一级救援次数", "二级救援次数", "三级救援次数"));
         jsonObject.put("ydata", ydata);
         return jsonObject;
     }
@@ -304,7 +234,9 @@ public class YJDPStatisticsServiceImpl {
     public List<AlertUseUnitStatisticsDto> trappedUserHighCompanyCount(DPFilterParamDto dpFilterParamDto) throws Exception {
         String date = DateUtil.formatDate(DateTimeUtil.addMonths(new Date(), -1), "yyyy-MM");
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
-
+        if(orgCode == null){
+            return new ArrayList<>();
+        }
         LambdaQueryWrapper<AlertUseUnitStatistics> lambda = new QueryWrapper<AlertUseUnitStatistics>().lambda();
         lambda.likeRight(AlertUseUnitStatistics::getSupervisoryUnitOrgCode, orgCode);
         lambda.eq(AlertUseUnitStatistics::getStatisticsDate, date);