fix(jg):bug 24304 修改注销的脏数据

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

@@ -203,19 +203,21 @@ public class JgChangeRegistrationUnitController extends BaseController {
     }
 
     /**
-     * bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）
+     * bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）
      *
-     * @param applyNos 单位变更的申请编号
+     * @param applyNos 单位变更 / 注销 的申请编号
      * @return result
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/bug24304")
-    @ApiOperation(httpMethod = "GET", value = "bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）",
-            notes = "bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去")
-    public ResponseModel<String> bug24304(@RequestParam(value = "applyNos")
+    @ApiOperation(httpMethod = "GET", value = "bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）",
+            notes = "bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去")
+    public ResponseModel<String> bug24304(@RequestParam(value = "businessType", defaultValue = "1")
+                                          @ApiParam(value = "业务类型,单位变更：1,   注销：2,   默认值为单位变更") String businessType,
+                                          @RequestParam(value = "applyNos")
                                           @ApiParam(value = "单位变更的申请编号,多个用逗号分隔") String applyNos) {
-        jgChangeRegistrationUnitServiceImpl.bug24304Handle(applyNos);
-        return ResponseHelper.buildResponse("申请单号：" + applyNos + "数据修改成功");
+        jgChangeRegistrationUnitServiceImpl.bug24304Handle(businessType, applyNos);
+        return ResponseHelper.buildResponse(businessType.equals("1") ? "单位变更" : "注销" + "业务，" + "申请单号：" + applyNos + "数据修改成功");
     }
 
 }

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

@@ -6,19 +6,18 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 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.CompanyTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -29,8 +28,10 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -108,7 +109,22 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     @Autowired
-    private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
+    private JgScrapCancelMapper jgScrapCancelMapper;
+
+    @Autowired
+    private JgScrapCancelEqMapper jgScrapCancelEqMapper;
+
+    @Autowired
+    private SuperviseInfoMapper superviseInfoMapper;
+
+    @Autowired
+    private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+
+    @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
+
+    @Autowired
+    private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl;
 
     //改造登记关系表mapper
     @Autowired
@@ -465,7 +481,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             BeanUtils.copyProperties(notice, noticeDto);
             noticeDto.setCompanyType(companyType);
             return noticeDto;
-        }).collect(java.util.stream.Collectors.toList());
+        }).collect(Collectors.toList());
         noticeDtoPage.setRecords(records);
 
         return noticeDtoPage;
@@ -1355,7 +1371,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     /**
      * bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）
      */
