1.西安数据编辑接口

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
+import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class UseRegisterChangeDataDto extends BaseChangeDataDto {
+@Group(value = "equip_use_info")
+public class EquipUseInfoChangeDataDto extends BaseChangeDataDto {
 
+    @FieldDisplayDefine(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
 
+    @FieldDisplayDefine(value = "使用单位名称")
+    private String useUnitName;
+
+    @FieldDisplayDefine(value = "单位内部编号")
+    private String useInnerCode;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/factory/ChangeItemFactory.java

@@ -10,8 +10,8 @@ public class ChangeItemFactory {
     private static final Map<String, Class<? extends BaseChangeDataDto>> ITEM_FACTORY = new HashMap<>();
 
     static {
-        // 使用登记信息
-        ITEM_FACTORY.put("biz_use_register_info", UseRegisterChangeDataDto.class);
+        // 使用信息
+        ITEM_FACTORY.put("equip_use_info", EquipUseInfoChangeDataDto.class);
         // 设备-注册登记信息
         ITEM_FACTORY.put("equip_register_info", EquipRegisterChangeDataDto.class);
         // 设备-制造信息

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

@@ -8,11 +8,9 @@ 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.entity.BaseEntity;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.service.IChangeDataProcessStrategy;

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

@@ -9,15 +9,13 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgDesignInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -28,6 +26,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
+@RequiredArgsConstructor
 public class EquipChangeDataUpdateService {
 
     private final ESEquipmentCategory esEquipmentCategory;
@@ -42,14 +41,7 @@ public class EquipChangeDataUpdateService {
 
     private final EquipmentCategoryMapper equipmentCategoryMapper;
 
-    public EquipChangeDataUpdateService(ESEquipmentCategory esEquipmentCategory, IdxBizJgDesignInfoMapper idxBizJgDesignInfoMapper, IdxBizJgFactoryInfoMapper jgFactoryInfoMapper, IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, CommonMapper commonMapper, EquipmentCategoryMapper equipmentCategoryMapper) {
-        this.esEquipmentCategory = esEquipmentCategory;
-        this.idxBizJgDesignInfoMapper = idxBizJgDesignInfoMapper;
-        this.jgFactoryInfoMapper = jgFactoryInfoMapper;
-        this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
-        this.commonMapper = commonMapper;
-        this.equipmentCategoryMapper = equipmentCategoryMapper;
-    }
+    private final IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
 
     public void updateRegisterChangeData(String record, EquipRegisterChangeDataDto registerChangeDataDto) {
         LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new LambdaUpdateWrapper<>();
@@ -116,6 +108,7 @@ public class EquipChangeDataUpdateService {
         }
     }
 
+
     private void updateRegisterEsData(String record, EquipRegisterChangeDataDto registerChangeDataDto) {
         // es 数据更新
         Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
@@ -165,7 +158,7 @@ public class EquipChangeDataUpdateService {
 
     public void checkFactoryChangeData(String record, EquipFactoryChangeDataDto equipFactoryChangeDataDto, String equList, String equCategory, String equDefine) {
         // 气瓶时检验出厂编号-普通气瓶，车用气瓶不再此范围内
-        if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory)) {
+        if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) && StringUtils.isNotEmpty(equipFactoryChangeDataDto.getFactoryNum())) {
             boolean isUsed = this.checkFactoryNumUnique(equipFactoryChangeDataDto.getFactoryNum(), record, equipFactoryChangeDataDto.getProduceUnitCreditCode());
             if (isUsed) {
                 throw new BadRequest("出厂编号/产品编码在该企业中已存在！");
@@ -211,4 +204,26 @@ public class EquipChangeDataUpdateService {
         updateWrapper.set(IdxBizJgDesignInfo::getRecDate, new Date());
         idxBizJgDesignInfoMapper.update(null, updateWrapper);
     }
+
+    public void updateUseInfoChangeData(String record, EquipUseInfoChangeDataDto equipUseInfoChangeDataDto) {
+        LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(IdxBizJgUseInfo::getRecord, record);
+        updateWrapper.set(IdxBizJgUseInfo::getUseUnitCreditCode, equipUseInfoChangeDataDto.getUseUnitCreditCode());
+        updateWrapper.set(IdxBizJgUseInfo::getUseUnitName, equipUseInfoChangeDataDto.getUseUnitName());
+        updateWrapper.set(IdxBizJgUseInfo::getUseInnerCode, equipUseInfoChangeDataDto.getUseInnerCode());
+        idxBizJgUseInfoService.update(updateWrapper);
+        this.updateUseInfoEsData(record, equipUseInfoChangeDataDto);
+    }
+
+    private void updateUseInfoEsData(String record, EquipUseInfoChangeDataDto equipUseInfoChangeDataDto) {
+        // es 数据更新
+        Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
+        if (optional.isPresent()) {
+            ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+            esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(equipUseInfoChangeDataDto.getUseUnitCreditCode());
+            esEquipmentCategoryDto.setUSC_UNIT_NAME(equipUseInfoChangeDataDto.getUseUnitName());
+            esEquipmentCategoryDto.setUSE_INNER_CODE(equipUseInfoChangeDataDto.getUseInnerCode());
+            esEquipmentCategory.save(esEquipmentCategoryDto);
+        }
+    }
 }

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yeejoin.amos.boot.module.jg.api.dto.*;
+import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
+import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class SingleManageEquipEditHandleImpl implements IBizDataChangeHandleStrategy {
+    private final CommonEquipDataProcessService commonEquipDataProcessService;
+
+    private final EventPublisher publisher;
+
+    @Override
+    public String canHandleBizType() {
+        return "singleManageEquipEdit";
+    }
+
+    @Override
+    public Map<String, ?> getDetail(String applyNo, ModelType model, String bizId) {
+        return this.getDetailByBizId(bizId);
+    }
+
+    public Map<String, Object> getDetailByBizId(String record) {
+        Map<String, Object> re = new HashMap<>();
+        // 注册信息(基本信息)构建
+        EquipRegisterChangeDataDto equipRegisterChangeDataDto = commonEquipDataProcessService.buildRegisterInfo(record);
+        // 制造信息构建
+        EquipFactoryChangeDataDto factoryChangeDataDto = commonEquipDataProcessService.buildFactoryInfo(record);
+        // 设计信息构建
+        EquipDesignChangeDataDto designChangeDataDto = commonEquipDataProcessService.buildDesignInfo(record);
+        // 使用信息
+        EquipUseInfoChangeDataDto equipUseInfoChangeDataDto = commonEquipDataProcessService.buildUseInfo(record);
+        re.putAll(BeanUtil.beanToMap(equipRegisterChangeDataDto));
+        re.putAll(BeanUtil.beanToMap(factoryChangeDataDto));
+        re.putAll(BeanUtil.beanToMap(designChangeDataDto));
+        re.putAll(BeanUtil.beanToMap(equipUseInfoChangeDataDto));
+        commonEquipDataProcessService.castJsonFields(re);
+        return commonEquipDataProcessService.cast2UnderCase(re);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void doSave(String record, ModelType model, Map<String, Object> changeData) {
+        List<ChangeDataDto> allChangeColumns = this.update(record, changeData);
+        // 记录流水
+        if (!allChangeColumns.isEmpty()) {
+            // 更新历史的JSON的数据
+            this.buildLogData(allChangeColumns);
+            // 异步记录日志
+            publisher.publish(new ChangeDataEvent(this, allChangeColumns, RequestContext.cloneRequestContext()));
+        }
+    }
+
+    private List<ChangeDataDto> update(String record, Map<String, Object> changeData) {
+        List<ChangeDataDto> allChangeColumns = new ArrayList<>();
+        // 新数据解析
+        EquipRegisterChangeDataDto registerChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipRegisterChangeDataDto.class);
+        EquipFactoryChangeDataDto factoryChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipFactoryChangeDataDto.class);
+        EquipDesignChangeDataDto designChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipDesignChangeDataDto.class);
+        EquipUseInfoChangeDataDto useInfoChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipUseInfoChangeDataDto.class);
+        commonEquipDataProcessService.buildChangeFields(record, designChangeDataDto, factoryChangeDataDto, registerChangeDataDto, useInfoChangeDataDto, allChangeColumns);
+        // 前置校验
+        commonEquipDataProcessService.checkValidField(record, registerChangeDataDto, registerChangeDataDto.getEquList(), registerChangeDataDto.getEquCategory(), registerChangeDataDto.getEquDefine());
+        commonEquipDataProcessService.checkValidField(record, factoryChangeDataDto, registerChangeDataDto.getEquList(), registerChangeDataDto.getEquCategory(), registerChangeDataDto.getEquDefine());
+        commonEquipDataProcessService.checkValidField(record, designChangeDataDto, registerChangeDataDto.getEquList(), registerChangeDataDto.getEquCategory(), registerChangeDataDto.getEquDefine());
+        // 设备制造、设计、注册、使用信息业务处理落库
+        commonEquipDataProcessService.dealBizDataForEquip(record, registerChangeDataDto);
+        commonEquipDataProcessService.dealBizDataForEquip(record, factoryChangeDataDto);
+        commonEquipDataProcessService.dealBizDataForEquip(record, designChangeDataDto);
+        commonEquipDataProcessService.dealBizDataForEquip(record, useInfoChangeDataDto);
+        return allChangeColumns;
+    }
+
+
+    private void buildLogData(List<ChangeDataDto> allChangeColumns) {
+        allChangeColumns.forEach(column -> {
+            column.setBizType("监管端编辑设备信息");
+        });
+    }
+
+}