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

@@ -1374,7 +1374,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 // 安装告知设备选择 - 业务限制
                 // 根据设备类别（EQU_CATEGORY）、安装单位过滤设备（USC_UNIT_CREDIT_CODE）  下面过滤条件已有
                 // 设备类别为工业管道（8300）时，用工程装置名称过滤
-                if (!ValidationUtil.isEmpty(EQU_CATEGORY_CODE) && ValidationUtil.equals(EQU_CATEGORY_CODE, "8300")) {
+                if (!ValidationUtil.isEmpty(map.get(EQU_CATEGORY_CODE)) && ValidationUtil.equals(map.get(EQU_CATEGORY_CODE), "8300")) {
                     if (ValidationUtil.isEmpty(map.get("projectContraption"))) {
                         throw new BadRequest("请先选择工程装置信息！");
                     }
@@ -1405,7 +1405,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
                 boolMust.must(syBuilder);
                 // 设备类别为工业管道（8300）时，用工程装置名称过滤
-                if (!ValidationUtil.isEmpty(EQU_CATEGORY_CODE) && ValidationUtil.equals(EQU_CATEGORY_CODE, "8300")) {
+                if (!ValidationUtil.isEmpty(map.get(EQU_CATEGORY_CODE)) && ValidationUtil.equals(map.get(EQU_CATEGORY_CODE), "8300")) {
                     if (ValidationUtil.isEmpty(map.get("projectContraption"))) {
                         throw new BadRequest("请先选择工程装置信息！");
                     }
@@ -1596,7 +1596,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString(PROJECT_CONTRAPTION));
-            pBuilder.must(QueryBuilders.wildcardQuery(PROJECT_CONTRAPTION, "*" + QueryParser.escape(test.toLowerCase()) + "*"));
+            pBuilder.must(QueryBuilders.matchQuery(PROJECT_CONTRAPTION, test.toLowerCase()));
             boolMust.must(pBuilder);
         }
         builder.query(boolMust);

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

@@ -765,7 +765,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             // 摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum()));
+            dto.setTaskContent(String.format("发起了【安装告知】的业务办理，【申请单号：%s】",  obj.getApplyNo()));
             // 申请单号
             dto.setTaskCode(obj.getApplyNo());
             // 业务类型枚举code值
@@ -798,7 +798,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("发起了【安装告知】的业务办理，【申请单号：%s】",  item.getApplyNo()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
@@ -821,6 +821,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setNoticeDate(new Date());
             // 统计使用
             dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+            dto.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(0).getNextExecutorRoleIds());
                 dto.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
@@ -1622,7 +1623,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 if (!ObjectUtils.isEmpty(registerInfo) && !ObjectUtils.isEmpty(registerInfo.getEquList()) && !ObjectUtils.isEmpty(registerInfo.getEquCategory())){
                     equ.setEquListCode(registerInfo.getEquList());
                     equ.setEquCategoryCode(registerInfo.getEquCategory());
-                    if (ObjectUtils.isEmpty(item.getEquList()) || ObjectUtils.isEmpty(item.getEquCategoryCode())){
+                    if (ObjectUtils.isEmpty(item.getEquListCode()) || ObjectUtils.isEmpty(item.getEquCategoryCode())){
                         item.setEquListCode(registerInfo.getEquList());
                         item.setEquCategoryCode(registerInfo.getEquCategory());
                         if ("8300".equals(item.getEquCategoryCode())){

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

@@ -637,7 +637,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-
+            taskModelDto.setStartDate(new Date());
             taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);

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

@@ -18,7 +18,11 @@ import java.util.List;
 @RequestMapping(value = "/st-common")
 public class StCommonController {
 
-    StCommonServiceImpl commonService;
+    private StCommonServiceImpl commonService;
+
+    public StCommonController(StCommonServiceImpl commonService) {
+        this.commonService = commonService;
+    }
 
     /**
      * 获取用户regionCode

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

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "大屏-应急-统计API")
-@RequestMapping("/db/yj")
+@RequestMapping("/dp/yj")
 public class YJDPStatisticsController {
 
 

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

@@ -465,9 +465,7 @@ public class ZLDPStatisticsServiceImpl {
         String orgCode = getAndSetOrgCode(screenDto.getCityCode());
         searchSourceBuilder.query(QueryBuilders.boolQuery()
                 .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*")));
-        searchSourceBuilder.aggregation(
-                AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")
-        );
+        searchSourceBuilder.aggregation(AggregationBuilders.terms("count_by_use_site_code").field("USE_SITE_CODE").size(500));
         searchRequest.source(searchSourceBuilder);
         Map<String, Integer> dataMap = new HashMap<>();
         List<Map<String, Object>> returnList = new ArrayList<>();
@@ -476,7 +474,7 @@ public class ZLDPStatisticsServiceImpl {
             SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
             // 获取所有聚合结果
             Aggregations aggregations = searchResponse.getAggregations();
-            Terms termsResult = aggregations.get("USE_SITE_CODE");
+            Terms termsResult = aggregations.get("count_by_use_site_code");
 
             for (Terms.Bucket bucket : termsResult.getBuckets()) {
                 String category = bucket.getKeyAsString(); // 或者使用 bucket.getKey() 对于非字符串类型
@@ -486,11 +484,14 @@ public class ZLDPStatisticsServiceImpl {
             List<DataDictionary> dataDictionaryList = iDataDictionaryService.getByType("ADDRESS");
             dataDictionaryList.stream().forEach(x -> {
                 Map<String, Object> map = new HashMap<>();
-                map.put(x.getName(), dataMap.getOrDefault(x.getCode(), 0));
+                map.put("name", x.getName());
+                map.put("value", dataMap.getOrDefault(x.getCode(), 0));
+                dataMap.remove(x.getCode());
                 returnList.add(map);
             });
             Map<String, Object> otherMap = new HashMap<>();
-            otherMap.put("其他", dataMap.getOrDefault("其他", 0) + dataMap.getOrDefault("", 0));
+            otherMap.put("name", "其他");
+            otherMap.put("value", dataMap.values().stream().mapToLong(e -> e).sum());
             returnList.add(otherMap);
         } catch (IOException e) {
             e.printStackTrace();