Merge branch 'develop_tzs_register' of…

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/XiAnDataDockController.java

@@ -49,5 +49,25 @@ public class XiAnDataDockController {
         }
         return xiAnDataDockService.importEquipmentData(file);
     }
+
+    /**
+     * 西安电梯历史设备以及业务数据批量导入
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/importElevatorData")
+    @ApiOperation(httpMethod = "POST", value = "西安电梯历史设备以及业务数据批量导入", notes = "西安电梯历史设备以及业务数据批量导入")
+    public Object importElevatorData(@RequestParam MultipartFile file) {
+        if (file.isEmpty()) {
+            return ResponseHelper.buildResponse("文件不能为空");
+        }
+        String contentType = file.getContentType();
+        String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (!("application/vnd.ms-excel".equals(contentType) ||
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(contentType)) ||
+                !("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
+            return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
+        }
+        return xiAnDataDockService.importElevatorData(file);
+    }
 }
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/DictParamsConverter.java

@@ -75,6 +75,23 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
         dictMap.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");
         dictMap.put("氢气", "HYDROGEN");
+        dictMap.put("集选", "1");
+        dictMap.put("并联", "2");
+        dictMap.put("按钮", "3");
+        dictMap.put("其他控制方式", "4");
+        dictMap.put("直接顶升", "1");
+        dictMap.put("间接顶升", "2");
+        dictMap.put("游乐场所", "6532");
+        dictMap.put("商业单位", "6009");
+        dictMap.put("学校", "6010");
+        dictMap.put("政府机关", "6012");
+        dictMap.put("医疗机构", "6011");
+        dictMap.put("公共场所", "6013");
+        dictMap.put("旅游景区", "6531");
+        dictMap.put("住宅小区", "6008");
+        dictMap.put("养老机构", "6530");
+        dictMap.put("工业场所", "6528");
+        dictMap.put("工业场所（户外）", "6529");
     }
 
     @Override

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
+import com.yeejoin.amos.api.openapi.dto.XiAnElevatorExcelDto;
 import com.yeejoin.amos.api.openapi.dto.XiAnEquipInfoExcelDto;
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -105,4 +106,22 @@ public interface TzsJgServiceFeignClient {
      */
     @RequestMapping(value = "/common/checkFactoryNumUniquenessForVehicleCylinder", method = RequestMethod.GET)
     Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum);
+
+    /**
+     * 批量保存西安电梯上传的历史数据
+     *
+     * @param elevatorExcelDtos 西安电梯上传的历史数据
+     * @return
+     */
+    @RequestMapping(value = "/dataDock/xi-an/saveElevatorData", method = RequestMethod.POST)
+    Object saveElevatorData(@RequestBody List<XiAnElevatorExcelDto> elevatorExcelDtos);
+
+    /**
+     * record唯一性检查
+     *
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = "/common/checkRecordUniqueness", method = RequestMethod.GET)
+    Boolean selectByRecordAndClaimStatus(@RequestParam("record") String record);
 }

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

@@ -184,4 +184,10 @@ public class ESEquipmentCategoryDto {
      */
     @Field(type = FieldType.Boolean, name = "IS_COMPLETE_XA")
     private Boolean IS_COMPLETE_XA;
+
+    /**
+     * 是否可以做业务-西安电梯导入用（false-否，true-是）
+     */
+    @Field(type = FieldType.Boolean)
+    private Boolean IS_DO_BUSINESS;
 }

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

@@ -288,5 +288,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @return 公司对象集合
      */
     List<KeyValueDto> queryAllCompanyDict();
+
+    Integer checkRecordUniqueness(String record);
 }
 

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

@@ -2782,4 +2782,8 @@
         WHERE ui."IS_INTO_MANAGEMENT" = true and (ri."EQU_LIST" = '6000' OR ri."EQU_LIST" = '2000') and di."DELAY_SERVICE_LIFE_DATE" > 0
         ) tt where tt.isExpired = true;
     </select>
+
+    <select id="checkRecordUniqueness" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM idx_biz_jg_use_info jui WHERE jui.record = #{record}
+    </select>
 </mapper>

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

@@ -63,6 +63,9 @@
             <if test="dto.isCyl != null and dto.isCyl == 1 ">
                 AND tjurm.reg_type != '车用气瓶登记'
             </if>
