From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 16:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 5dc7252..5b217ed 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -1,7 +1,9 @@
package com.mes.edgstoragecage.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.pp.entity.OptimizeDetail;
import java.util.List;
import java.util.Map;
@@ -14,19 +16,28 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
+public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
/**
* 璇嗗埆 鐮存崯/鎷胯蛋
- * @param glassid
+ * @param glassId
* @param ControlsId
* @return
*/
- boolean identWorn(String glassid,int ControlsId);
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
- List<Map> selectCutTerritory();
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
- List<Map> selectCurrentCutTerritory(String current);
+ boolean identWorn(String glassId,int ControlsId);
+
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * @return
+ */
+ List<OptimizeDetail> selectCutTerritory();
+
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * @param current
+ * @return
+ */
+ List<OptimizeDetail> selectCurrentCutTerritory(String current);
}
--
Gitblit v1.8.0