Commit dd690f59 authored by suhuiguang's avatar suhuiguang

feat(大编辑):管道增减功能开发

1.基础代码提交
parent 548e6971
......@@ -28,10 +28,12 @@ public class PipelineChangeItemDto extends TechParamsPipelineChangeFieldDto {
@FieldDisplayDefine(value = "检验检测流水id", isExist = false)
private String jySeq;
@FieldDisplayDefine(value = "安装信息流水", isExist = false)
private String constructionInfoSeq;
@FieldDisplayDefine(value = "安装单位名称")
private String uscUnitName;
@FieldDisplayDefine(value ="检验类型", dictCode = "JYJC")
private String inspectType;
......
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import java.util.List;
public interface DataBackupManager {
void backup(String key);
void restore(String key);
}
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import org.springframework.context.ApplicationContext;
import java.util.List;
public abstract class DefaultEquipBackupManager implements DataBackupManager {
protected ApplicationContext applicationContext;
public DefaultEquipBackupManager(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
public void backup(String bizId) {
EquipBackupHandler handler= applicationContext.getBean(EquipBackupHandler.class);
handler.compressBackup(getBizType(), getRecords(bizId));
}
public void restore(String bizId) {
EquipBackupHandler handler= applicationContext.getBean(EquipBackupHandler.class);
handler.restoreFormBackup(getBizType(), bizId);
}
public abstract List<String> getRecords(String bizId);
public abstract String getBizType();
}
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class EquipBackupHandler {
public void compressBackup(String bizType, List<String> records) {
}
public void restoreFormBackup(String bizType, String bizId) {
}
}
package com.yeejoin.amos.boot.module.jg.biz.edit.backup;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.stream.Collectors;
@Component
public class UseRegisterBackupManager extends DefaultEquipBackupManager {
private final JgUseRegistrationEqServiceImpl jgUseRegistrationEqService;
public UseRegisterBackupManager(ApplicationContext applicationContext, JgUseRegistrationEqServiceImpl jgUseRegistrationEqService) {
super(applicationContext);
this.jgUseRegistrationEqService = jgUseRegistrationEqService;
}
@Override
public List<String> getRecords(String bizId) {
List<JgUseRegistrationEqDto> eqDtoList = jgUseRegistrationEqService.queryForJgUseRegistrationEqList(bizId);
return eqDtoList.stream().map(JgUseRegistrationEqDto::getEquId).collect(Collectors.toList());
}
@Override
public String getBizType() {
return BusinessTypeEnum.JG_USAGE_REGISTRATION.name();
}
}
......@@ -53,6 +53,7 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
}
private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject oData, ReginParams selectedOrgInfo) {
// 重复行数据不记录日志(如行政区划编码、行政区划名称,只记录一个字段即可)
List<FieldChangeMeta> noPeatChangeFields = allChangeColumns.stream().filter(f-> !f.getIsRepeatColumn()).collect(Collectors.toList());
if (!noPeatChangeFields.isEmpty()) {
BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
......
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
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.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
......@@ -17,6 +18,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
......@@ -43,6 +45,42 @@ public class UseRegisterUpdateService {
jgUseRegistrationService.updateHistory(jsonObject, bizId, useRegistration.getSequenceNbr() + "", null );
}
}
// 压力管道的使用登记,在页面进行管道增减后,更新eq表
if(model.equals(IBizDataChangeHandleStrategy.ModelType.singleProject)){
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus, JgUseRegistration::getProjectContraptionId, JgUseRegistration::getOriginProjectContraptionIds).eq(JgUseRegistration::getApplyNo, applyNo));
// 仅限于流程中才更新,已完成状态编辑,不操作单据
if(!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
// {非必须,记录一次}首次记录json,用于作废时数据的恢复
this.bakEquipData(useRegistration.getSequenceNbr());
// {必须,公共}按照装置id+非纳管+无使用登记证,查询新增的管道
List<JgUseRegistrationEq> eqsNew = this.getNewPieLines(useRegistration);
// {非必须,合并的才有}按照原装置id
List<JgUseRegistrationEq> eqsRemained = this.getRemainedPieLines(useRegistration);
// eq表删除按照equip_transfer_id = useRegistration.id
this.deleteRelationEq(useRegistration.getSequenceNbr());
// 插入eq表
this.insertRelationEq(useRegistration.getSequenceNbr(), eqsNew.addAll(eqsRemained));
}
}
}
private void insertRelationEq(Long sequenceNbr, boolean b) {
}
private void deleteRelationEq(Long sequenceNbr) {
}
private List<JgUseRegistrationEq> getRemainedPieLines(JgUseRegistration useRegistration) {
return null;
}
private List<JgUseRegistrationEq> getNewPieLines(JgUseRegistration useRegistration) {
return null;
}
private void bakEquipData(Long sequenceNbr) {
}
}
......@@ -139,6 +139,7 @@ public class PieLineDataChangeServiceImpl {
if (inspectionDetectionInfo.getNextInspectDate() != null) {
inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)));
}
commonEquipDataProcessService.getJgUseRegistrationService().getInspectionDetectionInfoService().getBaseMapper().insert(inspectionDetectionInfo);
}
// 使用信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment