Merge branch 'develop_tzs_bugfix' into develop_tzs_register

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipRegistrationInfoMapper.java

@@ -46,6 +46,7 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
             "  informationManageCode," +
             "  appId," +
             "  creditCode," +
+            "  fillingUnitName," +
             "  regionCode " +
             "FROM" +
             "  (" +
@@ -53,6 +54,7 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
             "    CONCAT ( fi.\"PRODUCE_UNIT_CREDIT_CODE\", '-', fi.\"FACTORY_NUM\" ) AS sequenceCode," +
             "    fi.\"RECORD\" AS record," +
             "    ui.\"ESTATE_UNIT_NAME\" AS unitName," +
+            "    ui.\"USE_UNIT_NAME\" AS fillingUnitName," +
             "    fi.\"FACTORY_NUM\" AS factoryNum," +
             "    ri.\"EQU_DEFINE\" AS cylinderVariety," +
             "    ( SELECT NAME FROM tz_equipment_category WHERE code = ri.\"EQU_DEFINE\" ) AS cylinderVarietyName," +

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SyncCylinderDataService.java

@@ -26,10 +26,7 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Slf4j
 @Component
@@ -218,7 +215,10 @@ public class SyncCylinderDataService {
                     return;
                 }
                 item.setSequenceNbr(sequence.nextId());
-                item.setUnitName((String) cylUseInfo.get("unitName"));
+                item.setUnitName(Optional.ofNullable((String) cylUseInfo.get("unitName"))
+                                .orElse((String) cylUseInfo.get("fillingUnitName"))
+                );
+                item.setFillingUnitName(Objects.toString(cylUseInfo.get("fillingUnitName"), ""));
                 item.setFactoryNum((String) cylUseInfo.get("factoryNum"));
                 item.setCylinderVariety(Integer.valueOf((String) cylUseInfo.get("cylinderVariety")));
                 item.setCylinderVarietyName((String) cylUseInfo.get("cylinderVarietyName"));

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

