Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -109,7 +109,6 @@ public class DPStatisticsServiceImpl {
 
     private TzsUserInfoMapper userInfoMapper;
 
-    private RedisUtils redisUtils;
 
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
@@ -119,7 +118,7 @@ public class DPStatisticsServiceImpl {
     private DPStatisticsMapper dpStatisticsMapper;
 
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper, RedisUtils redisUtils, RedisUtils redisUtils1) {
+    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.useRegistrationMapper = useRegistrationMapper;
         this.techParamsPipelineMapper = techParamsPipelineMapper;
@@ -129,7 +128,6 @@ public class DPStatisticsServiceImpl {
         this.enterpriseInfoMapper = enterpriseInfoMapper;
         this.commonMapper = commonMapper;
         this.userInfoMapper = userInfoMapper;
-        this.redisUtils = redisUtils1;
     }
 
     public void init() {
@@ -294,7 +292,7 @@ public class DPStatisticsServiceImpl {
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -323,7 +321,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
@@ -682,7 +680,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
@@ -735,7 +733,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         // 设备状态
@@ -1021,19 +1019,19 @@ public class DPStatisticsServiceImpl {
         for(int i = 0; i < 5; i++){
             Map<String,Object> result = new HashMap<>();
             if(i == 0){
-                result.put("key",i);
+                result.put("key",i+"");
                 result.put("name","告知管理");
             }else if(i == 1){
-                result.put("key",i);
+                result.put("key",i+"");
                 result.put("name","使用登记");
             }else if(i == 2){
-                result.put("key",i);
+                result.put("key",i+"");
                 result.put("name","变更登记");
             }else if(i == 3){
-                result.put("key",i);
+                result.put("key",i+"");
                 result.put("name","停用启用");
             }else if(i == 4){
-                result.put("key",i);
+                result.put("key",i+"");
                 result.put("name","注销报废");
             }
             resultList.add(result);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -73,4 +73,14 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
      * @return List<CountDto>
      */
     List<CountDto> queryAppByEquListForDP(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    /**
+     * 按照8大类，统计
+     * @param orgCode 指定区域对应的公司
+     * @param dpFilterParamDto 时间过滤条件
+     * @return CountDto
+     */
+    CountDto queryAppByEquListForReporting(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }
+
+

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -275,4 +275,21 @@
                      and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
                      GROUP BY a.equip_classify
     </select>
+    <select id="queryAppByEquListForReporting" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+           SELECT
+                    count(1) as longValue
+            FROM
+                     tz_jyjc_inspection_application a,
+                     tz_base_enterprise_info b
+             where
+                     a.inspection_unit_code= b.use_unit_code
+                    and a.status != '6610'  and a.status != '6615'
+                    and b.supervise_org_code like CONCAT(#{orgCode}, '%')
+                    <if test="dto.beginDate !=null">
+                        and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+                    </if>
+                    <if test="dto.endDate !=null">
+                        and date_le(CAST(a.application_date as date),#{dto.endDate})
+                    </if>
+    </select>
 </mapper>

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

@@ -124,4 +124,38 @@ public class DPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.queryInspectionEquipByEquList(dpFilterParamDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图左侧全局统计", notes = "大屏-检验检测-中间地图左侧全局统计")
+    @PostMapping(value = "/jy/center-map/legend")
+    public ResponseModel<Map<String, Object>> centerMapCountForGlobal(@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.getCenterMapCountDataForGlobal(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图地市统计", notes = "大屏-检验检测-中间-地图地市统计")
+    @PostMapping(value = "/jy/center-map/overview")
+    public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@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.getCenterMapCountDataForOverview(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计", notes = "大屏-检验检测-八大类设备检验临期、超期统计")
+    @PostMapping(value = "/jy/equipInspectTime/countByEquList")
+    public ResponseModel<Map<String, Object>> equipInspectTimeCountByEquList(@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.equipInspectTimeCountByEquList(dpFilterParamDto));
+    }
+
 }

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

@@ -77,7 +77,7 @@ public class DPSubServiceImpl {
 
         if (!ValidationUtil.isEmpty(api)){
             ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null);
-            if (!ValidationUtil.isEmpty(responseModel)) {
+            if (!ValidationUtil.isEmpty(responseModel.getResult())) {
                 apiResult = JSONObject.parseObject(responseModel.getResult().toString());
             }
         }
@@ -110,6 +110,8 @@ public class DPSubServiceImpl {
                     map.put("columns", JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.modelTableColumns"));
                     map.put("dataList", apiResult);
                     map.put("showPage", true);
+                    map.put("api", api);
+                    map.put("rowKey", "record");
                     content.put(tab.getString("key"), map);
                 }
             }
@@ -268,6 +270,7 @@ public class DPSubServiceImpl {
             JSONObject qrcode = map.getJSONObject("qrcode");
             String problemTime = apiResult.getString("problemTime");
             String problemStatus = apiResult.getString("problemStatus");
+            String color = null;
             if (!ValidationUtil.isEmpty(problemTime)){
                 try {
                     qrcode.put("text", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "yyyy-MM-dd"));
@@ -277,15 +280,16 @@ public class DPSubServiceImpl {
                 }
             }
             if ("正常".equals(problemStatus)){
-                problemStatus = "green";
+                color = "green";
             } else if("异常".equals(problemStatus)){
-                problemStatus = "red";
+                color = "red";
             }
             qrcode.put("value", !ValidationUtil.isEmpty(apiResult.get("useCode")) ? apiResult.get("useCode") : apiResult.get("USE_ORG_CODE"));
             qrcode.put("status", problemStatus);
+            qrcode.put("color", color);
         });
 
-        mergedArray = mergedArray.stream().filter(x -> !"QRCode".equals(JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.componentKey"))).collect(Collectors.toList());
+        mergedArray = mergedArray.stream().filter(x -> !"QRCode".equals(JsonValueUtils.getValueByKey(x, "componentKey", null))).collect(Collectors.toList());
         mergedArray.stream().forEach(x -> {
             JSONObject xObj = (JSONObject) x;
             JSONObject visualParams = xObj.getJSONObject("visualParams");
@@ -396,6 +400,7 @@ public class DPSubServiceImpl {
             return jsonObject;
         }).collect(Collectors.toList());
 
+        subObj.put("rowKey", "key");
         subObj.put("showPage", false);
         subObj.put("columns", columns);
         subObj.put("dataList", apiResult.get(JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.fieldKey")));

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

@@ -1289,7 +1289,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 只有纳管的设备才能做业务 TODO
         boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
     }
 
     private Set<String> getEquipInFlowing() {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json

@@ -28,7 +28,7 @@
           "apiPath":"/jg/equipment-register/page",
           "params": {
             "number": 1,
-            "size": 10,
+            "size": 14,
             "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
           }
         }

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

@@ -452,7 +452,7 @@ public class ScreenImpl implements IScreenService {
         //设置模糊搜索
         searchSourceBuilder.query(QueryBuilders.boolQuery()
                 .must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*"+screenDto.getCityCode()+"*"))
-                .must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true)));
+                .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true)));
         searchSourceBuilder.aggregation(
                         AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")
         );