From e9d48b14eb8496737495a659a6f126d88ef7d353 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 06 八月 2024 14:14:57 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 70 +++++++----------------------------
1 files changed, 14 insertions(+), 56 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 2154a48..24cfe80 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
@@ -125,7 +125,6 @@
}
public List<Map<String, Object>> importProductExcel(MultipartFile mutFile, String progressId, Long shipId) {
- int count = 0;
Date beginDate = new Date();
List<Map<String, Object>> list = new ArrayList<>();//瀛樺偍鎵�鏈夌殑瀵煎叆鐘舵��
Map<String, Object> map;//瀛樺偍姣忎竴琛岀殑鐘舵��
@@ -145,16 +144,6 @@
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();
@@ -168,20 +157,18 @@
assert workbook != null; //鏂█濡傛灉[boolean琛ㄨ揪寮廬涓簍rue锛屽垯绋嬪簭缁х画鎵ц銆� 濡傛灉涓篺alse锛屽垯绋嬪簭鎶涘嚭AssertionError锛屽苟缁堟鎵ц銆�
int sheets = workbook.getNumberOfSheets();
- //List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
Long curXtId = null;
Long curFxtId = null;
- Long curSbId = null;
+ Long curSbId;
String curXtName = "";
String curFxtName = "";
-
Map<String, XhProductModel> modelMap = new HashMap<>();
- List<XhProductModel> prductList =baseDao.getProductPath(shipId);
+ List<XhProductModel> prductList = baseDao.getProductPath(shipId);
- for (XhProductModel product :prductList){
- if(StringUtils.isNotBlank(product.getNamePath())){
- modelMap.put(product.getNamePath(),product);
+ for (XhProductModel product : prductList) {
+ if (StringUtils.isNotBlank(product.getNamePath())) {
+ modelMap.put(product.getNamePath(), product);
}
}
@@ -198,34 +185,11 @@
insertSb = false;
CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
- /* boolean isToggleXt = false;
- boolean isToggleFxt = false;*/
+
row1 = j + 1;
String pattern = "yyyy-MM-dd";
Row row = sheet.getRow(row1);
String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
-/* if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
- if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
- isToggleXt = true;
- xtId = UUIDUtil.generateId();
- }
- xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
- }
-
- if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern)) && !isToggleXt) {
- fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
- fxtId = UUIDUtil.generateId();
- isToggleFxt = true;
- } else if (isToggleXt) {
- if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern))) {
- fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
- fxtId = UUIDUtil.generateId();
- isToggleFxt = true;
- } else {
- fxt = null;
- isToggleFxt = true;
- }
- }*/
String xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
String fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern);
@@ -280,19 +244,21 @@
}
}
+ Long paramId = null;
String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
if (modelMap.get(sbPath) == null) {
curSbId = UUIDUtil.generateId();
insertSb = true;
} else {
curSbId = modelMap.get(sbPath).getId();
+ paramId = modelMap.get(sbPath).getParamId();
}
-
if (StringUtils.isEmpty(sb)) {
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
continue;
}
+
//瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
XhProductModel xhProductModel = new XhProductModel();
@@ -315,7 +281,6 @@
ParamData itemEntity = new ParamData();
itemEntity.setShipId(shipId);
itemEntity.setProductId(curXtId);
- itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
}
@@ -335,7 +300,6 @@
ParamData itemEntity = new ParamData();
itemEntity.setShipId(shipId);
itemEntity.setProductId(curFxtId);
- itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
}
@@ -352,13 +316,11 @@
this.insert(xhProductModel);
}
-
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
//缁戝畾璁惧ID
itemEntity.setShipId(shipId);
itemEntity.setProductId(curSbId);
- itemEntity.setPageCode("expect");
itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
if (StringUtils.isNotBlank(basicMtbfRegulate)) {
@@ -400,10 +362,12 @@
if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
}
- if (modelMap.get(sbPath) == null)
+ if (modelMap.get(sbPath) == null) {
paramDataService.insert(itemEntity);
- else
+ } else {
+ itemEntity.setId(paramId);
paramDataService.update(itemEntity);
+ }
}
}
@@ -412,13 +376,7 @@
ImportUtil.updateErrMap(errMap, "瀵煎叆寮傚父" + e.getMessage(), "", row1);
//err++;
}
- /* if (batchList.size() > 0 && err == 0) {
- super.insertBatch(batchList, 100);
- baseDao.updateOldId();
- }
- if (batchUpdateList.size() > 0) {
- super.updateBatch(batchUpdateList, 100);
- }*/
+
Date nowDate = new Date();
String msg = "浜у搧妯″瀷瀵煎叆鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, beginDate) + "\r\n";
System.out.println(msg);
--
Gitblit v1.9.1