From ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 12:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 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..f9416d7 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,5 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.lang.Console;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +10,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;
@@ -67,6 +67,10 @@
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);
+ }
}
list = list.stream().filter(a -> {
try {
@@ -135,6 +139,11 @@
@Override
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<>();
@@ -231,13 +240,48 @@
}
if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
+// CompletableFuture.supplyAsync(() -> {
+ System.out.println("寮�濮嬪紑濮嬪紑濮嬪紑濮�!!!!!!!!!!");
if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ 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));
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree));
}
- standardProductListService2.saveBatch(list.stream().map(a -> {
+
+ boolean success = false;
+ int retryCount = 0;
+ while (!success && retryCount < 100) {
+ try {
+ standardProductListService2.saveBatch(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());
+ }
+ }
+ }
+ 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 +289,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