|
|
@@ -2,9 +2,7 @@ package com.hotent.project.manager.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.hotent.base.util.StringUtil;
|
|
|
@@ -33,9 +31,7 @@ import com.hotent.uc.manager.UserManager;
|
|
|
import com.hotent.uc.model.Org;
|
|
|
import com.hotent.uc.model.User;
|
|
|
import com.hotent.uc.util.ContextUtil;
|
|
|
-import com.hotent.util.CostDataUtil;
|
|
|
-import com.hotent.util.FileUtils;
|
|
|
-import com.hotent.util.HtmlUtils;
|
|
|
+import com.hotent.util.*;
|
|
|
import com.hotent.util.wordexcelutils.*;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.poi.xwpf.usermodel.XWPFDocument;
|
|
|
@@ -53,13 +49,8 @@ import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.YearMonth;
|
|
|
import java.util.*;
|
|
|
-import java.util.regex.Matcher;
|
|
|
-import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import com.hotent.util.FileUploadUtil;
|
|
|
-import springfox.documentation.spring.web.json.Json;
|
|
|
-
|
|
|
import static org.apache.tools.ant.util.DateUtils.ISO8601_DATE_PATTERN;
|
|
|
|
|
|
|
|
|
@@ -73,6 +64,8 @@ import static org.apache.tools.ant.util.DateUtils.ISO8601_DATE_PATTERN;
|
|
|
@Service
|
|
|
public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectDocumentDao, CostProjectDocument> implements CostProjectDocumentManager {
|
|
|
|
|
|
+
|
|
|
+
|
|
|
@Autowired
|
|
|
private CostProjectDocumentFileManager costProjectDocumentFileManager;
|
|
|
|
|
|
@@ -394,15 +387,38 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
|
|
|
|
|
|
arrayList.add(costProjectDocumentFile);
|
|
|
});
|
|
|
- asyncMethod(projectDocument.getId());
|
|
|
+ //asyncService.executeAsync(projectDocument.getId());
|
|
|
+ // 异步执行耗时任务
|
|
|
+ /*asyncExecutor.execute(() -> {
|
|
|
+ // 这里是你的业务逻辑
|
|
|
+ try {
|
|
|
+ System.out.println("开始处理数据...");
|
|
|
+ this.createDocument(projectDocument.getId());
|
|
|
+ Thread.sleep(5000); // 模拟耗时操作
|
|
|
+ System.out.println("数据处理完成");
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ Thread.currentThread().interrupt();
|
|
|
+ }
|
|
|
+ });*/
|
|
|
costProjectDocumentFileManager.saveBatch(arrayList);
|
|
|
}
|
|
|
|
|
|
//保存解析出的文件内容
|
|
|
costProjectDocumentFileManager.saveBatch(req.getCostProjectDocumentFiles());
|
|
|
-
|
|
|
- asyncMethod(costProjectDocument.getId());
|
|
|
-
|
|
|
+ //asyncService.executeAsync(costProjectDocument.getId());
|
|
|
+
|
|
|
+ // 异步执行耗时任务
|
|
|
+ /*asyncExecutor.execute(() -> {
|
|
|
+ // 这里是你的业务逻辑
|
|
|
+ try {
|
|
|
+ System.out.println("开始处理数据...");
|
|
|
+ this.createDocument(costProjectDocument.getId());
|
|
|
+ Thread.sleep(5000); // 模拟耗时操作
|
|
|
+ System.out.println("数据处理完成");
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ Thread.currentThread().interrupt();
|
|
|
+ }
|
|
|
+ });*/
|
|
|
return costProjectDocument.getId();
|
|
|
}
|
|
|
|