Merge branch 'develop_tzs_register_to_0715' of…

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

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import java.util.List;
 import java.util.Map;
 
@@ -34,4 +36,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("sequenceNbr") Long sequenceNbr, @Param("records")List<String> records);
 
     Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
+
+    @Select("select name from tz_equipment_category where code=#{code}")
+    String getEquCategoryNameByCode(String code);
 }

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

@@ -13,7 +13,9 @@
             tjurm.reg_type                                                      AS regType,
             DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d')                              AS regDate,
             tjurm.equ_list                                                      AS equList,
+            tjurm.equ_list_code                                                 AS equListCode,
             tjurm.equ_define                                                    AS equDefine,
+            tjurm.equ_define_code                                               AS equDefineCode,
             tjurm.remark                                                        AS remark,
             tjurm.rec_user_id                                                   AS recUserId,
             DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d')                              AS recDate,
@@ -25,6 +27,7 @@
             tjurm.receive_company_code                                          AS receiveCompanyCode,
             tjurm.certificate_no                                                AS certificateNo,
             tjurm.equ_category                                                  AS equCategory,
+            tjurm.equ_category_code                                             AS equCategoryCode,
             tjurm.equ_use_address                                               AS equUseAddress,
             tjurm.use_unit_address                                              AS useUnitAddress
     </sql>

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

@@ -1180,7 +1180,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private String buildRecordContent(JgUseRegistration obj) {
-        //张三办理了【单位变更】 ，单号【DWBG202407050001】，原恒星电梯单位变更为新恒星电梯有限公司，办理日期2024-07-05
+        //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         return obj.getRecUserName() + "办理了【"+BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"】，" +
                 "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -16,9 +17,7 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformationEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
@@ -69,6 +68,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.nio.file.Files;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.*;
@@ -108,6 +108,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
+    private Sequence sequence;
+    @Autowired
     private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
     @Autowired
     private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
@@ -141,6 +143,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     private JgResumeInfoServiceImpl jgResumeInfoService;
     @Autowired
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+    @Autowired
+    private JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
+    @Autowired
+    private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
+    @Autowired
+    private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
 
     private Map<String, Object> fillingMediumMap;
 
@@ -736,12 +744,18 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             String jsonData = jgRegistrationHistory.getChangeData();
             JSONArray jsonArray = JSONArray.parseArray(jsonData);
+
+            // 登记证记录主键
+            Long changeRecordId= sequence.nextId();
+
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject mapData = jsonArray.getJSONObject(i);
+                // 设备ID
+                String equId = String.valueOf(mapData.get("record"));
 
                 // 查询注册信息
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> queryRegisterWrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-                queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("record")));
+                queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, equId);
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(queryRegisterWrapper);
                 registerInfo.setUseOrgCode(code);
 
@@ -756,7 +770,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
                 // 查询其他信息
                 LambdaQueryWrapper<IdxBizJgOtherInfo> otherInfoWrapper = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
-                otherInfoWrapper.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("record")));
+                otherInfoWrapper.eq(IdxBizJgOtherInfo::getRecord, equId);
                 IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherInfoWrapper);
 
                 // 更新设备信息
@@ -764,6 +778,18 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
                 // 更新es
                 updateEsData(mapData, jgVehicleInformation, otherInfo);
+
+                // 查询设备制造信息
+                LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+                factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equId);
+                IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoMapper.selectOne(factoryInfoWrapper);
+
+                // 生成tzs_jg_certificate_change_record_eq记录
+                JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
+                changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
+                changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());//产品编号
+                certificateChangeRecordEqService.save(changeRecordEq);
             }
             // 更新新生成的历史数据的设备代码
             jgRegistrationHistory.setChangeData(JSON.toJSONString(jsonArray));
@@ -780,6 +806,17 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             BeanUtil.copyProperties(jgVehicleInformation, taskMessageDto);
             params.put("model", taskMessageDto);
             commonService.updateTaskModel(params);
+
+            // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(jsonArray.getJSONObject(0).get("record")));
+            IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
+
+            // 生成证书管理表记录
+            generateRegistrationManage(jgVehicleInformation,registerInfo);
+
+            // 生成一条tzs_jg_certificate_change_record记录
+            generateCertificateChangeRecord(jgVehicleInformation,registerInfo,changeRecordId);
         }
         this.getBaseMapper().updateById(jgVehicleInformation);
         commonService.saveExecuteFlowData2Redis(jgVehicleInformation.getInstanceId(), this.buildInstanceRuntimeData(jgVehicleInformation));
