大瓶监管下钻列表、树、筛选下拉接口实现

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignAuthRequestInterceptor.java

@@ -13,6 +13,9 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class FeignAuthRequestInterceptor implements RequestInterceptor {
     public FeignAuthRequestInterceptor() {
+        RequestContext.setAppKey("AMOS_STUDIO");
+        RequestContext.setProduct("AMOS_STUDIO_WEB");
+        RequestContext.setToken("abac3a97-1fe0-4cf0-88a2-12c9104b1f81");
 
     }
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamDto.java

@@ -33,6 +33,12 @@ public class DPFilterParamDto {
     private String businessKey;
 
     /**
+     * 具体业务类型  例如：安装告知、维修告知等
+     * code对应统计服务中的jgdp_businessType.json
+     */
+    private String businessTypeCode;
+
+    /**
      * month , year
      */
     private String searchType;
@@ -66,4 +72,12 @@ public class DPFilterParamDto {
      * 所在单位名称
      */
     private String unitName;
+    /**
+     * 设备种类code
+     */
+    private String equListCode;
+    /**
+     * 设备类别code
+     */
+    private String equCategoryCode;
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java

@@ -21,6 +21,11 @@ public class DPFilterParamForDetailDto {
      * 业务类型
      */
     private String businessType;
+    /**
+     * 具体业务类型 例如：安装告知、维修告知等
+     * code对应统计服务中的jgdp_businessType.json
+     */
+    private String businessTypeCode;
 
     /**
      * 时间筛选
@@ -44,6 +49,11 @@ public class DPFilterParamForDetailDto {
     private String treeValue;
 
     /**
+     * 设备种类
+     */
+    private String equListCode;
+
+    /**
      * 设备类别
      */
     private String equCategoryCode;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/JgBusinessTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+public enum JgBusinessTypeEnum {
+    SGGZ("sggz","施工告知"),
+    SYDJ("sydj","使用登记"),
+    BGDJ("bgdj","变更登记"),
+    TYQY("tyqy","停用启用"),
+    ZXBX("zxbf","注销报废");
+
+
+    private JgBusinessTypeEnum(String code, String name){
+        this.code=code;
+        this.name=name;
+    }
+
+    private String code;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static List<HashMap<String,Object>> getEnumList() {
+        List<HashMap<String, Object>> list = new ArrayList<>();
+        for (JgBusinessTypeEnum testEnum : EnumSet.allOf(JgBusinessTypeEnum.class)) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("title",testEnum.name);
+            map.put("value",testEnum.code);
+            list.add(map);
+        }
+        return list;
+    }
+
+}

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

@@ -12,6 +12,7 @@ import java.util.Map;
 public interface JGStatisticsMapper {
 
     List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
+
     List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
 
     List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
@@ -23,7 +24,6 @@ public interface JGStatisticsMapper {
     List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
 
-
     List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
     List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
@@ -57,21 +57,38 @@ public interface JGStatisticsMapper {
     Long changeCountByOrgCode(@Param("orgCode") String orgCode);
 
     List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
+
     Page<Map<String, Object>> selectNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+
     Page<Map<String, Object>> selectAZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+
     Page<Map<String, Object>> selectWXNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+
     Page<Map<String, Object>> selectGZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+
     Page<Map<String, Object>> selectYZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
 
     List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
 
-    List<CountDto> queryNoticeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto,@Param("orgCode") String orgCode);
+    List<CountDto> queryNoticeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
 
     List<CountDto> queryUseAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
 
-    List<CountDto> queryChangeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode")  String orgCode);
+    List<CountDto> queryChangeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
+
+    List<CountDto> queryDisableAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
+
+    List<CountDto> queryCancelAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
+
+    Page<Map<String, Object>> countBizFinishedNumForDPListSGGZ(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
+
+    Page<Map<String, Object>> countBizFinishedNumForDPListSYDJ(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
+
+    Page<Map<String, Object>> countBizFinishedNumForDPListBGDJ(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
+
+    Page<Map<String, Object>> countBizFinishedNumForDPListTYQY(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
 
-    List<CountDto> queryDisableAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode")  String orgCode);
+    Page<Map<String, Object>> countBizFinishedNumForDPListZXBF(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
 
-    List<CountDto> queryCancelAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode")  String orgCode);
+    Page<Map<String, Object>> countBizFinishedNumForDPListAll(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -533,4 +533,32 @@ public class JGDPStatisticsController {
         return ResponseHelper.buildResponse(statisticsService.getRegistrationRecords(page, dto, cityCode));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "监管大屏-监管下钻列表左侧树", notes = "监管大屏-监管下钻列表左侧树")
+    @GetMapping(value = "/getJgBusinessType")
+    public ResponseModel<List<Map<String, Object>>> getJgBusinessType() {
+        return ResponseHelper.buildResponse(statisticsService.getJgBusinessType());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-监管下钻列表", notes = "监管大屏-监管下钻列表")
+    @PostMapping(value = "/getJgBusinessList")
+    public ResponseModel<Page<Map<String, Object>>> getJgBusinessList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result,
+                                                                      @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                                      @RequestParam(value = "size", defaultValue = "20") Integer size) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(statisticsService.getJgBusinessList(dpFilterParamForDetailDto, page));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "监管大屏-监管下钻列表具体业务类型", notes = "监管大屏-监管下钻列表具体业务类型")
+    @GetMapping(value = "/getJgBusinessAllType")
+    public ResponseModel<List<Map<String, Object>>> getJgBusinessAllType(@RequestParam(value = "treeValue") String treeValue) {
+        return ResponseHelper.buildResponse(statisticsService.getJgBusinessAllType(treeValue));
+    }
+
 }

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.common.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.JgBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.NoticBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FourColorCountDataDto;
@@ -32,6 +33,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.JGStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
@@ -171,6 +173,9 @@ public class JGDPStatisticsServiceImpl {
     @Value("classpath:/json/registrationBasic.json")
     private Resource registrationBasicJson;
 
+    @Value("classpath:/json/jgdp_businessType.json")
+    private Resource allBusinessType;
+
     private JgUseRegistrationMapper useRegistrationMapper;
 
     private JgEnableDisableMapper enableDisableMapper;
@@ -3317,4 +3322,51 @@ public class JGDPStatisticsServiceImpl {
         resultMap.put("stationRate", stationRates);
         return resultMap;
     }
+
+    public List<Map<String, Object>> getJgBusinessType() {
+        List<HashMap<String, Object>> enumList = JgBusinessTypeEnum.getEnumList();
+        List<Map<String, Object>> result = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("title", "监督管理全部业务类型");
+        map.put("value", "all");
+        map.put("children", enumList);
+        result.add(map);
+        return result;
+    }
+
+    public Page<Map<String, Object>> getJgBusinessList(DPFilterParamForDetailDto dpFilterParamForDetailDto, Page<Map<String, Object>> page) {
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
+        Page<Map<String, Object>> maps = null;
+        DPFilterParamDto filterParamDto = new DPFilterParamDto();
+        filterParamDto.setCityCode(dpFilterParamForDetailDto.getCityCode());
+        filterParamDto.setCompanyName(dpFilterParamForDetailDto.getCompanyName());
+        filterParamDto.setSuperviseUnitName(dpFilterParamForDetailDto.getSuperviseUnitName());
+        filterParamDto.setBusinessTypeCode(dpFilterParamForDetailDto.getBusinessTypeCode());
+        filterParamDto.setEquCategoryCode(dpFilterParamForDetailDto.getEquCategoryCode());
+        filterParamDto.setEquListCode(dpFilterParamForDetailDto.getEquListCode());
+        if (null != dpFilterParamForDetailDto.getTimeSearchOne()) {
+            filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
+            filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
+        }
+        String treeValue = dpFilterParamForDetailDto.getBusinessTypeCode() != "" ? null : dpFilterParamForDetailDto.getTreeValue();
+        if (JgBusinessTypeEnum.SGGZ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListSGGZ(page, orgCode, filterParamDto, treeValue);
+        } else if (JgBusinessTypeEnum.SYDJ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListSYDJ(page, orgCode, filterParamDto, treeValue);
+        } else if (JgBusinessTypeEnum.BGDJ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListBGDJ(page, orgCode, filterParamDto, treeValue);
+        } else if (JgBusinessTypeEnum.TYQY.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListTYQY(page, orgCode, filterParamDto, treeValue);
+        } else if (JgBusinessTypeEnum.ZXBX.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListZXBF(page, orgCode, filterParamDto, treeValue);
+        } else {
+            maps = jgStatisticsMapper.countBizFinishedNumForDPListAll(page, orgCode, filterParamDto, treeValue);
+        }
+        return maps;
+    }
+
+    public List<Map<String, Object>> getJgBusinessAllType(String treeValue) {
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(allBusinessType);
+        return resourceJson.get(treeValue);
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/jgdp_businessType.json

+{
+  "sggz": [
+    {
+      "name": "安装告知",
+      "code": "gz_az"
+    },
+    {
+      "name": "改造告知",
+      "code": "gz_gz"
+    },
+    {
+      "name": "维修告知",
+      "code": "gz_wx"
+    },
+    {
+      "name": "移装告知",
+      "code": "gz_yz"
+    }
+  ],
+  "sydj": [
+    {
+      "name": "使用登记",
+      "code": "sy_dj"
+    },
+    {
+      "name": "车用气瓶登记",
+      "code": "car_cyl_dj"
+    }
+  ],
+  "bgdj": [
+    {
+      "name": "改造变更登记",
+      "code": "dj_gz"
+    },
+    {
+      "name": "移装变更登记",
+      "code": "dj_yz"
+    },
+    {
+      "name": "单位变更登记",
+      "code": "dj_dw"
+    },
+    {
+      "name": "更名变更登记",
+      "code": "dj_gm"
+    }
+  ],
+  "tyqy": [
+    {
+      "name": "启用",
+      "code": "sb_qy"
+    },
+    {
+      "name": "停用",
+      "code": "sb_ty"
+    }
+  ],
+  "zxbf": [
+    {
+      "name": "注销",
+      "code": "bf_yz"
+    },
+    {
+      "name": "报废",
+      "code": "bf_zx"
+    }
+  ],
+  "all": [
+    {
+      "name": "安装告知",
+      "code": "gz_az"
+    },
+    {
+      "name": "改造告知",
+      "code": "gz_gz"
+    },
+    {
+      "name": "维修告知",
+      "code": "gz_wx"
+    },
+    {
+      "name": "移装告知",
+      "code": "gz_yz"
+    },
+    {
+      "name": "使用登记",
+      "code": "sy_dj"
+    },
+    {
+      "name": "车用气瓶登记",
+      "code": "car_cyl_dj"
+    },
+    {
+      "name": "改造变更登记",
+      "code": "dj_gz"
+    },
+    {
+      "name": "移装变更登记",
+      "code": "dj_yz"
+    },
+    {
+      "name": "单位变更登记",
+      "code": "dj_dw"
+    },
+    {
+      "name": "更名变更登记",
+      "code": "dj_gm"
+    },
+    {
+      "name": "启用",
+      "code": "sb_qy"
+    },
+    {
+      "name": "停用",
+      "code": "sb_ty"
+    },
+    {
+      "name": "注销",
+      "code": "bf_yz"
+    },
+    {
+      "name": "报废",
+      "code": "bf_zx"
+    }
+  ]
+}
\ No newline at end of file