大屏监管-中屏-各地市数据统计、大屏监管-中屏-当前区域数据统计接口提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/DPMapStatisticsItemEnum.java

@@ -28,7 +28,9 @@ public enum DPMapStatisticsItemEnum {
     CONSTRUCTION_UNITS("安改维单位 (家)", "constructionUnits", ""),
     USERS_UNITS("使用单位 (家)", "usersUnits", ""),
     GAS_UNITS("充装单位 (家)", "gasUnits", ""),
-    OPERATORS("作业人员 (人)", "operators", "");
+    OPERATORS("作业人员 (人)", "operators", ""),
+    DEVICE_COUNT("已纳管设备数", "deviceCount", ""),
+    CERTIFICATE_COUNT("登记证总量", "certificateCount", "");
     private String label;
     private String code;
     private String category;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -25,4 +23,6 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
     Page<JgUseRegistrationManageDto> queryForPage(@Param("page") Page<JgUseRegistrationManageDto> page,
                                            @Param("dto") JgUseRegistrationManageDto dto,
                                            @Param("sort") SortVo sortMap);
+
+    Long countCertificateByReginCode(String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -134,4 +134,16 @@
             tjurm.rec_date DESC
         </where>
     </select>
+    <select id="countCertificateByReginCode" resultType="java.lang.Long">
+        select
+            count(1)
+        from
+            tzs_jg_use_registration_manage tjurm
+        left join
+            privilege_company pc
+        on tjurm.receive_company_code = pc.company_code
+        where
+            pc.org_code like concat (#{reginCode},'%')
+            and tjurm.certificate_status = '已登记'
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DPStatisticsController.java

@@ -9,10 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -224,4 +221,26 @@ public class DPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.newRegCount(dpFilterParamDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-各地市数据统计", notes = "大屏监管-中屏-各地市数据统计")
+    @PostMapping(value = "/jg/centre/dataStatistic")
+    public ResponseModel<List<Map<String, Object>>> dataStatisticByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.dataStatisticByReginCode(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-当前区域数据统计", notes = "大屏监管-中屏-当前区域数据统计")
+    @PostMapping(value = "/jg/centre/dataStatisticCount")
+    public ResponseModel<Map<String, Object>> dataStatisticCountByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.dataStatisticCountByReginCode(dpFilterParamDto));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
@@ -35,7 +34,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilde
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -88,7 +87,7 @@ public class DPStatisticsServiceImpl {
      */
     private final static String COMPANY_TYPE_FILLING = "充装单位";
 
-
+    @Autowired
     private EquipmentCategoryMapper equipmentCategoryMapper;
 
     private JgUseRegistrationMapper useRegistrationMapper;
@@ -113,10 +112,11 @@ public class DPStatisticsServiceImpl {
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static List<RegionModel> regionModels = new ArrayList<>();
-
     @Resource
     private DPStatisticsMapper dpStatisticsMapper;
 
+    @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
 
     public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
@@ -1276,6 +1276,55 @@ public class DPStatisticsServiceImpl {
 
     }
 
+    public List<Map<String, Object>> dataStatisticByReginCode(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String, Object>> result = regionModels.parallelStream().filter(e -> e.getParentRegionCode() != null && (e.getParentRegionCode().toString()).equals(dpFilterParamDto.getCityCode())).map(r -> {
+            DPFilterParamDto filterParamDto = new DPFilterParamDto();
+            filterParamDto.setCityCode(r.getRegionCode().toString());
+            Map<String, Object> itemResult = staticsCenterMapCountDataForRegin(filterParamDto);
+            if (itemResult == null) {
+                itemResult = new HashMap<>();
+            }
+            itemResult.put("regionCode", r.getRegionCode());
+            itemResult.put("regionName", r.getRegionName());
+            return itemResult;
+        }).collect(Collectors.toList());
+        return result;
+    }
+
+    private Map<String, Object> staticsCenterMapCountDataForRegin(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        String orgCode = regionCodeOrgCodeMap.get(dpFilterParamDto.getCityCode());
+        if (orgCode == null) {
+            orgCode = commonMapper.getOrgCodeByCompanyCode(dpFilterParamDto.getCityCode());
+            if (orgCode == null) {
+                result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), 0);
+                result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), 0);
+                return result;
+            }
+            regionCodeOrgCodeMap.put(dpFilterParamDto.getCityCode(), orgCode);
+        }
+        Long certificateCount = jgUseRegistrationManageMapper.countCertificateByReginCode(orgCode);
+        Long deviceCount = equipmentCategoryMapper.countEquipByReginCode(orgCode);
+        result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), certificateCount);
+        result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), deviceCount);
+        return result;
+    }
+
+    public Map<String, Object> dataStatisticCountByReginCode(DPFilterParamDto dpFilterParamDto) {
+        Map<String,Object> resultMap = new HashMap<>();
+        List<Map<String, Object>> mapList = this.dataStatisticByReginCode(dpFilterParamDto);
+        if(ObjectUtils.isEmpty(mapList)){
+            resultMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), 0);
+            resultMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), 0);
+            return resultMap;
+        }
+        long certificateCount = mapList.stream().mapToLong(x -> (Long) x.get("certificateCount")).sum();
+        long deviceCount = mapList.stream().mapToLong(x -> (Long) x.get("deviceCount")).sum();
+        resultMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), certificateCount);
+        resultMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), deviceCount);
+        return resultMap;
+    }
+
     public Map<String,Object> newRegEquCount(DPFilterParamDto dpFilterParamDto) {
         Map<String,Object> resultMap = new HashMap<>();
         Map<String,Object> map = new HashMap<>();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -89,5 +89,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
 
     List<String> selectXiXianNew();
+
+    Long countEquipByReginCode(String orgCode);
 }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -680,4 +680,15 @@
           AND ( ibjoi."CODE96333" NOT LIKE'31%' OR ibjoi."CODE96333" IS NULL )
           AND "CLAIM_STATUS" = '已认领';
     </select>
+    <select id="countEquipByReginCode" resultType="java.lang.Long">
+        select
+            count(1)
+        from
+            idx_biz_jg_use_info ibjui,
+            idx_biz_jg_supervision_info ibjsi
+        where
+            ibjui."RECORD" = ibjsi."RECORD"
+            and ibjsi."ORG_BRANCH_CODE" like concat (#{reginCode},'%')
+            and ibjui."IS_INTO_MANAGEMENT" = true
+    </select>
 </mapper>