@@ -1360,4 +1397,77 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
     }
 
+    private void generateCertificateChangeRecord(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo, Long changeRecordId) {
+        Map<String, String> equType = new HashMap<>();
+        equType.put("equList",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
+        equType.put("equListCode",registerInfo.getEquList());
+        equType.put("equCategory",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquCategory()));
+        equType.put("equCategoryCode",registerInfo.getEquCategory());
+        equType.put("equDefine",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquDefine()));
+        equType.put("equDefineCode",registerInfo.getEquDefine());
+        JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
+        changeRecord.setApplyNo(jgVehicleInformation.getApplyNo());
+        changeRecord.setReceiveOrgName(jgVehicleInformation.getReceiveOrgName());
+        changeRecord.setAuditPassDate(new Date());
+        changeRecord.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());
+        changeRecord.setRegDate(jgVehicleInformation.getCreateDate());
+        changeRecord.setChangeContent(this.buildRecordContent(jgVehicleInformation));//变更内容
+        changeRecord.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());//使用登记编号
+        changeRecord.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());//接收机构公司代码
+        changeRecord.setCertificateNo(commonService.generateCertificateNo(equType,new Date(),jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
+        changeRecord.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());//使用单位统一信用代码
+        changeRecord.setUseUnitName(jgVehicleInformation.getUseUnitName());//使用单位名称
+        changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码
+        changeRecord.setCreateDate(new Date());
+        changeRecord.setSequenceNbr(changeRecordId);
+        certificateChangeRecordService.save(changeRecord);
+    }
+
+    private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation,IdxBizJgRegisterInfo registerInfo) {
+        // 使用单位信息
+        Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgVehicleInformation.getUseUnitCreditCode());
+        //
+        Map<String, String> equType = new HashMap<>();
+        equType.put("equList",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
+        equType.put("equListCode",registerInfo.getEquList());
+        equType.put("equCategory",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquCategory()));
+        equType.put("equCategoryCode",registerInfo.getEquCategory());
+        equType.put("equDefine",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquDefine()));
+        equType.put("equDefineCode",registerInfo.getEquDefine());
+        JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
+        jgUseRegistrationManage.setUseUnitName(jgVehicleInformation.getUseUnitName());
+        jgUseRegistrationManage.setApplyNo(jgVehicleInformation.getApplyNo());
+        jgUseRegistrationManage.setCertificateStatus("已登记");
+        jgUseRegistrationManage.setReceiveOrgName(jgVehicleInformation.getReceiveOrgName());
+        jgUseRegistrationManage.setAuditPassDate(jgVehicleInformation.getAuditPassDate());
+        jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());
+        jgUseRegistrationManage.setRegDate(jgVehicleInformation.getRegDate());
+        jgUseRegistrationManage.setEquList(equType.get("equList"));
+        jgUseRegistrationManage.setEquListCode(equType.get("equListCode"));
+        jgUseRegistrationManage.setEquCategory(equType.get("equCategory"));
+        jgUseRegistrationManage.setEquCategoryCode(equType.get("equCategoryCode"));
+        jgUseRegistrationManage.setEquDefine(equType.get("equDefine"));
+        jgUseRegistrationManage.setEquDefineCode(equType.get("equDefineCode"));
+        jgUseRegistrationManage.setIsDelete(Boolean.FALSE);
+        jgUseRegistrationManage.setRecUserId(jgVehicleInformation.getRecUserId());
+        jgUseRegistrationManage.setRecUserName(jgVehicleInformation.getRecUserName());
+        jgUseRegistrationManage.setRecDate(jgVehicleInformation.getRecDate());
+        jgUseRegistrationManage.setCreateUserId(jgVehicleInformation.getCreateUserId());
+        jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
+        jgUseRegistrationManage.setEquUseAddress("");
+        jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
+        jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
+        jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
+        jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
+        jgUseRegistrationManage.setCertificateNo(commonService.generateCertificateNo(equType,new Date(),jgVehicleInformation.getReceiveCompanyCode()));
+        jgUseRegistrationManageService.save(jgUseRegistrationManage);
+    }
+
+    private String buildRecordContent(JgVehicleInformation obj) {
+        //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return obj.getRecUserName() + "办理了【"+BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName()+"】，" +
+                "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
+    }
+
 }
\ No newline at end of file