From 35d325f87d78d942d78a538dd36d5317f0876313 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 15 十月 2024 19:03:55 +0800
Subject: [PATCH] 异常恢复的统计数bug
---
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index 02d6b0c..803e4d6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.ReportAuditingRecord;
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;
+import com.ycl.platform.domain.result.BaseResult;
+import com.ycl.platform.domain.vo.CheckTagVO;
import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
import com.ycl.system.Result;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,6 +17,7 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.ExecutionException;
/**
* 杩愮淮鐐逛綅 鏈嶅姟绫�
@@ -123,7 +127,7 @@
* @param unitId 杩愮淮鍗曚綅id
* @return
*/
- Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException;
+ Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException, ExecutionException, InterruptedException;
/**
* 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級
@@ -131,4 +135,24 @@
* @return
*/
ReportAuditingRecordVO getReportResult(String serialNumber, String reportType);
+
+ /**
+ * 鏍规嵁鍥芥爣璁剧疆tag
+ *
+ * @param dataList 鏁版嵁
+ * @return
+ */
+ <T extends BaseResult> void setDeviceTagByGB(List<T> dataList);
+
+ /**
+ * 鏍规嵁鍥芥爣璁剧疆鏄惁鏂扮偣浣�
+ *
+ * @param dataList 鏁版嵁
+ * @return
+ */
+ <T extends BaseResult> void setNew(List<T> dataList);
+
+ void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException;
+
+ void updateDynamic(List<PointExport> dataList);
}
--
Gitblit v1.8.0