From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 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 fec069e..f0185dc 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,11 +1,23 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.YwPoint;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.system.Result;
+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;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.ExecutionException;
/**
* 杩愮淮鐐逛綅 鏈嶅姟绫�
@@ -69,4 +81,88 @@
* @return
*/
Result batchAdd(List<YwPointForm> form);
+
+ /**
+ * 鎵归噺淇敼杩愮淮鍗曚綅
+ * @param form
+ * @return
+ */
+ Result batchEdit(BatchEditPointForm form);
+
+ /**
+ * 鐐逛綅涓嬫媺
+ *
+ * @param keyword
+ * @return
+ */
+ Result select(String keyword);
+
+ /**
+ * 鎵归噺鍚屾鐘舵��
+ *
+ * @param serialNumberList 璁惧缂栧彿
+ * @param recovery 鐘舵��
+ * @return 鏁伴噺
+ */
+ 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, ExecutionException, InterruptedException;
+
+ /**
+ * 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級
+ * @param reportType
+ * @return
+ */
+ ReportAuditingRecordVO getReportResult(String serialNumber, String reportType);
+
+ /**
+ * 鏍规嵁鍥芥爣璁剧疆tag
+ *
+ * @param dataList 鏁版嵁
+ * @return
+ */
+ <T extends BaseResult> void setDeviceTagByGB(List<T> dataList,Short category);
+
+ /**
+ * 鏍规嵁鍥芥爣璁剧疆鏄惁鏂扮偣浣�
+ *
+ * @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);
+
+ /**
+ * 鏍规嵁璁惧缂栫爜鏌ヨ鐐逛綅淇℃伅
+ *
+ * @param serialNumber 搴忓垪鍙�
+ * @return {@link YwPoint }
+ * @author
+ */
+ YwPoint selectBySerialNumber(String serialNumber);
+
}
--
Gitblit v1.8.0