Skip to content

A
amos-boot-biz
Commit ac5b9350 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):八大类历史设备导入-压力管道及其他类设备调整

parent 490772ac
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 20 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoExcelDto.java
View file @ ac5b9350
...@@ -853,20 +853,20 @@ public class EquipInfoExcelDto extends BaseDto { ...@@ -853,20 +853,20 @@ public class EquipInfoExcelDto extends BaseDto {
@ApiModelProperty(value = "管道长度（m）") @ApiModelProperty(value = "管道长度（m）")
private String pipeLength; private String pipeLength;
@ExcelProperty(value = "压力（MPa）") @ExcelProperty(value = "设计-压力（MPa）")
@ApiModelProperty(value = "压力（MPa）") @ApiModelProperty(value = "设计-压力（MPa）")
private String pressure; private String pressure;
@ExcelProperty(value = "介质") @ExcelProperty(value = "设计-介质")
@ApiModelProperty(value = "介质") @ApiModelProperty(value = "设计-介质")
private String medium_YLGD; private String medium_YLGD;
@ExcelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）") @ExcelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
@ApiModelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）") @ApiModelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
private String startePosition; private String startePosition;
@ExcelProperty(value = "温度(℃)") @ExcelProperty(value = "设计-温度（℃）")
@ApiModelProperty(value = "温度(℃)") @ApiModelProperty(value = "设计-温度（℃）")
private String temperature_YLGD; private String temperature_YLGD;
@ExcelProperty(value = "管道编号") @ExcelProperty(value = "管道编号")
...@@ -877,6 +877,18 @@ public class EquipInfoExcelDto extends BaseDto { ...@@ -877,6 +877,18 @@ public class EquipInfoExcelDto extends BaseDto {
@ApiModelProperty(value = "管道级别") @ApiModelProperty(value = "管道级别")
private String deviceLevel_YLGD; private String deviceLevel_YLGD;
@ExcelProperty(value = "工作条件-压力(MPa)")
@ApiModelProperty(value = "工作条件-压力(MPa)")
private String workPressure;
@ExcelProperty(value = "工作条件-温度(℃)")
@ApiModelProperty(value = "工作条件-温度(℃)")
private String workTemperature_YLGD;
@ExcelProperty(value = "工作条件-介质")
@ApiModelProperty(value = "工作条件-介质")
private String workMedium;
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remarks; private String remarks;
......
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/DataDockServiceImpl.java
View file @ ac5b9350
...@@ -8,6 +8,7 @@ import com.alibaba.excel.read.metadata.ReadSheet; ...@@ -8,6 +8,7 @@ import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.excel.read.metadata.holder.ReadRowHolder; import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil; 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.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto; import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
...@@ -192,6 +193,7 @@ public class DataDockServiceImpl { ...@@ -192,6 +193,7 @@ public class DataDockServiceImpl {
IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgDesignInfo.class); IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgDesignInfo.class);
if (!ValidationUtil.isEmpty(designInfo)) { if (!ValidationUtil.isEmpty(designInfo)) {
designInfo.setRecord(record); designInfo.setRecord(record);
designInfo.setDesignIsComplete("1");
designInfo.setRecDate(new Date()); designInfo.setRecDate(new Date());
idxBizJgDesignInfoService.save(designInfo); idxBizJgDesignInfoService.save(designInfo);
} }
...@@ -366,6 +368,7 @@ public class DataDockServiceImpl { ...@@ -366,6 +368,7 @@ public class DataDockServiceImpl {
equipTechParamPipeline.setMedium(String.valueOf(equ.get("medium_YLGD"))); equipTechParamPipeline.setMedium(String.valueOf(equ.get("medium_YLGD")));
equipTechParamPipeline.setTemperature(String.valueOf(equ.get("temperature_YLGD"))); equipTechParamPipeline.setTemperature(String.valueOf(equ.get("temperature_YLGD")));
equipTechParamPipeline.setDeviceLevel(String.valueOf(equ.get("deviceLevel_YLGD"))); equipTechParamPipeline.setDeviceLevel(String.valueOf(equ.get("deviceLevel_YLGD")));
equipTechParamPipeline.setWorkTemperature(String.valueOf(equ.get("workTemperature_YLGD")));
equipTechParamPipeline.setRecord(record); equipTechParamPipeline.setRecord(record);
equipTechParamPipeline.setRecDate(new Date()); equipTechParamPipeline.setRecDate(new Date());
iIdxBizJgTechParamsPipelineService.saveOrUpdateData(equipTechParamPipeline); iIdxBizJgTechParamsPipelineService.saveOrUpdateData(equipTechParamPipeline);
...@@ -659,8 +662,13 @@ public class DataDockServiceImpl { ...@@ -659,8 +662,13 @@ public class DataDockServiceImpl {
checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError); checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError);
checkNotBlank(data.getProjectContraption(), "工程（装置）名称不能为空；", rowError); checkNotBlank(data.getProjectContraption(), "工程（装置）名称不能为空；", rowError);
checkNotBlank(data.getProjectContraptionNo(), "工程（装置）编号不能为空；", rowError); checkNotBlank(data.getProjectContraptionNo(), "工程（装置）编号不能为空；", rowError);
// todo // 使用登记证编号校验
if (commonService.useRegistrationCertificateAccountUnique(data.getUseOrgCode(), null)) { List<IdxBizJgRegisterInfo> idxBizJgRegisterInfos = idxBizJgRegisterInfoServiceImpl.getBaseMapper().selectList(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getUseOrgCode, data.getUseOrgCode()).notLike(IdxBizJgRegisterInfo::getUseOrgCode, "管"));
if (!idxBizJgRegisterInfos.isEmpty()) {
rowError.append("使用登记证编号已存在系统中；");
}
List<IdxBizJgProjectContraption> projectContraptions = idxBizJgProjectContraptionService.lambdaQuery().eq(IdxBizJgProjectContraption::getEquList, EquipmentClassifityEnum.YLGD.getCode()).eq(IdxBizJgProjectContraption::getUseRegistrationCode, data.getUseOrgCode()).eq(IdxBizJgProjectContraption::getProjectContraption, data.getProjectContraption()).eq(IdxBizJgProjectContraption::getProjectContraptionNo, data.getProjectContraptionNo()).list();
if (!projectContraptions.isEmpty()) {
rowError.append("使用登记证编号已存在系统中；"); rowError.append("使用登记证编号已存在系统中；");
} }
// 同一工程装置下管道编号不能重复 // 同一工程装置下管道编号不能重复
...@@ -781,20 +789,24 @@ public class DataDockServiceImpl { ...@@ -781,20 +789,24 @@ public class DataDockServiceImpl {
checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError); checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError)); Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError); checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError); if (!isYLGD) {
Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError)); checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError);
checkNotBlank(data.getDesignUseDate(), "设计日期不能为空；", rowError); Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", rowError)); checkNotBlank(data.getDesignUseDate(), "设计日期不能为空；", rowError);
Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError)); Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", rowError));
Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
}
} }
// 制造信息 // 制造信息
checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError); if (!isYLGD) {
Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确；", rowError)); checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError);
checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", rowError); Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确；", rowError));
checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", rowError); checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", rowError);
checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", rowError); checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", rowError);
checkNotBlank(data.getProduceDate(), "制造日期不能为空；", rowError); checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", rowError);
Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", rowError)); checkNotBlank(data.getProduceDate(), "制造日期不能为空；", rowError);
Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", rowError));
}
} }
/** /**
......
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