From 1e17cb5f4890dabbb23966a4a48ea921411fe811 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 16:38:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 354b073..0d8ccb3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -23,11 +23,13 @@
import com.ycl.system.Result;
import com.ycl.system.mapper.SysDeptMapper;
import com.ycl.system.page.PageUtil;
+import com.ycl.thread.PointImportCallable;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@@ -36,9 +38,8 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -56,6 +57,14 @@
private final YwUnitService unitService;
private final YwPeopleMapper ywPeopleMapper;
+ private static final ExecutorService executorService = new ThreadPoolExecutor(8,
+ 24,
+ 5000,
+ TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(10),
+ new ThreadPoolExecutor.CallerRunsPolicy()
+ );
+
/**
* 娣诲姞
* @param form
@@ -64,6 +73,9 @@
@Override
public Result add(YwPointForm form) {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -77,6 +89,9 @@
.forEach(form -> {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
entity.setStatus("鏈紑濮�");
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
baseMapper.insert(entity);
});
return Result.ok("娣诲姞鎴愬姛");
@@ -89,6 +104,7 @@
new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getId, form.getIds())
.set(YwPoint::getUnitId, form.getUnitId())
+ .set(YwPoint::getUpdateTime, new Date())
.update();
} else {
new LambdaUpdateChainWrapper<>(baseMapper)
@@ -96,6 +112,7 @@
.set(YwPoint::getUnitId, form.getUnitId())
.set(YwPoint::getStartTime, null)
.set(YwPoint::getEndTime, null)
+ .set(YwPoint::getUpdateTime, new Date())
.update();
}
return Result.ok("淇敼鎴愬姛");
@@ -111,6 +128,8 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -214,6 +233,7 @@
return new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getSerialNumber, serialNumberList)
.set(YwPoint::getRecovery, recovery)
+ .set(YwPoint::getUpdateTime, new Date())
.set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
.update();
}
@@ -227,7 +247,6 @@
public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
// 瀵煎嚭鏁版嵁
List<PointExport> exportData = baseMapper.export(query);
-
EasyExcel.write(response.getOutputStream(), PointExport.class)
.sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅")
.doWrite(exportData);
@@ -236,7 +255,13 @@
@Override
public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
Consumer<List<PointExport>> consumer = (dataList) -> {
- this.updatePoint(dataList, unitId, startTime, endTime);
+ try {
+ this.updatePoint(dataList, unitId, startTime, endTime);
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
};
EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
return Result.ok();
@@ -248,17 +273,72 @@
* @param dataList
* @param unitId
*/
- private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) {
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) throws ExecutionException, InterruptedException {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
- List<String> pointList = dataList.stream().map(PointExport::getSerialNumber).collect(Collectors.toList());
- new LambdaUpdateChainWrapper<>(baseMapper)
- .in(YwPoint::getSerialNumber, pointList)
- .set(YwPoint::getUnitId, unitId)
- .set(YwPoint::getStartTime, startTime)
- .set(YwPoint::getEndTime, endTime)
- .update();
+ List<YwPoint> pointList = dataList.stream().map(item -> {
+ YwPoint point = new YwPoint();
+ point.setImportantCommandImageTag("鏄�".equals(item.getImportantCommandImageTagString()));
+ point.setProvinceTag("鏄�".equals(item.getProvinceTagString()));
+ if (Objects.nonNull(unitId)) {
+ point.setUnitId(Long.valueOf(unitId));
+ }
+ point.setStartTime(startTime);
+ point.setEndTime(endTime);
+ point.setPointName(item.getPointName());
+ point.setSerialNumber(item.getSerialNumber());
+ return point;
+ }).collect(Collectors.toList());
+ this.waitAllFinishAndGetResult(pointList);
+// for (PointExport pointExport : dataList) {
+// YwPoint point = new YwPoint();
+// point.setImportantCommandImageTag("鏄�".equals(pointExport.getImportantCommandImageTagString()));
+// point.setProvinceTag("鏄�".equals(pointExport.getProvinceTagString()));
+// point.setUnitId(Long.valueOf(unitId));
+// point.setStartTime(startTime);
+// point.setEndTime(endTime);
+// point.setPointName(pointExport.getPointName());
+// point.setSerialNumber(pointExport.getSerialNumber());
+// this.baseMapper.updatePoint(point);
+// }
+ }
+
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws InterruptedException, ExecutionException {
+ List<FutureTask<Boolean>> resultList = new ArrayList<>(512);
+ List<Boolean> data = new ArrayList<>(512);
+ int start = 0;
+ Date startTime = new Date();
+ while (true) {
+ if (dataList.size() < start + 50) {
+ List<YwPoint> list = dataList.subList(start, dataList.size() - 1);
+ Callable<Boolean> callable = new PointImportCallable(list, this.baseMapper);
+ FutureTask<Boolean> futureTask = new FutureTask(callable);
+ Thread thread = new Thread(futureTask);
+ thread.start();
+ // 涓嶈兘鐩存帴璋冪敤Future鐨刧et鏂规硶锛屽惁鍒欏氨鍙樻垚涓茶鎵ц浜嗭紝澶卞幓澶氱嚎绋嬫剰涔�
+ resultList.add(futureTask);
+ break;
+ } else {
+ List<YwPoint> list = dataList.subList(start, start + 50);
+ Callable<Boolean> callable = new PointImportCallable(list, this.baseMapper);
+ FutureTask<Boolean> futureTask = new FutureTask(callable);
+ Thread thread = new Thread(futureTask);
+ thread.start();
+ // 涓嶈兘鐩存帴璋冪敤Future鐨刧et鏂规硶锛屽惁鍒欏氨鍙樻垚涓茶鎵ц浜嗭紝澶卞幓澶氱嚎绋嬫剰涔�
+ resultList.add(futureTask);
+ start += 50;
+ }
+ }
+ for (FutureTask<Boolean> futureTask : resultList) {
+ data.add(futureTask.get());
+ }
+ Date endTime = new Date();
+ log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()) / 1000);
+ if (data.stream().allMatch(item -> item == Boolean.TRUE)) {
+ System.out.println("鎵ц鎴愬姛");
+ }
}
}
--
Gitblit v1.8.0