-    public void bug24304Handle(String applyNos) {
+    @Transactional(rollbackFor = Exception.class)
+    public void bug24304Handle(String businessType, String applyNos) {
         /* // 查询单位变更登记的历史数据
         List<JgRegistrationHistory> historyList = jgRegistrationHistoryMapper.selectList(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getRegistrationClass, "单位变更登记"));
@@ -1372,6 +1389,137 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 .collect(Collectors.toList()); */
 
         List<String> applyNoList = Arrays.asList(applyNos.split(","));
+        switch (businessType) {
+            case "1":
+                changeRegistrationUnitHandler(applyNoList);
+                break;
+            case "2":
+                scrapCancelHandler(applyNoList);
+                break;
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * 注销-数据处理
+     * @param applyNoList 申请单号list
+     */
+    private void scrapCancelHandler(List<String> applyNoList){
+        applyNoList.forEach(applyNo ->{
+            // 查询注销数据
+            JgScrapCancel scrapCancel = jgScrapCancelMapper.selectOne(new LambdaQueryWrapper<JgScrapCancel>()
+                    .eq(JgScrapCancel::getApplyNo, applyNo));
+            // 查询注销的历史数据
+            JgRegistrationHistory history = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getRegistrationClass, "注销")
+                    .eq(JgRegistrationHistory::getCurrentDocumentId,scrapCancel.getSequenceNbr()));
+            // 查询已经入库的设备id
+            List<String> inEqTableEquId = jgScrapCancelEqMapper.selectList(new LambdaQueryWrapper<JgScrapCancelEq>()
+                            .eq(JgScrapCancelEq::getEquipTransferId, scrapCancel.getSequenceNbr()))
+                    .stream()
+                    .map(JgScrapCancelEq::getEquId)
+                    .collect(Collectors.toList());
+            // 查询单子下的所有使用登记证的seq
+            List<Long> certificateSeq = JSONArray.parseArray(JSON.toJSONString(JSONObject.parseObject(history.getChangeData()).get("certificates"))).stream().map(item -> Long.valueOf((String) JSONObject.parseObject(JSONObject.toJSONString(item)).get("sequenceNbr"))).collect(Collectors.toList());
+            // 使用登记证下的所有设备
+            List<JSONObject> equJSONList = registrationManageService.queryEquByCertificateSeqList(certificateSeq);
+            // 过滤出未入库的设备
+            List<JSONObject> toBeProcessedEq = equJSONList.stream().filter(item -> !inEqTableEquId.contains(item.getString("SEQUENCE_NBR"))).collect(Collectors.toList());
+            // 未入库的设备record
+            List<String> toBeProcessedEqRecord = toBeProcessedEq.stream().map(item -> String.valueOf(item.get("SEQUENCE_NBR"))).collect(Collectors.toList());
+            // 保存到对应的eq表
+            ArrayList<JgScrapCancelEq> jgScrapCancelEqs = new ArrayList<>();
+            toBeProcessedEqRecord.forEach(eq ->{
+                IdxBizJgRegisterInfo jgRegisterInfo = idxBizJgRegisterInfoService.getBaseMapper().selectOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, eq));
+                JgScrapCancelEq cancelEq = new JgScrapCancelEq();
+                cancelEq.setEquipTransferId(String.valueOf(scrapCancel.getSequenceNbr()));
+                cancelEq.setEquId(eq);
+                cancelEq.setIsDelete(Boolean.FALSE);
+                cancelEq.setEquCode(jgRegisterInfo.getEquCode());
+                cancelEq.setUseRegistrationCode(jgRegisterInfo.getUseOrgCode());
+                jgScrapCancelEqs.add(cancelEq);
+                jgScrapCancelEqMapper.insert(cancelEq);
+            });
+            // 修改监督管理信息
+            SuperviseInfo superviseInfo = new SuperviseInfo();
+            superviseInfo.setOrgBranchCode("");
+            superviseInfo.setOrgBranchName("");
+            LambdaQueryWrapper<SuperviseInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SuperviseInfo::getRecord, toBeProcessedEqRecord);
+            superviseInfoMapper.update(superviseInfo, wrapper);
+            // 修改设备状态
+            idxBizJgUseInfoMapper.batchUpdateUseInfo(toBeProcessedEqRecord, EquimentEnum.ZHUXIAO.getCode());
+            // 修改证管理表中的证的状态
+            List<JgUseRegistrationManage> jgUseRegistrationManages = jgUseRegistrationManageMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
+                    .in(JgUseRegistrationManage::getSequenceNbr, certificateSeq)
+                    .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()));
+            LambdaUpdateWrapper<JgUseRegistrationManage> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.in(JgUseRegistrationManage::getSequenceNbr,jgUseRegistrationManages.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList()));
+            updateWrapper.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
+            jgUseRegistrationManageMapper.update(null, updateWrapper);
+            // 修改es数据
+            Map<String, Object> map = new HashMap<>();
+            map.put("ORG_BRANCH_CODE", "");
+            map.put("ORG_BRANCH_NAME", "");
+            map.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
+            Map<String, Map<String, Object>> resultMap = new HashMap<>();
+            for (String equipId : toBeProcessedEqRecord) {
+                resultMap.put(equipId, map);
+            }
+            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+            // 添加流水记录
+            String userId = scrapCancel.getCreateUserId();
+            String realName = Privilege.agencyUserClient.queryByUserId(userId).getResult().getRealName();
+            String content = scrapCancel.getUseUnitName() + "的" + realName + "办理了【" + CancelTypeEnum.getNameByType(scrapCancel.getCancelType()) + "】" +
+                    "单号【" + scrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
+            List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
+            List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();
+            Optional<JgCertificateChangeRecord> first = certificateChangeRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<JgCertificateChangeRecord>().eq(JgCertificateChangeRecord::getApplyNo, applyNo)).stream().findFirst();
+            for (JgUseRegistrationManage jgUseRegistrationManage : jgUseRegistrationManages) {
+                long seq = sequence.nextId();
+                JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
+                changeRecord.setSequenceNbr(seq);
+                changeRecord.setApplyNo(scrapCancel.getApplyNo());
+                changeRecord.setReceiveOrgName(scrapCancel.getReceiveOrgName());
+                changeRecord.setAuditPassDate(new Date());
+                changeRecord.setRegType(CancelTypeEnum.getNameByType(scrapCancel.getCancelType()));
+                changeRecord.setRegDate(scrapCancel.getCreateDate());
+                changeRecord.setChangeContent(content);
+                changeRecord.setUseRegistrationCode(jgUseRegistrationManage.getUseRegistrationCode());
+                changeRecord.setReceiveCompanyCode(scrapCancel.getReceiveOrgCode());
+                changeRecord.setUseUnitCreditCode(scrapCancel.getUseUnitCode());
+                changeRecord.setUseUnitName(scrapCancel.getUseUnitName());
+                changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategoryCode());
+                changeRecord.setCreateDate(new Date());
+                first.ifPresent(item -> changeRecord.setRoutePath(item.getRoutePath()));
+                changeRecord.setCreateUserId(scrapCancel.getCreateUserId());
+                changeRecord.setCertificateNo(jgUseRegistrationManage.getCertificateNo());
+                certificateChangeRecords.add(changeRecord);
+                jgScrapCancelEqs.stream().filter(eq -> eq.getUseRegistrationCode().equals(jgUseRegistrationManage.getUseRegistrationCode())).forEach(e -> {
+                    JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                    changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString()); // 登记证记录主键
+                    changeRecordEq.setEquId(e.getEquId()); // 设备主键
+                    changeRecordEq.setProductCode(e.getEquCode()); // 设备代码
+                    changeRecordEqList.add(changeRecordEq);
+                });
+            }
+            if (!certificateChangeRecords.isEmpty()) {
+                certificateChangeRecordService.saveBatch(certificateChangeRecords);
+            }
+            if (!changeRecordEqList.isEmpty()) {
+                jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
+            }
+        });
+    }
+
+    /**
+     * 单位变更数据处理
+     *
+     * @param applyNoList 申请编号list
+     */
+    private void changeRegistrationUnitHandler(List<String> applyNoList) {
         applyNoList.forEach(applyNo ->{
             // 查询单位变更登记的历史数据
             JgRegistrationHistory history = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
@@ -1394,22 +1542,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             // 过滤出未入库的设备
             List<JSONObject> toBeProcessedEq = equJSONList.stream().filter(item -> !inEqTableEquId.contains(item.getString("SEQUENCE_NBR"))).collect(Collectors.toList());
             // 将未入库设备 保存到eq表
-            this.bug24304HandleSaveLackEqu(toBeProcessedEq, registrationUnit);
+            this.changeRegistrationUnitSaveLackEqu(toBeProcessedEq, registrationUnit);
             // 将未入库设备 更新es和otherInfo表的使用单位信息
-            this.bug24304HandleUpdateLackEquForES(toBeProcessedEq, registrationUnit);
-            this.bug24304HandleUpdateLackEquForUseInfo(toBeProcessedEq, registrationUnit);
-
+            this.changeRegistrationUnitUpdateLackEquForES(toBeProcessedEq, registrationUnit);
+            this.changeRegistrationUnitUpdateLackEquForUseInfo(toBeProcessedEq, registrationUnit);
         });
-        // for (JgRegistrationHistory history : targetHistory) {
-
-        // }
-
     }
 
     /**
-     * 保存漏掉的设备
+     * 单位变更-保存漏掉的设备
      */
