feat(jg): 设备业务履历

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

@@ -149,6 +149,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
     private final JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
     private final IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     private final JgCertificateReplenishMapper jgCertificateReplenishMapper;
+    private final  JgResumeInfoServiceImpl jgResumeInfoService;
 
     /**
      * 用户信息
@@ -511,6 +512,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
             certRep.setNextTaskId(null);
             // 上个代办改为已办
             taskV2Model = this.updateLastTodo(certRep, FlowStatusEnum.TO_BE_FINISHED);
+            this.createResume(certRep, taskV2Model.getRoutePath());
         } else {
             certRep.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
             certRep.setPromoter(RequestContext.getExeUserId());
@@ -530,6 +532,22 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         return this.updateById(certRep) ? certRep : null;
     }
 
+    private void createResume(JgCertificateReplenish certificateReplenish, String routePath) {
+        List<JgCertificateReplenishEq> replenishEqs = certificateReplenishEqService.getBaseMapper().selectList(new LambdaQueryWrapper<JgCertificateReplenishEq>()
+                .eq(JgCertificateReplenishEq::getCertificateReplenishId, certificateReplenish.getSequenceNbr()));
+        jgResumeInfoService.saveBatchResume(replenishEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(certificateReplenish.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName())
+                .businessId(String.valueOf(certificateReplenish.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(certificateReplenish.getReceiveOrgName())
+                .approvalUnitCode(certificateReplenish.getReceiveOrgCode())
+                .status("正常")
+                .changeContent(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     public void saveManageRecord(JgCertificateReplenish certRep, TaskV2Model taskV2Model) {
         Long certChangeRecordSeq = sequence.nextId();
         JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord()

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -70,6 +71,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 更名变更登记服务实现类
@@ -113,6 +115,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
 
+    @Autowired
+    private JgResumeInfoServiceImpl jgResumeInfoService;
+
     public final static String CHANGE_NAME = "更名变更";
     public final static String CHANGE_NAME_KEY = "changeName";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
@@ -896,11 +901,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         List<JgChangeRegistrationNameEq> list = jgChangeRegistrationNameEqService.lambdaQuery()
                 .eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr())
                 .list();
-
+        Map<String,String> recordProjectContraptionIdMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(list)) {
             Set<String> equipIds = new HashSet<>();
             Set<String> certificateSeqList = new HashSet<>();
-
             list.forEach(item -> {
                 Optional.ofNullable(item.getEquipInfo())
                         .map(JSONObject::parseArray)
@@ -909,6 +913,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                             JSONObject json = JSONObject.parseObject(info.toString());
                             if (json.containsKey("SEQUENCE_NBR")) {
                                 equipIds.add(json.getString("SEQUENCE_NBR"));
+                                // record 装置id map
+                                recordProjectContraptionIdMap.put(json.getString("SEQUENCE_NBR"), json.getString("PROJECT_CONTRAPTION_ID"));
                             }
                         });
 
@@ -1023,9 +1029,37 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 }
             }
         }
+        // 记录履历
+        this.createResumeBatch(recordProjectContraptionIdMap, jgChangeRegistrationName, taskV2Model.getRoutePath());
+    }
 
+    private void createResumeBatch(Map<String, String> recordProjectContraptionIdMap, JgChangeRegistrationName jgChangeRegistrationName, String routePath) {
+        Set<String> projectContraptionIds = new HashSet<>();
+        Set<String> notPipelineRecords = new HashSet<>();
+        recordProjectContraptionIdMap.forEach((k,v)->{
+            if(org.apache.commons.lang3.StringUtils.isNotEmpty(v)){
+                // v 不为空则标识是管道，按照装置创建履历, v为管道记录装置id,
+                projectContraptionIds.add(v);
+            } else {
+                //  v 为空则标识非管道类，按照设备记录履历， key为record
+                notPipelineRecords.add(k);
+            }
+        });
+        List<JgResumeInfoDto> resumeInfoDtos  =  Stream.concat(projectContraptionIds.stream(), notPipelineRecords.stream()).map(e-> JgResumeInfoDto.builder()
+                .businessType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName())
+                .applyNo(jgChangeRegistrationName.getApplyNo())
+                .businessId(jgChangeRegistrationName.getSequenceNbr() + "")
+                .equId(e)
+                .status("正常")
+                .approvalUnitCode(jgChangeRegistrationName.getReceiveCompanyCode())
+                .approvalUnit(jgChangeRegistrationName.getReceiveOrgName())
+                .changeContent(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList());
+        jgResumeInfoService.saveBatchResume(resumeInfoDtos);
     }
 
+
     public Map<String, Object> getTableData(JgUseRegistrationManageDto dto) {
         HashMap<String, Object> data = new HashMap<>();
         List<JgUseRegistrationManageDto> jgUseRegistrationManageDtos = jgUseRegistrationManageService.queryByUseUnitCreditCode(dto);

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

@@ -61,6 +61,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -123,6 +124,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private EventPublisher eventPublisher;
 
+    @Autowired
+    private  JgResumeInfoServiceImpl jgResumeInfoService;
+
 
     public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
         if (!ObjectUtils.isEmpty(dto.getReceiveCompanyCode())) {
@@ -448,12 +452,36 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             saveRecord(jgChangeVehicleRegistrationUnit, taskV2Model);
             // 审核通过发送数据变更消息
             this.sendDataRefreshMsgEquip(jgChangeVehicleRegistrationUnit);
+            // 创建设备履历
+            this.createResume(jgChangeVehicleRegistrationUnit, taskV2Model.getRoutePath());
         }
         this.getBaseMapper().updateById(jgChangeVehicleRegistrationUnit);
         commonServiceImpl.saveExecuteFlowData2Redis(jgChangeVehicleRegistrationUnit.getInstanceId(), this.buildInstanceRuntimeData(jgChangeVehicleRegistrationUnit));
         return jgChangeVehicleRegistrationUnit;
     }
 
+    private void createResume(JgChangeVehicleRegistrationUnit changeVehicleRegistrationUnit , String routePath) {
+        List<JgChangeVehicleRegistrationUnitEq> registrationUnitEqs = getJgChangeVehicleRegistrationUnitEqs(changeVehicleRegistrationUnit);
+        jgResumeInfoService.saveBatchResume(registrationUnitEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(changeVehicleRegistrationUnit.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName())
+                .businessId(String.valueOf(changeVehicleRegistrationUnit.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(changeVehicleRegistrationUnit.getReceiveOrgName())
+                .approvalUnitCode(changeVehicleRegistrationUnit.getReceiveOrgCode())
+                .status("正常")
+                .changeContent(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
+    private List<JgChangeVehicleRegistrationUnitEq> getJgChangeVehicleRegistrationUnitEqs(JgChangeVehicleRegistrationUnit changeVehicleRegistrationUnit) {
+        LambdaQueryWrapper<JgChangeVehicleRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgChangeVehicleRegistrationUnitEq::getUnitChangeId, changeVehicleRegistrationUnit.getSequenceNbr());
+        queryWrapper.select(JgChangeVehicleRegistrationUnitEq::getEquId, BaseEntity::getSequenceNbr);
+        return jgChangeVehicleRegistrationUnitEqService.list(queryWrapper);
+    }
+
     private void sendDataRefreshMsgEquip(JgChangeVehicleRegistrationUnit vehicleRegistrationUnit) {
         LambdaQueryWrapper<JgChangeVehicleRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgChangeVehicleRegistrationUnitEq::getUnitChangeId, vehicleRegistrationUnit.getSequenceNbr());
@@ -606,10 +634,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         updateWrapper.in(IdxBizJgRegisterInfo::getRecord, collect);
         updateWrapper.set(IdxBizJgRegisterInfo::getCarNumber, jgChangeVehicleRegistrationUnit.getNewCarNumber() != null ? jgChangeVehicleRegistrationUnit.getNewCarNumber() : jgChangeVehicleRegistrationUnit.getCarNumber());
         idxBizJgRegisterInfoService.update(updateWrapper);
-
         // 保存设备流水信息
         jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
-
     }
 
     private void updateCarNumIntoUseInnerCode(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, List<String> collect) {