From 8fa931b74e07ea783fa453367174f8b012e7bc52 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 十月 2024 19:18:56 +0800
Subject: [PATCH] 取图片、点位导入
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 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 3210871..c39f5cd 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
@@ -33,6 +33,8 @@
import com.ycl.thread.PointImportCallable;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.poi.EasyExcelImportUtils;
+import constant.PointHeaderConstant;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -250,12 +252,12 @@
}
//瀹氫箟琛ㄥご鍒楄〃
LinkedHashSet<String> headers = new LinkedHashSet<>();
- headers.add("鐐逛綅鍚嶇О(鍙慨鏀�)");
- headers.add("鍥芥爣鐮�(涓嶅彲淇敼)");
- headers.add("鐐逛綅IP(鍙慨鏀�)");
- headers.add("鏄惁鐪佸巺鏍囩(鍙慨鏀�)");
- headers.add("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)");
- headers.add("鏄惁閮ㄧ骇鏍囩(鍙慨鏀�)");
+ headers.add(PointHeaderConstant.Point_Name);
+ headers.add(PointHeaderConstant.Serial_Number);
+ headers.add(PointHeaderConstant.IP);
+ headers.add(PointHeaderConstant.Province_Tag);
+ headers.add(PointHeaderConstant.Impotrant_Command_Image);
+ headers.add(PointHeaderConstant.Dept_Tag);
List<String> headersList = new LinkedList<>();
if (!CollectionUtils.isEmpty(dynamicsHeaders)) {
//浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
@@ -306,6 +308,7 @@
@Override
public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean
needUpdateUnit) throws IOException {
+// List<Map<String,String>> list = EasyExcelImportUtils.makeData(file);
Consumer<List<PointExport>> consumer = (dataList) -> {
try {
this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
@@ -316,6 +319,14 @@
}
};
EasyExcel.read(file.getInputStream(), PointExport.class, new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
+// for (Map<String, String> map : list) {
+// PointExport pointExport = new PointExport();
+// pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
+// pointExport.setPointIP(map.get(PointHeaderConstant.IP));
+// pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
+// }
+// this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
+// System.out.println(list);
return Result.ok();
}
@@ -360,21 +371,9 @@
this.waitAllFinishAndGetResult(pointList);
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws
- InterruptedException, ExecutionException {
- int start = 0;
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
Date startTime = new Date();
- while (true) {
- if (dataList.size() < start + 800) {
- List<YwPoint> list = dataList.subList(start, dataList.size() - 1);
- this.baseMapper.updatePoint(list);
- break;
- } else {
- List<YwPoint> list = dataList.subList(start, start + 800);
- this.baseMapper.updatePoint(list);
- start += 800;
- }
- }
+ this.baseMapper.updatePoint(dataList);
Date endTime = new Date();
log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
}
--
Gitblit v1.8.0