fix(jg):西安电梯历史数据导入接口修改

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

@@ -81,6 +81,17 @@ public class DictParamsConverter implements Converter<String> {
         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/dto/XiAnElevatorExcelDto.java

@@ -110,7 +110,7 @@ public class XiAnElevatorExcelDto extends BaseDto {
     private String longitudeLatitude;
 
     @ApiModelProperty(value = "使用场所")
-    @ExcelProperty(value = "使用场所")
+    @ExcelProperty(value = "使用场所", converter = DictParamsConverter.class)
     private String usePlace;
 
     @ApiModelProperty(value = "安全管理员")
@@ -365,7 +365,7 @@ public class XiAnElevatorExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "创建时间")
     @ExcelProperty(value = "创建时间")
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
     private String createDate;
 
     @ApiModelProperty(value = "创建人名称")
@@ -382,6 +382,6 @@ public class XiAnElevatorExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "审批通过时间")
     @ExcelProperty(value = "审批通过时间")
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
     private String approvalDate;
 }
\ No newline at end of file

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

@@ -115,4 +115,13 @@ public interface TzsJgServiceFeignClient {
      */
     @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-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -50,6 +50,7 @@ public class XiAnDataDockServiceImpl {
     List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
     List<String> equCodeList = new ArrayList<>();// 设备代码集合
     List<String> factoryNumList = new ArrayList<>();// 出厂编码集合
+    List<String> recordList = new ArrayList<>();// 注册代码集合
 
 
     /**
@@ -464,6 +465,15 @@ public class XiAnDataDockServiceImpl {
     }
 
     /**
+     * 根据record检查唯一性
+     *
+     * @param record record
+     */
+    private boolean checkRecordUniqueness(String record) {
+        return jgServiceFeignClient.selectByRecordAndClaimStatus(record);
+    }
+
+    /**
      * 起重机械----技术参数 检查
      *
      * @param data
@@ -570,6 +580,7 @@ public class XiAnDataDockServiceImpl {
         useInnerCodeList.clear();
         equCodeList.clear();
         factoryNumList.clear();
+        recordList.clear();
         try {
             InputStream inputStream = file.getInputStream();
             ExcelReader excelReader = EasyExcel.read(inputStream).build();
@@ -588,6 +599,7 @@ public class XiAnDataDockServiceImpl {
                         checkElevatorExcelData(sheetName, data, context, sheetError);
                         useInnerCodeList.add(data.getUseInnerCode());
                         equCodeList.add(data.getEquCode());
+                        recordList.add(data.getRecord());
                         dataList.add(data);
                     }
 
@@ -631,7 +643,7 @@ public class XiAnDataDockServiceImpl {
             } else {
                 checkResumeInfo(data, rowError);
             }
-//            data.setIsCompleteXa(this.checkIsComplete(data) ? 0 : 1);
+            data.setIsCompleteXa(1);
             if (!StringUtils.isBlank(rowError)) {
                 sheetError.put(String.format(excelErrorStr, rowIndex), rowError);
             }
@@ -645,12 +657,12 @@ public class XiAnDataDockServiceImpl {
         checkNotBlank(data.getResumeSeq(), "监管履历主键不能为空；", rowError);
         checkNotBlank(data.getBusinessType(), "业务类型不能为空；", rowError);
         checkNotBlank(data.getCreateDate(), "创建时间不能为空；", rowError);
-        Optional.ofNullable(data.getCreateDate()).ifPresent(v -> checkDateFormatCorrect(v, "创建时间格式不正确；", rowError));
+//        Optional.ofNullable(data.getCreateDate()).ifPresent(v -> checkDateFormatCorrect(v, "创建时间格式不正确；", rowError));
         checkNotBlank(data.getCreateUserName(), "创建人名称不能为空；", rowError);
         checkNotBlank(data.getBusinessId(), "业务单号不能为空；", rowError);
         checkNotBlank(data.getApprovalUnit(), "审批单位不能为空；", rowError);
         checkNotBlank(data.getApprovalDate(), "审批通过时间不能为空；", rowError);
-        Optional.ofNullable(data.getApprovalDate()).ifPresent(v -> checkDateFormatCorrect(v, "审批通过时间格式不正确；", rowError));
+//        Optional.ofNullable(data.getApprovalDate()).ifPresent(v -> checkDateFormatCorrect(v, "审批通过时间格式不正确；", rowError));
     }
 
     private void checkCommonInfo(XiAnElevatorExcelDto data, StringBuffer rowError) {
@@ -662,6 +674,12 @@ public class XiAnDataDockServiceImpl {
         if (useInnerCodeList.contains(data.getUseInnerCode())) {
             rowError.append("单位内编号不能重复；");
         }
+        if (recordList.contains(data.getRecord())) {
+            rowError.append("模板中注册代码不能重复；").append(data.getRecord());
+        }
+        if (this.checkRecordUniqueness(data.getRecord())){
+            rowError.append("系统中存在注册代码；").append(data.getRecord());
+        }
         checkNotBlank(data.getEquType(), "设备型号不能为空；", rowError);
         checkNotBlank(data.getEquCodeType(), "有无设备代码不能为空；", rowError);
         if ("1".equals(data.getEquCodeType())) {

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/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();