1.大屏-区域安全指数接口优重写初稿

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/CylinderStatisticsMapper.java

@@ -13,4 +13,11 @@ import org.apache.ibatis.annotations.Param;
 public interface CylinderStatisticsMapper {
 
     Long countEnterpriseNumForCylinder(@Param("orgCode") String orgCode);
+
+    /**
+     * 按照管辖维度，统计充装单位使用登记证的办理率
+     * @param orgCode 区域对应的单位orgCode
+     * @return 办理率*100
+     */
+    String queryUserRegisterCertAppPercent(@Param("orgCode") String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml

@@ -10,4 +10,25 @@
             unit_type LIKE'%充装单位%'
             and supervise_org_code like concat(#{orgCode},'%')
     </select>
+    <select id="queryUserRegisterCertAppPercent" resultType="java.lang.String">
+            select
+	            case when s2.total= 0 then 0 else round(s1.num/s2.total * 100, 2) end as percent
+            from
+                (SELECT
+                 count(DISTINCT(a.use_unit_credit_code)) as num
+                FROM
+                 "tzs_jg_use_registration_manage" a,
+                  privilege_company c
+                where
+                a.receive_company_code = c.company_code
+                and  a.certificate_status='已登记'
+                and c.org_code  like concat(#{orgCode},'%')) s1,
+                (SELECT
+                   count(1) as total
+                FROM "tz_base_enterprise_info"
+                where
+                    unit_type LIKE'%充装单位%'
+                    and supervise_org_code like concat(#{orgCode},'%')
+                ) s2
+    </select>
 </mapper>

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/AQZSDPStatisticsServiceImpl.java

@@ -2,18 +2,16 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.KeyValueDto;
-import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.enums.IssueMainBodyEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.IssueTypeEnum;
-import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.statistics.api.dto.EquipQuestionNumCountDto;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SecurityIndexCountItemDto;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import joptsimple.internal.Strings;
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +35,6 @@ import java.text.NumberFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -58,12 +55,15 @@ public class AQZSDPStatisticsServiceImpl {
     @Autowired
     RestHighLevelClient restHighLevelClient;
 
-
-    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
-
     @Resource
     private AQZSDPStatisticsMapper statisticsMapper;
 
+    @Autowired
+    CylinderStatisticsMapper cylinderStatisticsMapper;
+
+    @Autowired
+    private StCommonServiceImpl stCommonService;
+
 
     private String getLicenseEfficiencyByRegion(String orgCode) {
         List<KeyValueDto> keyValueDtos = statisticsMapper.queryLicenseEfficiencyOfRegion(orgCode);
@@ -119,7 +119,7 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
     public Map<String, Object> getChildEarlyWarning(String regionCode) throws Exception {
-        List<RegionModel> regionModels = this.setRegionIfRootParent(regionCode);
+        List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(regionCode);
         List<String> collect = regionModels.stream().map(c -> c.getRegionCode().toString()).collect(Collectors.toList());
         List<CompanyModel> companyModelList = Privilege.companyClient.queryListByCompanyCode(Strings.join(collect, ",")).getResult();
         Map<String, CompanyModel> companyMap = companyModelList.stream().collect(Collectors.toMap(CompanyModel::getCompanyCode, c -> c));
@@ -197,18 +197,9 @@ public class AQZSDPStatisticsServiceImpl {
         return result;
     }
 
-    private List<RegionModel> setRegionIfRootParent(String regionCode) throws Exception {
-        List<RegionModel> regionList = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
-        // 陕西省时需要在地图返回独立的地级市:韩城、杨凌、西咸
-        if (regionCode.equals(TZSCommonConstant.SHAN_XI_REGION_CODE)) {
-            List<RegionModel> independentRegions = ReginStepEnum.enum2RegionList("map");
-            regionList.addAll(independentRegions);
-        }
-        return regionList;
-    }
 
     public Map<String, Object> getSecurityIndex(DPFilterParamDto dpFilterParamDto) throws Exception {
-        List<RegionModel> regionModels = this.setRegionIfRootParent(dpFilterParamDto.getCityCode());
+        List<RegionModel> regionModels = co.setRegionIfRootParent(dpFilterParamDto.getCityCode());
         Map<String, SecurityIndexCountItemDto> regionCodeSecurityIndexMap = getSecurityIndexCountItemDtoMap(regionModels);
         List<Map<String, String>> data = new ArrayList<>();
         List<Map<String, String>> finalData = data;
@@ -274,8 +265,8 @@ public class AQZSDPStatisticsServiceImpl {
                 } else {
                     countItemDto.setXuke(value);
                 }
-                // 2.使用登记办理率 TODO
-                countItemDto.setShiyongdengji("100");
+                // 2.使用登记办理率
+                countItemDto.setShiyongdengji(cylinderStatisticsMapper.queryUserRegisterCertAppPercent(orgCode));
                 // 3.检验超期率
                 countItemDto.setJianyanchaoqi(statisticsMapper.getInspectionExpiredRate(orgCode, null).get("expiredRate").toString());
                 // 4.检验合格率
@@ -323,7 +314,7 @@ public class AQZSDPStatisticsServiceImpl {
         Map<String, Object> dataMap = new HashMap<>();
         String startDate = LocalDate.now().minusDays(100).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<String> mainBodyNameList = IssueMainBodyEnum.getEnumNameList();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<Map<String, Object>> list = statisticsMapper.selectByOrgAndMainBody(orgCode, mainBodyNameList, startDate, null);
         List<Object> legendDataList = new ArrayList<>();
         for (int i = 0; i < 2; i++) {
@@ -368,23 +359,13 @@ public class AQZSDPStatisticsServiceImpl {
         return resultMap;
     }
 
-    private String getAndSetOrgCode(String cityCode) {
-        String orgCode = regionCodeOrgCodeMap.get(cityCode);
-        if (orgCode == null) {
-            orgCode = statisticsMapper.getOrgCodeByCompanyCode(cityCode);
-            if (orgCode != null) {
-                regionCodeOrgCodeMap.put(cityCode, orgCode);
-            }
-        }
-        return orgCode;
-    }
 
     public Map<String, Object> equipmentCount(String cityCode) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("3");
         String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.EQUIPMENT.getName(), null);
@@ -403,7 +384,7 @@ public class AQZSDPStatisticsServiceImpl {
     public List<Map<String, Object>> companyCount(String cityCode) {
         List<Map<String, Object>> resultList = new ArrayList<>();
         Map<String, Object> dataMap = new HashMap<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("2");
         String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.COMPANY.getName(), null);
@@ -435,7 +416,7 @@ public class AQZSDPStatisticsServiceImpl {
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("1");
         String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.PERSON.getName(), null);
@@ -456,7 +437,7 @@ public class AQZSDPStatisticsServiceImpl {
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("4");
         String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.EQUIPMENT.getName(), "2300");
@@ -487,7 +468,7 @@ public class AQZSDPStatisticsServiceImpl {
             legendData.add(map);
         }
         resultMap.put("legendData", legendData);
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         int year = LocalDate.now().getYear();
         List<Map<String, Object>> allIssue = statisticsMapper.getIssueCountByMonth(orgCode, String.valueOf(year), null);
         List<Map<String, Object>> endIssue = statisticsMapper.getIssueCountByMonth(orgCode, String.valueOf(year), "1");
@@ -541,7 +522,7 @@ public class AQZSDPStatisticsServiceImpl {
             legendData.add(map);
         }
         resultMap.put("legendData", legendData);
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         String year = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<Map<String, Object>> allIssue = statisticsMapper.getIssueCountByDate(orgCode, year, null);
         List<Map<String, Object>> endIssue = statisticsMapper.getIssueCountByDate(orgCode, year, "1");
@@ -581,7 +562,7 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
     public Map<String, Object> issueCountByCityCode(String cityCode) {
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         String now = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
         int count = statisticsMapper.countByOrgCode(orgCode, now);
         Map<String, Object> resultMap = new HashMap<>();
@@ -591,7 +572,7 @@ public class AQZSDPStatisticsServiceImpl {
 
 
     public List<Map<String, Object>> issueChildrenCityCount(String cityCode) throws Exception {
-        List<RegionModel> regionModels = setRegionIfRootParent(cityCode);
+        List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(cityCode);
         List<Integer> regionCodeList = regionModels.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
         List<Map<String, String>> orgCodeAndCompanyCodesByCompanyCodes = statisticsMapper.getOrgCodeAndCompanyCodesByCompanyCodes(regionCodeList);
         List<String> orgCodes = orgCodeAndCompanyCodesByCompanyCodes.stream().map(m -> m.get("orgCode")).collect(Collectors.toList());
@@ -629,7 +610,7 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> issueMonthList(String cityCode) {
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         String time = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
         List<Map<String, Object>> list = statisticsMapper.issueMonthList(orgCode, time);
         return list;
@@ -637,7 +618,7 @@ public class AQZSDPStatisticsServiceImpl {
 
     public Map<String, Object> issueProblemLevelCount(String cityCode) {
         Map<String, Object> resultMap = new HashMap<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         String time = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy"));
         List<Map<String, Object>> list = statisticsMapper.issueProblemLevelCount(orgCode, time);
         List<Object> xdata = new ArrayList<>();
@@ -653,7 +634,7 @@ public class AQZSDPStatisticsServiceImpl {
 
     public List<Map<String, Object>> issueCompanyTop(String cityCode) {
         List<Map<String, Object>> resultList = new ArrayList<>();
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         String time = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy"));
         List<Map<String, Object>> list = statisticsMapper.issueCompanyTop(orgCode, time);
         for (int i = 0; i < list.size(); i++) {
@@ -668,8 +649,8 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> issueChildrenCityCountTop(String cityCode) throws Exception {
-        List<RegionModel> regionModels = setRegionIfRootParent(cityCode);
-        List<Integer> regionCodeList = regionModels.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
+        List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(cityCode);
+        List<Integer> regionCodeList = regionModels.stream().map(RegionModel::getRegionCode).collect(Collectors.toList());
         List<Map<String, String>> orgCodeAndCompanyCodesByCompanyCodes = statisticsMapper.getOrgCodeAndCompanyCodesByCompanyCodes(regionCodeList);
         List<String> orgCodes = orgCodeAndCompanyCodesByCompanyCodes.stream().map(m -> m.get("orgCode")).collect(Collectors.toList());
         String now = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy"));
@@ -729,11 +710,11 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> issueCountTopByProblemType(String cityCode) {
-        String orgCode = getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
         List<Map<String, Object>> allList = statisticsMapper.issueCountTopByProblemType(orgCode, null);
         List<Map<String, Object>> endList = statisticsMapper.issueCountTopByProblemType(orgCode, "1");
         Map<String, Object> endIssuedataMap = new HashMap<>();
-        endList.stream().forEach(t -> {
+        endList.forEach(t -> {
             endIssuedataMap.put(t.get("problemTypeCode").toString(), t.get("count"));
         });
         List<Map<String, Object>> resultList = new ArrayList<>();
@@ -752,7 +733,7 @@ public class AQZSDPStatisticsServiceImpl {
 
     public List<Map<String, Object>> getEquipQuestionList(DPFilterParamDto dpFilterParamDto) {
         this.setDefaultFilter(dpFilterParamDto);
-        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (StringUtils.isEmpty(orgCode)) {
             return new ArrayList<>();
         }