+            <if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
+                and tjurm.is_do_business = #{dto.isDoBusiness}
+            </if>
             <if test="dto.regType != null and dto.regType != '' ">
                 AND EXISTS (
                 SELECT 1
@@ -136,6 +139,9 @@
             <if test="dto.isScrap != null and dto.isScrap != ''">
                 and tjurm.is_scrap = #{dto.isScrap}
             </if>
+            <if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
+                and tjurm.is_do_business = #{dto.isDoBusiness}
+            </if>
             <if test="dto.cityName != null and dto.cityName != ''">
                 and tjurm.equ_use_address LIKE CONCAT('%', #{dto.cityName}, '%')
             </if>

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

@@ -797,6 +797,13 @@ public class CommonController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/checkRecordUniqueness")
+    @ApiOperation(httpMethod = "GET", value = "检查record的唯一性", notes = "检查record的唯一性")
+    public Boolean checkRecordUniqueness(@RequestParam("record") String record) {
+        return commonService.checkRecordUniqueness(record);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/checkFactoryNumUniquenessForVehicleCylinder")
     @ApiOperation(httpMethod = "GET", value = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）", notes = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）")
     public Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum) {

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

@@ -92,5 +92,17 @@ public class DataDockController {
         return ResponseHelper.buildResponse(dataDockService.checkGDData(multipartFile, false));
     }
 
+    /**
+     * 西安电梯历史设备以及业务数据批量导入
+     *
+     * @param equLists 电梯历史设备以及业务数据
+     * @return result
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/xi-an/saveElevatorData")
+    @ApiOperation(httpMethod = "POST", value = "西安电梯历史设备以及业务数据批量导入", notes = "西安电梯历史设备以及业务数据批量导入")
+    public ResponseModel<?> saveElevatorData(@RequestBody List<Map<String, Object>> equLists) {
+        return ResponseHelper.buildResponse(dataDockService.saveElevatorData(equLists));
+    }
 }
 

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

@@ -163,6 +163,7 @@ public class JgChangeRegistrationNameController extends BaseController {
             }
         }
         dto.setCertificateStatus("已登记");
+        dto.setIsDoBusiness("1");
         return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getTableData(dto));
     }
 

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

@@ -205,6 +205,7 @@ public class JgChangeRegistrationReformController extends BaseController {
         }
         //区外移装查询已注销状态的证
         dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
+        dto.setIsDoBusiness("1");//默认可以做业务
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
     }
 

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

@@ -159,6 +159,7 @@ public class JgUseRegistrationManageController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
+        dto.setIsDoBusiness(ValidationUtil.isEmpty(dto.getIsDoBusiness()) ? "1" : "");
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
     }
 
@@ -224,6 +225,7 @@ public class JgUseRegistrationManageController extends BaseController {
         } else {
             dto.setReceiveCompanyCode(company.getCompanyCode());
         }
+        dto.setIsDoBusiness("1");
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
     }
 
@@ -357,6 +359,7 @@ public class JgUseRegistrationManageController extends BaseController {
         } else {
             return ResponseHelper.buildResponse(page);
         }
+        dto.setIsDoBusiness("1");
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
     }
 

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

@@ -268,4 +268,11 @@ public interface ICommonService {
     Map<String, Object> getRegistrationChangeCertificateUrl(JSONObject formData);
 
     void getRegistrationChangeCertificateFormStream(JSONObject jsonObject, HttpServletResponse response);
+
+    /**
+     * 检查record的唯一性
+     * @param record
+     * @return
+     */
+    Boolean checkRecordUniqueness(String record);
 }

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

@@ -3002,6 +3002,18 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     /**
+     * 检查record的唯一性
+     *
+     * @param record record
+     * @return
+     */
+    @Override
+    public Boolean checkRecordUniqueness(String record) {
+        Integer count = commonMapper.checkRecordUniqueness(record);
+        return count > 0 ? Boolean.TRUE : Boolean.FALSE;
+    }
+
+    /**
      * 使用登记证编号的全库唯一校验
      *
      * @param useRegistrationCode 登记证编号

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

@@ -134,6 +134,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
+    public static final String IS_DO_BUSINESS = "IS_DO_BUSINESS";
     // 设备来源 jg：新设备录入  jg_his：历史数据录入
     public static final String DATA_SOURCE = "DATA_SOURCE";
     // 设备来源名称 jg：新设备  jg_his：历史数据
@@ -2353,6 +2354,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         meBuilder.minimumShouldMatch(1);
         boolMust.must(meBuilder);
 
+        //默认条件 限制西安电梯隶属导入数据不可做业务
+        if (ObjectUtils.isEmpty(map.getString(IS_DO_BUSINESS))) {
+            BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
+            tBuilder.should(QueryBuilders.matchQuery(IS_DO_BUSINESS, true));
+            tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(IS_DO_BUSINESS)));
+            tBuilder.minimumShouldMatch(1);
+            boolMust.must(tBuilder);
+        }
+
         // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
         // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
         BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();

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

@@ -1294,6 +1294,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
             map.put("USE_UNIT_CREDIT_CODE", companyCode);
         }
+        //默认条件 限制西安电梯隶属导入数据不可做业务
+        BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
+        tBuilder.should(QueryBuilders.matchQuery("IS_DO_BUSINESS", true));
+        tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("IS_DO_BUSINESS")));
+        tBuilder.minimumShouldMatch(1);
+        boolMust.must(tBuilder);
+
         // 使用单位 //安装改造维修单位
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
             BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();

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

@@ -2301,18 +2301,22 @@ public class JGDPStatisticsServiceImpl {
             boolMust.must(pBuilder);
         }
         // 是否车用气瓶
-        if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {
-            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString(WHETHER_VEHICLE_CYLINDER));
-            pBuilder.must(QueryBuilders.termQuery(WHETHER_VEHICLE_CYLINDER, test));
-            boolMust.must(pBuilder);
+        if (CylinderTypeEnum.CYLINDER.getCode().equals(map.getString(EQU_CATEGORY_CODE))) {
+            if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {
+                BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+                String test = QueryParser.escape(map.getString(WHETHER_VEHICLE_CYLINDER));
+                pBuilder.must(QueryBuilders.termQuery(WHETHER_VEHICLE_CYLINDER, test));
+                boolMust.must(pBuilder);
+            }
         }
         // 是否撬装式压力容器
-        if (!ObjectUtils.isEmpty(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL))) {
-            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL));
-            pBuilder.must(QueryBuilders.termQuery(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL, test));
-            boolMust.must(pBuilder);
+        if ("2100".equals(map.getString(EQU_CATEGORY_CODE))){
+            if (!ObjectUtils.isEmpty(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL))) {
+                BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+                String test = QueryParser.escape(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL));
+                pBuilder.must(QueryBuilders.termQuery(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL, test));
+                boolMust.must(pBuilder);
+            }
         }
         // 设备代码模糊查询
         if (!ObjectUtils.isEmpty(map.getString(EQU_CODE))) {