From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 c449935..b3c786f 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
@@ -1,12 +1,20 @@
package com.ycl.platform.service;
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.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;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Date;
import java.util.List;
/**
@@ -90,15 +98,55 @@
/**
* 鎵归噺鍚屾鐘舵��
*
- * @param pointIds 鐐逛綅id
+ * @param serialNumberList 璁惧缂栧彿
* @param recovery 鐘舵��
* @return 鏁伴噺
*/
- boolean updateRecovery(List<Integer> pointIds, int recovery);
+ boolean updateRecovery(List<String> serialNumberList, int recovery);
/**
* 棣栭〉鍒版湡棰勮
* @return 鏁版嵁
*/
List<YwPoint> home();
+
+ /**
+ * 瀵煎嚭鏁版嵁
+ *
+ * @param query
+ * @param response
+ */
+ void export(YwPointQuery query, HttpServletResponse response) throws IOException;
+
+ /**
+ * 瀵煎叆鏁版嵁
+ *
+ * @param file
+ * @param unitId 杩愮淮鍗曚綅id
+ * @return
+ */
+ Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException;
+
+ /**
+ * 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級
+ * @param reportType
+ * @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);
}
--
Gitblit v1.8.0