From 3486499f56e487cd6df88a8fa2448ff72d72a1e0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 02:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 83 +++++++++++++++--------------------------
1 files changed, 30 insertions(+), 53 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 0d8ccb3..019a3c1 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
@@ -6,16 +6,13 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dataListener.CurrencyDataListener;
-import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
-import com.ycl.platform.domain.entity.YwUnit;
+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;
import com.ycl.platform.domain.vo.YwPointVO;
-import com.ycl.platform.domain.excel.PointExport;
-import com.ycl.platform.domain.excel.PointSelectHandler;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.YwPointService;
@@ -29,12 +26,10 @@
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;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -218,12 +213,15 @@
List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
.eq(YwPoint::getUnitId, unitId)
.like(YwPoint::getPointName, keyword)
+ .or()
+ .eq(YwPoint::getUnitId, unitId)
+ .like(YwPoint::getSerialNumber, 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);
}
@@ -253,10 +251,10 @@
}
@Override
- public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException {
Consumer<List<PointExport>> consumer = (dataList) -> {
try {
- this.updatePoint(dataList, unitId, startTime, endTime);
+ this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
} catch (ExecutionException e) {
e.printStackTrace();
} catch (InterruptedException e) {
@@ -274,7 +272,7 @@
* @param unitId
*/
@Transactional(rollbackFor = Exception.class)
- public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) throws ExecutionException, InterruptedException {
+ public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -282,63 +280,42 @@
YwPoint point = new YwPoint();
point.setImportantCommandImageTag("鏄�".equals(item.getImportantCommandImageTagString()));
point.setProvinceTag("鏄�".equals(item.getProvinceTagString()));
- if (Objects.nonNull(unitId)) {
- point.setUnitId(Long.valueOf(unitId));
+ point.setDeptTag("鏄�".equals(item.getDeptTag()));
+ if (needUpdateUnit) {
+ if (Objects.nonNull(unitId)) {
+ point.setUnitId(Long.valueOf(unitId));
+ }
+ point.setStartTime(startTime);
+ point.setEndTime(endTime);
+ } else {
+ point.setUnitId(null);
+ point.setStartTime(null);
+ point.setEndTime(null);
}
- 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) {
+ if (dataList.size() < start + 800) {
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);
+ this.baseMapper.updatePoint(list);
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;
+ List<YwPoint> list = dataList.subList(start, start + 800);
+ this.baseMapper.updatePoint(list);
+ start += 800;
}
}
- 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("鎵ц鎴愬姛");
- }
+ log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
}
}
--
Gitblit v1.8.0