-    public void bug24304HandleSaveLackEqu(List<JSONObject> deviceList, JgChangeRegistrationUnit registrationUnit) {
+    public void changeRegistrationUnitSaveLackEqu(List<JSONObject> deviceList, JgChangeRegistrationUnit registrationUnit) {
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
         deviceList.forEach(device -> {
             JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
@@ -1426,9 +1569,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationUnitEqService.saveBatch(jgRelationEquipList);
     }
     /**
-     * 修改es漏掉的设备
+     * 单位变更-修改es漏掉的设备
      */
-    public void bug24304HandleUpdateLackEquForES(List<JSONObject> deviceList, JgChangeRegistrationUnit registration) {
+    public void changeRegistrationUnitUpdateLackEquForES(List<JSONObject> deviceList, JgChangeRegistrationUnit registration) {
         deviceList.forEach(device -> {
             Map<String, Map<String, Object>> resultMap = new HashMap<>();
             Map<String, Object> map1 = new HashMap<>();
@@ -1441,9 +1584,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         });
     }
     /**
-     * 修改使用信息表中漏掉的设备
+     * 单位变更-修改使用信息表中漏掉的设备
      */
-    public void bug24304HandleUpdateLackEquForUseInfo(List<JSONObject> deviceList, JgChangeRegistrationUnit registration) {
+    public void changeRegistrationUnitUpdateLackEquForUseInfo(List<JSONObject> deviceList, JgChangeRegistrationUnit registration) {
         deviceList.forEach(device -> {
             LambdaQueryWrapper<UseInfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(UseInfo::getRecord, device.getString("SEQUENCE_NBR"));

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

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
 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.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 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;
@@ -15,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
@@ -38,6 +38,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -1059,8 +1060,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
 
     private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
-        String userName = jgScrapCancel.getCreateUserName();
-        String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
+        String realName = Privilege.agencyUserClient.queryByUserId(jgScrapCancel.getCreateUserId()).getResult().getRealName();
+        String content = jgScrapCancel.getUseUnitName() + "的" + realName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
                 "单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
         List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
         List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();