@@ -511,15 +511,17 @@ public class TzsAppService {
                 if (!ValidationUtil.isEmpty(map.get("fieldValue"))) {
                     JSONArray jsonArray = JSON.parseArray(String.valueOf(map.get("fieldValue")));
                     JSONArray json = new JSONArray();
-                    for (Object obj : jsonArray) {
-                        JSONObject object = JSON.parseObject(JSON.toJSONString(obj));
-                        if (!ValidationUtil.isEmpty(object)) {
-                            object.getString("url");
-                            object.put("url", object.getString("url"));
-                            json.add(object);
+                    if (!ValidationUtil.isEmpty(jsonArray)) {
+                        for (Object obj : jsonArray) {
+                            JSONObject object = JSON.parseObject(JSON.toJSONString(obj));
+                            if (!ValidationUtil.isEmpty(object)) {
+                                object.getString("url");
+                                object.put("url", object.getString("url"));
+                                json.add(object);
+                            }
                         }
+                        array.addAll(json);
                     }
-                    array.addAll(json);
                 }
                 // 删除所有附件
                 iterator.remove();

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

@@ -20,7 +20,7 @@ public enum ReginStepEnum {
     /**
      * 西咸新区
      */
-    XIXIAN("617000", "西咸新区", "map"),
+//    XIXIAN("617000", "西咸新区", "map"),
     /**
      * 韩城市
      */

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -324,7 +324,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingUnitName())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-            query.must(QueryBuilders.matchQuery("fillingUnitName", "*" + esCylinderFillingRecordDto.getFillingUnitName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("fillingUnitName", "*" + esCylinderFillingRecordDto.getFillingUnitName() + "*"));
             boolMust.must(query);
         }
 
@@ -332,7 +332,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getUnitName())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-            query.must(QueryBuilders.matchQuery("unitName", "*" + esCylinderFillingRecordDto.getUnitName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("unitName", "*" + esCylinderFillingRecordDto.getUnitName() + "*"));
             boolMust.must(query);
         }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/RegionModelDto.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 监管单位三库统计实体
+ */
+@Data
+public class RegionModelDto {
+
+    /**
+     * 区域-code
+     */
+    private String regionCode;
+
+    /**
+     * 区域-name
+     */
+    private String regionName;
+
+    private String level;
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SkjsEquipCountItemDto.java

@@ -23,6 +23,11 @@ public class SkjsEquipCountItemDto {
      */
     private String superviseKey;
 
+    /*
+     * 监管单位-org code
+     */
+    private String orgBranchCode;
+
     /**
      * 电梯
      */

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

@@ -33,10 +33,7 @@ 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.dto.SkjsCompanyCountItemDto;
-import com.yeejoin.amos.boot.module.statistics.api.dto.SkjsCountItemDto;
-import com.yeejoin.amos.boot.module.statistics.api.dto.SkjsEquipCountItemDto;
-import com.yeejoin.amos.boot.module.statistics.api.dto.SkjsUserCountItemDto;
+import com.yeejoin.amos.boot.module.statistics.api.dto.*;
 import com.yeejoin.amos.boot.module.statistics.api.enums.RegulatoryUnitLevelEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderBusinessStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.JGStatisticsMapper;
@@ -3663,17 +3660,25 @@ public class JGDPStatisticsServiceImpl {
     public Map<String, Object> querySkjsDetail(DPFilterParamDto dpFilterParamDto) {
         String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
         List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto);
+        List<RegionModelDto> regionModelsDto = new ArrayList<>();
+        regionModels.forEach(r -> {
+            RegionModelDto regionModelDto = new RegionModelDto();
+            regionModelDto.setRegionCode(r.getRegionCode().toString());
+            regionModelDto.setRegionName(r.getRegionName());
+            regionModelDto.setLevel(r.getLevel());
+            regionModelsDto.add(regionModelDto);
+        });
         if (orgCodeP == null || regionModels.isEmpty()) {
             return this.getDefaultSkjsDetail();
         }
 
         Map<String, Object> result = new HashMap<>();
         // 设备上线情况
-        result.put("equipOnLineInfo", this.getEquipOnLineInfo(regionModels));
+        result.put("equipOnLineInfo", this.getEquipOnLineInfo(regionModelsDto));
         // 企业上线情况
-        result.put("companyOnLineInfo", this.getCompanyOnLineInfo(regionModels));
+        result.put("companyOnLineInfo", this.getCompanyOnLineInfo(regionModelsDto));
         // 人员上线情况
-        result.put("userOnLineInfo", this.getUserOnLineInfo(regionModels));
+        result.put("userOnLineInfo", this.getUserOnLineInfo(regionModelsDto));
         return result;
     }
 
@@ -3688,15 +3693,15 @@ public class JGDPStatisticsServiceImpl {
         return result;
     }
 
-    private Object getEquipOnLineInfo(List<RegionModel> regionModels) {
+    private Object getEquipOnLineInfo(List<RegionModelDto> regionModels) {
         // 多线程处理
         Map<String, SkjsEquipCountItemDto> countItemMap = regionModels.parallelStream().map(r -> {
-            String regionCode = r.getRegionCode().toString();
+            String regionCode = r.getRegionCode();
             String orgCode = stCommonService.getAndSetOrgCode(regionCode);
             SkjsEquipCountItemDto countItemDto = new SkjsEquipCountItemDto();
             countItemDto.setRegionCode(regionCode);
             countItemDto.setRegionName(r.getRegionName());
-            countItemDto.setSuperviseKey(regionCode + "_" + r.getRegionName());
+            countItemDto.setOrgBranchCode(orgCode);
             if (!ValidationUtil.isEmpty(orgCode)) {
                 Map<String, Object> data = new HashMap<>();
                 // 是否按监管机构代码精确匹配
@@ -3727,10 +3732,10 @@ public class JGDPStatisticsServiceImpl {
         return countItemDtos;
     }
 
-    private Object getCompanyOnLineInfo(List<RegionModel> regionModels) {
+    private Object getCompanyOnLineInfo(List<RegionModelDto> regionModels) {
         // 多线程处理
         Map<String, SkjsCompanyCountItemDto> companyCountItemDtoMap = regionModels.parallelStream().map(r -> {
-            String regionCode = r.getRegionCode().toString();
+            String regionCode = r.getRegionCode();
             String conditionRegionCode = regionCode;
             String orgCode = stCommonService.getAndSetOrgCode(regionCode);
             // 按管辖机构统计企业数量时：检验检测机构直接归属省局管辖，则只有省局才统计检验检测机构数量。其他地市区县不统计
@@ -3773,7 +3778,7 @@ public class JGDPStatisticsServiceImpl {
     }
 
 
-    private Object getUserOnLineInfo(List<RegionModel> regionModels) {
+    private Object getUserOnLineInfo(List<RegionModelDto> regionModels) {
         // 多线程处理
         Map<String, SkjsUserCountItemDto> userCountItemDtoMap = regionModels.parallelStream().map(r -> {
             String regionCode = r.getRegionCode().toString();
@@ -3989,19 +3994,19 @@ public class JGDPStatisticsServiceImpl {
         String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
         Map<String, Object> parentModel = getSuperviseTreeByLoginUnitCode(orgCodeP).get(0);
         List<Map<String, Object>> childrenRegionModelList = (List<Map<String, Object>>) parentModel.get("children");
-        List<RegionModel> regionModels = Lists.newArrayList();
+        List<RegionModelDto> regionModels = Lists.newArrayList();
         if (childrenRegionModelList != null) {
             childrenRegionModelList.forEach(r -> {
-                RegionModel regionModel = new RegionModel();
-                regionModel.setRegionCode(Integer.parseInt(r.get("companyCode").toString()));
+                RegionModelDto regionModel = new RegionModelDto();
+                regionModel.setRegionCode(r.get("companyCode").toString());
                 regionModel.setRegionName((String) r.get("companyName"));
                 regionModels.add(regionModel);
             });
         }
         // 如果是省局、地市局、区县局查看，则把各对应省局、地市局、区县局数据单独添加到列表中
         if (!ValidationUtil.isEmpty(RegulatoryUnitLevelEnum.getEnumByCode((String) parentModel.get("level")))) {
-            RegionModel regionModel = new RegionModel();
-            regionModel.setRegionCode(Integer.parseInt(parentModel.get("companyCode").toString()));
+            RegionModelDto regionModel = new RegionModelDto();
+            regionModel.setRegionCode(parentModel.get("companyCode").toString());
             regionModel.setRegionName((String) parentModel.get("companyName"));
             // 设置等级字段是为了区分本级监管单位在查询时是否需要精确匹配
             regionModel.setLevel((String) parentModel.get("level"));

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

@@ -107,7 +107,7 @@ public class StCommonServiceImpl {
     }
 
     private void initReginCode() {
-        Collection<RegionModel> result = Systemctl.regionClient.queryForTree(null).getResult();
+        Collection<RegionModel> result = Systemctl.regionClient.queryForTreeByAgencyCodeRightLike(null).getResult();
         result.forEach(r -> {
             RegionModel regionModel = new RegionModel();
             BeanUtil.copyProperties(r, regionModel);