Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipmentInfoDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @apiNote 设备基本情况
+ * @author LiuLin
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EquipmentInfoDto {
+    private String equListCode;
+    private String equCategoryCode;
+    private String equDefineCode;
+    private String equList;
+    private String equCategory;
+    private String equDefine;
+    private String dataSource;
+    private String useOrgCode;
+    private String receiveOrgCode;
+    private String receiveOrgName;
+    private String possession;
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -48,7 +48,10 @@ public enum BusinessTypeEnum {
 
     JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记"),
 
-    JG_VEHICLE_GAS_CYLINDER_CHANGE("119", "车用气瓶变更登记");
+    JG_VEHICLE_GAS_CYLINDER_CHANGE("119", "车用气瓶变更登记"),
+
+    JG_HISTORY_USAGE_REGISTRATION("119", "历史设备登记");
+
     private final String code;
 
     private final String name;

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

@@ -843,11 +843,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
 //        map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
         if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
-            IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-            idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
-            LambdaQueryWrapper<IdxBizJgUseInfo> wrapper = new LambdaQueryWrapper<>();
-            wrapper.in(IdxBizJgUseInfo::getRecord, equipIds);
-            idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper);
+            idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.BAOFEI.getCode());
             map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
 
             // 修改证管理表中的证的状态
@@ -876,11 +872,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             map1.put("ORG_BRANCH_CODE", "");
             map1.put("ORG_BRANCH_NAME", "");
             map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
-            IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-            idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
-            LambdaQueryWrapper<IdxBizJgUseInfo> wrapper1 = new LambdaQueryWrapper<>();
-            wrapper1.in(IdxBizJgUseInfo::getRecord, equipIds);
-            idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper1);
+            idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode());
 
             // 修改证管理表中的证的状态
             List<String> certificateIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getCertificateSeq).collect(Collectors.toList());

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

@@ -1203,7 +1203,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfoMapper.updateById(useInfo);
         // 更新es
-        updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject);
+        updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject, Boolean.FALSE);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                 .applyNo(jgUseRegistration.getApplyNo())
                 .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
@@ -1272,13 +1272,19 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return codeUtil.generateEquipmentCode(codeGenerateDto);
     }
 
-    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, JgUseRegistration jgUseRegistration,JSONObject jsonObject) {
-        // 属地监管部门拆分
-        String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
-        String[] split = orgBranch.split("_");
+    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,
+                             JgUseRegistration jgUseRegistration,JSONObject jsonObject, Boolean rollBake) {
         // 更新es
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
         HashMap<String, Object> param = new HashMap<>();
+        if (rollBake) {
+            param.put("EQU_STATE", EquimentEnum.WEIDENGJI.getCode());
+            param.put("IS_INTO_MANAGEMENT", Boolean.FALSE);
+            param.put("USE_ORG_CODE", null);
+        } else {
+            // 属地监管部门拆分
+            String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
+            String[] split = orgBranch.split("_");
             param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
             param.put("CODE96333", otherInfo.getCode96333());
             param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
@@ -1294,6 +1300,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             param.put("ORG_BRANCH_NAME", split[1]);
             param.put("EQU_CODE", dataMap.get("equCode"));
             param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
+        }
         objMap.put((String) dataMap.get("equipId"), param);
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
@@ -1352,6 +1359,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void flowExecute(Long id, String instanceId, String operate, String comment, String carNumber, String manageType, String nextTaskId, JSONObject jsonObject) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
+        JSONObject recordJsonObject = new JSONObject();
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
@@ -1362,12 +1370,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             commonService.checkForExecuteFlow(nextTaskId, instanceId);
 
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
-
-            if (!ObjectUtils.isEmpty(carNumber)) {
-                // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
             LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
                     .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
             JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
+            recordJsonObject.put("equipId", jgUseRegistrationEq.getEquId());
+            if (!ObjectUtils.isEmpty(carNumber)) {
+                // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
                 wrapper.ne(!ObjectUtils.isEmpty(jgUseRegistrationEq.getEquId()), IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
@@ -1375,7 +1383,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if (count > 0) {
                     throw new BadRequest("车牌号已存在，请重新输入！");
                 }
-
                 LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
                         .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
                 IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
@@ -1415,6 +1422,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);
         } catch (InterruptedException e) {
+            updateEsData(null, recordJsonObject, null, null, null, Boolean.TRUE);
             e.printStackTrace();
         } finally {
             if (lock.isHeldByCurrentThread()) {
@@ -1817,7 +1825,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.in(JgRegistrationHistory::getCurrentDocumentId, useRegistrationSeqs);
         List<JgRegistrationHistory> registrationHistoryList = jgRegistrationHistoryService.getBaseMapper().selectList(lambda);
-        if(!ValidationUtil.isEmpty(registrationHistoryList)){
+        if(ValidationUtil.isEmpty(registrationHistoryList)){
             throw new BadRequest("没有查询到汇总信息！");
         }
         JSONArray allEquipment = new JSONArray();
@@ -1830,7 +1838,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONObject equipmentItem = equipmentLists.getJSONObject(i);
                 equipmentItem.put("useDate", timeToMonths(useDateValue));
             }
-            allEquipment.add(equipmentLists);
+            allEquipment.addAll(equipmentLists);
         });
 
         total = allEquipment.size();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 /**
  * 使用信息表 Mapper 接口
@@ -10,5 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-08-16
  */
 public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
-
+    void batchUpdateUseInfo(@Param("records") List<String> records, Integer code);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper">
 
+    <update id="batchUpdateUseInfo">
+        UPDATE idx_biz_jg_use_info SET "EQU_STATE" = #{code} WHERE "RECORD" IN
+        <foreach collection="records" separator="," item="record" open="(" close=")">
+            #{record}
+        </foreach>
+    </update>
 </mapper>