Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/ESEquipmentInfo.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
 import lombok.Data;
@@ -364,6 +366,12 @@ public class ESEquipmentInfo {
     private LocalDate INSPECT_DATE;
 
     /**
+     * 设备总价值（万元）
+     */
+    @Field(type = FieldType.Scaled_Float, scalingFactor = 100)
+    private BigDecimal equPrice;
+
+    /**
      * 单位类型-多个逗号分隔开-实时的单位类型
      */
     @Field(type = FieldType.Keyword)

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

@@ -65,7 +65,9 @@ public enum BusinessTypeEnum {
 
     JG_NEW_EQUIP("122", "新增设备"),
 
-    JG_NEW_PROJECT("123", "新增装置");
+    JG_NEW_PROJECT("123", "新增装置"),
+
+    JG_EQUIP_CLAIM("124", "设备认领");
 
     private final String code;
 

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.EquipClaimServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@Api(tags = "设备认领")
+@RestController
+@RequestMapping(value = "/equipClaim")
+@RequiredArgsConstructor
+public class EquipClaimController extends BaseController {
+
+    private final EquipClaimServiceImpl equipClaimService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/setEquip/page")
+    @ApiOperation(value = "待认领-台套设备分页", httpMethod = "GET")
+    public ResponseModel<Page<JSONObject>> setEquipPage(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(equipClaimService.setEquipPage(new JSONObject(map)));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/setEquip/claim")
+    @ApiOperation(value = "认领-台套设备", httpMethod = "POST")
+    public ResponseModel<Object> setEquipClaim(@RequestBody Map<String, Object> map) {
+        return ResponseHelper.buildResponse(equipClaimService.setEquipClaim(new JSONObject(map)));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/pipeEquip/page")
+    @ApiOperation(value = "待认领-管道装置设备分页", httpMethod = "GET")
+    public ResponseModel<IPage<IdxBizJgProjectContraption>> pipeEquipPage(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(equipClaimService.pipeEquipPage(new JSONObject(map)));
+    }
+
+}

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

@@ -32,12 +32,10 @@ import java.util.Map;
 @Api(tags = "移装变更登记登记Api")
 @RequestMapping(value = "/jg-change-registration-transfer")
 public class JgChangeRegistrationTransferController extends BaseController {
-	private static final String TABLE_PAGE_ID = "changeRegistrationTransfer";
+
 	
     @Autowired
 	IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
-	@Autowired
-	IJgInstallationNoticeService iJgInstallationNoticeService;
 
     /**
      * 新增移装变更登记登记

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/handler/EquipmentRefreshHandler.java

@@ -52,6 +52,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
         switch (DataRefreshEvent.Operation.valueOf(message.getOperation())) {
             case DELETE:
                 esEquipmentDao.deleteById(message.getDataId());
+                break;
             case INSERT:
             case UPDATE:
                 String record = message.getDataId();

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

@@ -907,7 +907,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkEquCodeUniqueness(LinkedHashMap equipmentInfoForm) {
+    public void checkEquCodeUniqueness(LinkedHashMap equipmentInfoForm) {
         // 根据设备代码检查唯一性
         String equCode = (String) equipmentInfoForm.get(EQU_CODE);
         String sequenceNbr = (String) equipmentInfoForm.get(SEQUENCE_NBR);
@@ -928,7 +928,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * @param record
      * @param dataSource
      */
-    private void checkCarNumberUniquenessWithHisCC(LinkedHashMap<?, ?> equipmentInfoForm, String record, String dataSource) {
+    public void checkCarNumberUniquenessWithHisCC(LinkedHashMap<?, ?> equipmentInfoForm, String record, String dataSource) {
         if (dataSource.contains("his") && EquipmentClassifityEnum.CC.getCode().equals(equipmentInfoForm.get(EQU_LIST)) && !ValidationUtil.isEmpty(equipmentInfoForm.get(CAR_NUMBER))) {
             String carNumber = String.valueOf(equipmentInfoForm.get(CAR_NUMBER));
             if (!"无".equals(carNumber)) {
@@ -940,7 +940,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void check96333Code(LinkedHashMap equipmentInfoForm) {
+    public void check96333Code(LinkedHashMap equipmentInfoForm) {
         if (!ObjectUtils.isEmpty(equipmentInfoForm.get(CODE96333))) {
             // 根据96333码检查唯一性
             LambdaQueryWrapper<IdxBizJgOtherInfo> wrapper = new LambdaQueryWrapper<>();
@@ -954,7 +954,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkFactoryNumUniqueWithGasCylinder(LinkedHashMap equipmentInfoForm, String record) {
+    public void checkFactoryNumUniqueWithGasCylinder(LinkedHashMap equipmentInfoForm, String record) {
         if (equipmentInfoForm.get(EQU_LIST).equals("2000")
                 && equipmentInfoForm.get(EQU_CATEGORY).equals("2300")
                 && commonMapper.checkFactoryNumUnique(String.valueOf(equipmentInfoForm.get(FACTORY_NUM)), record, String.valueOf(equipmentInfoForm.get("PRODUCE_UNIT_CREDIT_CODE"))) > 0) {
@@ -962,7 +962,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkFactoryNumUniqueness(LinkedHashMap equipmentInfoForm) {
+    public void checkFactoryNumUniqueness(LinkedHashMap equipmentInfoForm) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
         Integer factoryNum = commonMapper.checkFactoryNumUniquenessForVehicleCylinder((String) equipmentInfoForm.get(FACTORY_NUM), (String) equipmentInfoForm.get(RECORD));
         if (factoryNum > 0) {
@@ -970,7 +970,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void hisEquCheckUseRegCodeAndVINUniqueness(LinkedHashMap<?, ?> equipmentInfoForm, String record) {
+    public void hisEquCheckUseRegCodeAndVINUniqueness(LinkedHashMap<?, ?> equipmentInfoForm, String record) {
         // 历史（车用气瓶）设备校验使用登记证编号 VIN 全库唯一
         if ("2000".equals(equipmentInfoForm.get(EQU_LIST)) && "2300".equals(equipmentInfoForm.get(EQU_CATEGORY)) && "23T0".equals(equipmentInfoForm.get(EQU_DEFINE)) && "1".equals(equipmentInfoForm.get(WHETHER_VEHICLE_CYLINDER))) {
             String dataSource = (String) equipmentInfoForm.get(DATA_SOURCE);
@@ -3571,7 +3571,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             otherInfo.setCode96333(null);
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
+        // 保存或者更新设备技术参数
+        this.saveOrUpdateEquParams(equipmentInfoForm, equipmentParamsForm, equList, record, date, operateType);
+        return record;
+    }
 
+    /**
+     * 保存或者更新设备技术参数
+     * @param equipmentInfoForm
+     * @param equipmentParamsForm
+     * @param equList
+     * @param record
+     * @param date
+     * @param operateType
+     */
+    public void saveOrUpdateEquParams(LinkedHashMap equipmentInfoForm, LinkedHashMap equipmentParamsForm, String equList, String record, Date date, String operateType) {
         // 八大类技术参数和主要零部件和安全附件表
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
@@ -3715,7 +3729,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ValidationUtil.isEmpty(protectionDevicesList)) {
             iIdxBizJgProtectionDevicesService.saveOrUpdateBatchData(protectionDevicesList);
         }
-        return record;
     }
 
     /**
@@ -3777,29 +3790,27 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (EQUIP_MAINPARTS_FORM_ID.equals(subFormType) && !ValidationUtil.isEmpty(list)) {
             for (Object s : list) {
-                List subFormMainPartsList = (ArrayList) map.get(s);
-                if (!ObjectUtils.isEmpty(subFormMainPartsList)) {
-                    for (Object obj : subFormMainPartsList) {
-                        HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
-                        IdxBizJgMainParts mainParts = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgMainParts.class);
+                JSONArray subFormMainPartsList = JSON.parseArray(toJSONString(map.get(s)));
+                subFormMainPartsList.forEach(data -> {
+                    JSONObject jsonObject = (JSONObject) data;
+                    IdxBizJgMainParts mainParts = jsonObject.toJavaObject(IdxBizJgMainParts.class);
                     mainParts.setRecord(record);
                     mainParts.setRecDate(date);
-                        mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("MAINPARTS_SEQ")));
+                    mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(jsonObject.get("MAINPARTS_SEQ")));
                     mainPartsList.add(mainParts);
-                    }
-                }
+                });
             }
             return mainPartsList;
         } else if (EQUIP_PROTECTIONDEVICES_FORM_ID.equals(subFormType) && !ValidationUtil.isEmpty(list)) {
             for (Object s : list) {
-                List subFormProtectionDevicesList = (ArrayList) map.get(s);
+                JSONArray subFormProtectionDevicesList = JSON.parseArray(toJSONString(map.get(s)));
                 if (!ObjectUtils.isEmpty(subFormProtectionDevicesList)) {
                     for (Object obj : subFormProtectionDevicesList) {
-                        HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
-                        IdxBizJgProtectionDevices protectionDevices = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgProtectionDevices.class);
+                        JSONObject jsonObject = (JSONObject) obj;
+                        IdxBizJgProtectionDevices protectionDevices = jsonObject.toJavaObject(IdxBizJgProtectionDevices.class);
                         protectionDevices.setRecord(record);
                         protectionDevices.setRecDate(date);
-                        protectionDevices.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("PROTECTIONDEVICES_SEQ")));
+                        protectionDevices.setSequenceNbr("save".equals(type) ? null : String.valueOf(jsonObject.get("PROTECTIONDEVICES_SEQ")));
                         protectionDevicesList.add(protectionDevices);
                     }
                 }
@@ -3960,6 +3971,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     @Override
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
+    @Transactional(rollbackFor = Exception.class)
     public Object savePressureVesselData(Map<String, Object> paramMap) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         CompanyBo company = reginParams.getCompany();

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

@@ -462,6 +462,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param comment
      */
     @GlobalTransactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);

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

@@ -1125,6 +1125,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * @date 2024/7/18 11:00
      **/
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
+    @Transactional(rollbackFor = Exception.class)
     public void accept(JgChangeRegistrationUnitDto dto, String op, ReginParams reginParams) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
         RLock lock = redissonClient.getLock(lockKey);

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

@@ -904,6 +904,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @param op  通过或驳回
      */
     @GlobalTransactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void accept(Map<String, Object> map, String op) {
         LinkedHashMap model1 = (LinkedHashMap) map.get("model");
         String opinion = (String) map.get("opinion");

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

@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.enums.JYJCResultEnum;
-import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 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.*;
@@ -4483,7 +4482,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
-    private void historyEquGenManageRelated(JSONObject map, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo idxBizJgFactoryInfo) {
+    public void historyEquGenManageRelated(JSONObject map, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo idxBizJgFactoryInfo) {
         Optional.ofNullable(registerInfo).ifPresent(info -> {
             // 生成证书管理表记录
             generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);

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

@@ -96,6 +96,7 @@
             ibjri."CYLINDER_CATEGORY",
             ibjri."WHETHER_SPHERICAL_TANK",
             ibjri."CAR_NUMBER",
+            ibjri."EQU_PRICE",
             concat_ws ( '/', ibjui."PROVINCE_NAME", ibjui."CITY_NAME", ibjui."COUNTY_NAME", ibjui."STREET_NAME" ) AS "USE_PLACE",
             concat_ws ( '#', ibjui."PROVINCE", ibjui."CITY", ibjui."COUNTY", ibjui."FACTORY_USE_SITE_STREET" ) AS "USE_PLACE_CODE",
             ibjui."ADDRESS",