bug

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 import lombok.AllArgsConstructor;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -17,6 +16,7 @@ import org.jsoup.select.Elements;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.common.utils.ThreadPoolMonitor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -43,13 +43,9 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -782,7 +778,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     this.wbsParamServiceImpl.updateBatchById(updateList, 1000);
                 }
                 if (insertList.size() > 0) {
-                    //异步新增
+
                     List<List<WbsParam>> partition1 = Lists.partition(insertList, 1000);
                     CompletableFuture<Void> handle = CompletableFuture.allOf(partition1.stream().map(addList ->
                             CompletableFuture.runAsync(() -> {
@@ -1405,7 +1401,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     jdbcTemplate.execute(delSql);
                 }
 
-                //异步新增
                 List<List<TextdictInfo>> partition1 = Lists.partition(insertData, 1000);
                 CompletableFuture<Void> handle = CompletableFuture.allOf(partition1.stream().map(addList ->
                         CompletableFuture.runAsync(() -> {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -1,7 +1,6 @@
 package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
@@ -787,7 +786,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     }
 
                     if (pawDTO.getReferenceType().equals("public")) {
-                        //异步新增
+
                         List<List<WbsTreePrivate>> partition1 = Lists.partition(insertData1, 1000);
                         CompletableFuture<Void> handle = CompletableFuture.allOf(partition1.stream().map(addList ->
                                 CompletableFuture.runAsync(() -> {
@@ -804,15 +803,17 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                         }
 
                     } else if (pawDTO.getReferenceType().equals("private")) {
-                        //异步新增
+
                         List<List<WbsTreePrivate>> partition1 = Lists.partition(insertData2, 1000);
                         CompletableFuture<Void> handle = CompletableFuture.allOf(partition1.stream().map(addList ->
                                 CompletableFuture.runAsync(() -> {
                                     wbsTreePrivateService.insertBatch(addList, 1000);
                                 }, executor)).toArray(CompletableFuture[]::new));
                         handle.join();
-                        //异步修改htmlUrl ，数据都在inserData2里
+
+                        //异步修改htmlUrl ，数据都在insertData2里
                         wbsTreePrivateService.batchResetHtmlUrl(insertData2);
+
                         //修改状态
                         if (pawDTO.getWbsType() == 1) {
                             projectInfoMapper.updateTemplateInfoQuality(pawDTO.getProjectId(), pawDTO.getPrimaryKeyId(), "private");