From 083ac7646ef2ab4a2614678b158a3dce1482e75c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 十二月 2024 02:32:13 +0800 Subject: [PATCH] 省厅标签拆分 --- ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 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 8a9ca65..53239d6 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,6 +3,7 @@ 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; @@ -16,6 +17,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.concurrent.ExecutionException; /** * 杩愮淮鐐逛綅 鏈嶅姟绫� @@ -125,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; /** * 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級 @@ -135,10 +137,31 @@ ReportAuditingRecordVO getReportResult(String serialNumber, String reportType); /** - * 鏍规嵁鍥芥爣鑾峰彇tag + * 鏍规嵁鍥芥爣璁剧疆tag * * @param dataList 鏁版嵁 * @return */ - <T extends BaseResult> void setDeviceTagByGB(List<T> dataList); + <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