From c2f855eb59e9d19d4957bc4cb51e3ca63d4ce4c4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 16 七月 2024 14:51:24 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index af6fbf1..31d1a1e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -8,15 +8,12 @@
import com.zt.common.utils.TreeUtils;
import com.zt.common.utils.UUIDUtil;
import com.zt.core.shiro.ImportUtil;
-import com.zt.life.core.model.ZtProduct;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.sys.dto.DictTypeDto;
-import com.zt.modules.sys.model.SysDictData;
-import com.zt.modules.sys.model.SysDictType;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
@@ -28,11 +25,7 @@
import com.zt.common.db.query.QueryFilter;
import org.springframework.web.multipart.MultipartFile;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
/**
@@ -129,8 +122,19 @@
repairType.put("鎸囨暟鍒嗗竷", 1);
repairType.put("濞佸竷灏斿垎甯�", 2);
Map<String, Integer> isOrNot = new HashMap<>();
- isOrNot.put("鏄�", 0);
- isOrNot.put("鍚�", 1);
+ isOrNot.put("鏄�", 1);
+ isOrNot.put("鍚�", 0);
+
+ //鑾峰彇鏄惁鏈夋暟鎹紝濡傛灉鏈夊垯鍒犻櫎鏁版嵁
+ List<XhProductModel> productList = this.getByShipId(shipId);
+ List<ParamData> dataList = paramDataService.getByShipId(shipId);
+ if (productList.size() > 0) {
+ this.deleteByShipId(shipId);
+ }
+ if (dataList.size()>0){
+ paramDataService.deleteByShipId(shipId);
+ }
+
try {
// 鑾峰彇瀵煎叆鏂囦欢鐨勫悗缂�鍚�
String fileName = mutFile.getOriginalFilename();
@@ -150,8 +154,10 @@
Long xtId = null;
Long fxtId = null;
+
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity1 = new ParamData();
+ itemEntity1.setShipId(shipId);
itemEntity1.setProductId(shipId);
itemEntity1.setPageCode("expect");
paramDataService.insert(itemEntity1);
@@ -222,14 +228,6 @@
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙傚姞璁＄畻", sheetName, row1);
continue;
}
- if (StringUtils.isEmpty(basicMtbfRegulate)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbf", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(taskMtbcfRegulate)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbcf", sheetName, row1);
- continue;
- }
if (StringUtils.isEmpty(repairable)) {
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙淮淇�", sheetName, row1);
continue;
@@ -259,6 +257,7 @@
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
+ itemEntity.setShipId(shipId);
itemEntity.setProductId(xtId);
itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
@@ -277,6 +276,7 @@
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
+ itemEntity.setShipId(shipId);
itemEntity.setProductId(fxtId);
itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
@@ -299,21 +299,46 @@
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
//缁戝畾璁惧ID
+ itemEntity.setShipId(shipId);
itemEntity.setProductId(sbId);
itemEntity.setPageCode("expect");
itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
- itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
- itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
- itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
- itemEntity.setTaskMtbcfRegulate(taskMtbcfRegulate);
- itemEntity.setTaskMtbcfOtherParams(taskMtbcfOtherParams2 + "," + taskMtbcfOtherParams3);
- itemEntity.setTaskMtbcfRegulSuccRate(taskMtbcfRegulSuccRate);
- itemEntity.setTaskMtbcfOperatingRatio(taskMtbcfOperatingRatio);
+ if (StringUtils.isNotBlank(basicMtbfRegulate)){
+ itemEntity.setBasicMtbfRegulate(Double.valueOf(basicMtbfRegulate));
+ }
+ if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)){
+ itemEntity.setBasicMtbfRegulSuccRate(Double.valueOf(basicMtbfRegulSuccRate));
+ }
+ if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
+ itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
+ }
+ if (StringUtils.isNotBlank(taskMtbcfRegulate)){
+ itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
+ }
+ if (StringUtils.isNotBlank(taskMtbcfOtherParams2)){
+ itemEntity.setTaskMtbcfOtherParams2(Double.valueOf(taskMtbcfOtherParams2));
+ }
+ if (StringUtils.isNotBlank(taskMtbcfOtherParams3)){
+ itemEntity.setTaskMtbcfOtherParams3(Double.valueOf(taskMtbcfOtherParams3));
+ }
+ if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)){
+ itemEntity.setTaskMtbcfRegulSuccRate(Double.valueOf(taskMtbcfRegulSuccRate));
+ }
+ if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
+ itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
+ }
itemEntity.setRepairable(isOrNot.get(repairable));
itemEntity.setRepairDistribType(repairType.get(repairDistribType));
- itemEntity.setRepairMttcr(repairMttcr);
- itemEntity.setRepairMttcrOtherParams(repairMttcrOtherParams2 + "," + repairMttcrOtherParams3);
+ if (StringUtils.isNotBlank(repairMttcr)){
+ itemEntity.setRepairMttcr(Double.valueOf(repairMttcr));
+ }
+ if (StringUtils.isNotBlank(repairMttcrOtherParams2)){
+ itemEntity.setRepairMttcrOtherParams2(Double.valueOf(repairMttcrOtherParams2));
+ }
+ if (StringUtils.isNotBlank(repairMttcrOtherParams3)){
+ itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
+ }
paramDataService.insert(itemEntity);
}
}
@@ -342,4 +367,12 @@
list.add(errMap);
return list;
}
+
+ private void deleteByShipId(Long shipId) {
+ baseDao.deleteByShipId(shipId);
+ }
+
+ private List<XhProductModel> getByShipId(Long shipId) {
+ return baseDao.getByShipId(shipId);
+ }
}
--
Gitblit v1.9.1