Merge branch 'develop_tzs_register' of…

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

@@ -228,4 +228,13 @@ public interface ICommonService {
      * @return
      */
     Boolean checkEquCodeUniqueness(String equCode);
+
+    /**
+     * 检查使用登记证号全局唯一
+     *
+     * @param useRegistrationCode 使用登记证号
+     * @param equipId             设备record
+     * @return
+     */
+    Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode, String equipId);
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.codec.Base64Decoder;
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;

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

@@ -398,6 +398,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             check96333Code(equipmentInfoForm);
             // 气瓶 校验制造单位统一信用代码与出场编码唯一
             checkFactoryNumUniqueWithGasCylinder(equipmentInfoForm, record);
+            // 历史（车用气瓶）设备校验使用登记证编号全库唯一
+            hisEquCheckUseRegistrationCodeUniqueness(equipmentInfoForm);
             // 检测是否三环系统中的车用气瓶数据 不让三环系统数据通过设备新增方式进来
             // checkIsSanHanData(equipmentInfoForm);
         } catch (Exception e) {
@@ -510,6 +512,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
+    private void hisEquCheckUseRegistrationCodeUniqueness(LinkedHashMap<?, ?> equipmentInfoForm) {
+        // 历史（车用气瓶）设备校验使用登记证编号全库唯一
+        String dataSource = (String) equipmentInfoForm.get(DATA_SOURCE);
+        String record = (String) equipmentInfoForm.get(RECORD);
+        String useRegistrationCode = (String) equipmentInfoForm.get("useRegistrationCode");
+        if (!ValidationUtil.isEmpty(dataSource) && dataSource.contains("his")) {
+            Boolean unique = commonService.useRegistrationCertificateAccountUnique(useRegistrationCode, ValidationUtil.isEmpty(record) ? null : record);
+            if (unique) {
+                throw new BadRequest("使用登记证编号已存在，请重新输入！");
+            }
+        }
+    }
+
     private void checkFactoryNumUnique(String factoryNum, String produceUnitCreditCode, StringBuilder result) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
         if (commonMapper.checkFactoryNumUnique(factoryNum, null, produceUnitCreditCode) > 0) {
@@ -615,9 +630,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ValidationUtil.isEmpty(equIpClassMap)) {
             resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
         }
-        if (!ValidationUtil.isEmpty(equipInfoMap)) {
-            resultMap.put(EQUIP_INFO_FORM_ID, equipInfoMap);
-        }
         // 设备参数
         if (equIpClassMap.containsKey(EQU_LIST) && !ValidationUtil.isEmpty(equIpClassMap.get(EQU_LIST).toString())) {
             Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get(EQU_LIST).toString());
@@ -629,6 +641,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 equipParamsMap.put(EQU_DEFINE, String.valueOf(equIpClassMap.get(EQU_DEFINE)));
                 resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
             }
+            equipInfoMap.put("identificationCode", equipParamsMap.get("VIN"));
+        }
+
+        if (!ValidationUtil.isEmpty(equipInfoMap)) {
+            resultMap.put(EQUIP_INFO_FORM_ID, equipInfoMap);
         }
 
         // 处理复制设备信息
@@ -1072,6 +1089,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 objMap.putAll(filterMap);
             }
+            objMap.put("useRegistrationCode", registerInfo.getUseOrgCode());
         }
         // 维保备案【一对多，暂时只取最新一条数据】
         IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
@@ -2496,7 +2514,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 补丁：saveOrUpdate在update数据时不会更新字段为null的字段，但是编辑设备的代码时，从有改成无，equCode解析成null，但是此时需要将equcode删掉
         registerInfo.setEquCode(ObjectUtils.isEmpty(registerInfo.getEquCode()) ? "" : registerInfo.getEquCode());
         // copy设备 =》 使用登记证号置空
-        registerInfo.setUseOrgCode(isCopy ? "" : registerInfo.getUseOrgCode());
+        String useOrgCode = ValidationUtil.isEmpty(equipmentInfoForm.get("useRegistrationCode")) ? "" : String.valueOf(equipmentInfoForm.get("useRegistrationCode"));
+        registerInfo.setUseOrgCode(isCopy ? "" : useOrgCode);
         this.saveOrUpdate(registerInfo);
 
         // 监督管理
@@ -2605,6 +2624,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ValidationUtil.isEmpty(vessel)) {
                 vessel.setRecord(record);
                 vessel.setRecDate(date);
+                String VIN = ValidationUtil.isEmpty(equipmentInfoForm.get("identificationCode")) ? "" : (String) equipmentInfoForm.get("identificationCode");
+                vessel.setVin(VIN);
                 vessel.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("VESSEL_SEQ")));
                 iIdxBizJgTechParamsVesselService.saveOrUpdateData(vessel);
             }

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

@@ -4,21 +4,20 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.ShCar;
 import com.yeejoin.amos.boot.module.jg.api.entity.ShCarEqu;
 import com.yeejoin.amos.boot.module.jg.api.mapper.ShCarEquMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IShCarEquService;
-import com.yeejoin.amos.boot.module.jg.api.vo.CarAndEquVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.ShCarEquVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.HashMap;
 import java.util.List;
@@ -135,6 +134,7 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
         // 封装返回VO
         HashMap<String ,Object> hashMap = JSONObject.parseObject(JSON.toJSONString(shCarDto), HashMap.class);
         hashMap.put("equList", collect);
+        hashMap.put("identificationCode", shCarDto.getFrameNumber());
         result.put("completeDataSanHuan", hashMap);
 
         // 帮别人认领 + 单位变更给自己