reafact(jg): 压力管道管道长度

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -1149,7 +1149,7 @@ public class CommonEquipDataProcessService {
                 .eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId)
                 .eq(IdxBizJgUseInfo::getIsIntoManagement, false)
                 .select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
-        useInfos.parallelStream().forEach(e -> {
+        useInfos.forEach(e -> {
             this.setNewPipelineUseState(e, useRegistrationCode);
             this.updateUseOrgCode2NewPipeline(e, useRegistrationCode);
         });

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
+import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandler;
@@ -260,6 +261,8 @@ public class PieLineDataChangeServiceImpl {
             pipelineInfo.setSequenceNbr(null);
         }
         idxBizJgTechParamsPipelineService.save(pipelineInfo);
+        // todo 上方代码通过填充器，自动会填充pipeLength，如下设置是为了返回业务使用
+        newPieLine.setPipeLength(pipelineInfo.getPipeLength());
         registerInfo.setProductName(pipelineInfo.getPipeName());
         commonEquipDataProcessService.getJgRegisterInfoService().save(registerInfo);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.esUpdate.service.EsUpdateService;
@@ -90,6 +91,8 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
             } else {                 // 更新管道逻辑
                 if (isRequireTemporarySave) {// 记录变化流水
                     PipelineChangeItemDto pipelineOld = oldRecordPipelineMap.get(record);
+                    // json时手工计算求和管道长度
+                    pipelineNew.setPipeLength(PipLenCalUtils.cal(pipelineNew.getPipeLengthText()));
                     // 安装信息变更日志
                     this.buildConstructionInfoChangeLog(record, pipelineNew, pipelineOld, projectContraptionChangeDataDto, allChangeColumns);
                     // 检验信息变更日志
@@ -111,6 +114,8 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
                     pieLineDataChangeService.saveDesignForPieLine(record, allChangeColumns, pipelineNew);
                     // 技术参数入库保存
                     TechParamsPipelineChangeFieldDto paramsPipelineChangeFieldDto = new TechParamsPipelineChangeFieldDto();
+                    // 手工计算求和管道长度业务使用
+                    pipelineNew.setPipeLength(PipLenCalUtils.cal(pipelineNew.getPipeLengthText()));
                     BeanUtil.copyProperties(pipelineNew, paramsPipelineChangeFieldDto, true);
                     commonEquipDataProcessService.savePieLineTechParam(record, allChangeColumns, paramsPipelineChangeFieldDto);
                 }