From f3b2acf58a68420591e9e4fac48056fa9af9ccc0 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期六, 24 八月 2024 16:50:09 +0800
Subject: [PATCH] feat：工单批量审核同步点位状态
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 10 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 4cc8a0b..0cdb6d0 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
@@ -1,12 +1,14 @@
package com.ycl.platform.service.impl;
+import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.base.BaseSelect;
+import com.ycl.dataListener.CurrencyDataListener;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.domain.excel.PointExport;
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.platform.domain.form.YwPointForm;
import com.ycl.platform.domain.query.YwPointQuery;
@@ -18,18 +20,22 @@
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
@@ -46,6 +52,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
@@ -54,6 +68,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("娣诲姞鎴愬姛");
}
@@ -67,6 +84,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("娣诲姞鎴愬姛");
@@ -79,6 +99,7 @@
new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getId, form.getIds())
.set(YwPoint::getUnitId, form.getUnitId())
+ .set(YwPoint::getUpdateTime, new Date())
.update();
} else {
new LambdaUpdateChainWrapper<>(baseMapper)
@@ -86,6 +107,7 @@
.set(YwPoint::getUnitId, form.getUnitId())
.set(YwPoint::getStartTime, null)
.set(YwPoint::getEndTime, null)
+ .set(YwPoint::getUpdateTime, new Date())
.update();
}
return Result.ok("淇敼鎴愬姛");
@@ -101,6 +123,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("淇敼鎴愬姛");
}
@@ -190,11 +214,11 @@
.eq(YwPoint::getUnitId, unitId)
.like(YwPoint::getPointName, keyword)
.list();
- List<BaseSelect> data = list.stream().map(item -> {
- BaseSelect baseSelect = new BaseSelect();
- baseSelect.setId(item.getId());
- baseSelect.setValue(item.getPointName());
- return baseSelect;
+ List data = list.stream().map(item -> {
+ Map map = new HashMap<String, Object>();
+ map.put("id", item.getSerialNumber());
+ map.put("value", item.getPointName());
+ return map;
}).collect(Collectors.toList());
return Result.ok().data(data);
}
@@ -204,6 +228,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();
}
@@ -212,4 +237,76 @@
public List<YwPoint> home() {
return baseMapper.home();
}
+
+ @Override
+ public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
+ // 瀵煎嚭鏁版嵁
+ List<PointExport> exportData = baseMapper.export(query);
+ EasyExcel.write(response.getOutputStream(), PointExport.class)
+ .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅")
+ .doWrite(exportData);
+ }
+
+ @Override
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
+ Consumer<List<PointExport>> consumer = (dataList) -> {
+ 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();
+ }
+
+ /**
+ * 淇敼鐐逛綅鐨勮繍缁村崟浣�
+ *
+ * @param dataList
+ * @param unitId
+ */
+ @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<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);
+ }
+
+ 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 + 100) {
+ List<YwPoint> list = dataList.subList(start, dataList.size() - 1);
+ this.baseMapper.updatePoint(list);
+ break;
+ } else {
+ List<YwPoint> list = dataList.subList(start, start + 100);
+ this.baseMapper.updatePoint(list);
+ start += 100;
+ }
+ }
+ Date endTime = new Date();
+ log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
+ }
+
}
--
Gitblit v1.8.0