From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 18:10:01 +0800
Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错)
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index c5e49a3..0f2c8b5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -1,6 +1,6 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.lang.Console;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.ProductDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -20,6 +21,7 @@
import com.yuanchu.mom.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@@ -67,6 +69,19 @@
String[] split = insSample.getFactory().split(" - ");
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ if (list.size() == 0) {
+ String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ }
+ }
+ String[] split1 = insSample.getFactory().split(" - ");
+ //鍒ゆ柇闀垮害
+ if (split1.length > 4) {
+ if (ObjectUtils.isNotEmpty(split1[3])) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList());
+ }else if (split1[3].equals("")) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),split1[2])).collect(Collectors.toList());
+ }
}
list = list.stream().filter(a -> {
try {
@@ -112,6 +127,7 @@
String model2 = "";
while (matcher.find()) {
model2 += matcher.group();
+ break;
}
if (str.contains("鈮�") || str.contains(">=")) {
String param = str.replace("鈮�", "").replace(">=", "");
@@ -133,8 +149,14 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
String[] trees = tree.split(" - ");
+ try {
+ String tree1 = trees[2];
+ } catch (Exception e) {
+ throw new ErrorException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
+ }
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
List<StandardTree> treeList = new ArrayList<>();
@@ -166,7 +188,8 @@
list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
}
- } else if (trees.length == 4) {
+ }
+ else if (trees.length == 4) {
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
if (treeList.size() == 0) {
StandardTree standardTree = new StandardTree();
@@ -181,7 +204,8 @@
list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
}
- } else {
+ }
+ else {
list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
}
@@ -231,13 +255,48 @@
}
if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- } else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
+// CompletableFuture.supplyAsync(() -> {
+ System.out.println("寮�濮嬪紑濮嬪紑濮嬪紑濮�!!!!!!!!!!");
+ if (trees.length == 5) {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
+ } else {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree));
+ }
+
+ boolean success = false;
+ int retryCount = 0;
+ while (!success && retryCount < 100) {
+ try {
+ standardProductListService2.saveOrUpdateBatch(list.stream().map(a -> {
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList()));
+ success = true;
+ } catch (Exception e) {
+ retryCount++;
+ System.out.println("閲嶅" + retryCount + "娆�");
+ // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
+ for (StandardProductList productList : list) {
+ productList.setId(IdWorker.getId());
+ }
}
- standardProductListService2.saveBatch(list.stream().map(a -> {
+ }
+ if (!success) {
+ throw new RuntimeException("鎻掑叆澶辫触");
+ } else {
+ System.out.println("缁撴潫缁撴潫缁撴潫缁撴潫@@@@@@@@@@@@");
+ }
+
+ /* standardProductListService2.saveBatch(list.stream().map(a -> {
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -245,13 +304,13 @@
a.setUpdateUser(userId);
a.setStandardMethodListId(id);
return a;
- }).collect(Collectors.toList()));
- return null;
- }).thenAccept(res -> {
- }).exceptionally(e -> {
- e.printStackTrace();
- return null;
- });
+ }).collect(Collectors.toList()));*/
+// return null;
+// }).thenAccept(res -> {
+// }).exceptionally(e -> {
+// e.printStackTrace();
+// return null;
+// });
}
Map<String, Object> map = new HashMap<>();
Collections.sort(list, (o1, o2) -> {
--
Gitblit v1.9.3