From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 238f2f6..f7fce50 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -16,6 +16,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
@@ -101,7 +103,7 @@
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- @PreAuthorize("@ss.hasPermi('point:list')")
+// @PreAuthorize("@ss.hasPermi('point:list')")
public Result list() {
return ywPointService.all();
}
@@ -123,7 +125,8 @@
public Result importData(MultipartFile file,
Integer unitId,
String startTime,
- String endTime) throws IOException, ParseException {
+ Boolean needUpdateUnit,
+ String endTime) throws IOException, ParseException, ExecutionException, InterruptedException {
Date start = null;
Date end = null;
if (-1 == unitId) {
@@ -137,7 +140,8 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
end = format.parse(endTime);
}
- return ywPointService.importData(file, unitId, start, end);
+ return ywPointService.importData(file, unitId, start, end, needUpdateUnit);
}
+
}
--
Gitblit v1.8.0