From f39fd71eedfd828e715d33356a8c38ffbe66eb1a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 24 五月 2024 15:28:09 +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 |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 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 585741f..f9c0aa1 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,6 +1,6 @@
 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 java.util.List;
@@ -14,14 +14,42 @@
  * @author zhoush
  * @since 2024-04-07
  */
-public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
+public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
 
-    //璇嗗埆 鐮存崯/鎷胯蛋
-    public boolean identWorn(String glassid,int ControlsId);
-    //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
-    public List<Map> selectCutTerritory();
-    //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
-    public List<Map> selectCurrentCutTerritory(String current);
+    /**
+     * 璇嗗埆 鐮存崯/鎷胯蛋
+     * @param glassId
+     * @param ControlsId
+     * @return
+     */
+    boolean identWorn(String glassId,int ControlsId);
 
+    /**
+     * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+     * @return
+     */
+    List<Map<String, Object>> selectCutTerritory();
 
+    /**
+     * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+     * @param current
+     * @return
+     */
+    List<Map<String, Object>> selectCurrentCutTerritory(String current);
+
+    /**
+     * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨�  姝ゅ昂瀵哥幓鐠�  濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+     * @param glassId
+     * @param threshold
+     * @return
+     */
+    EdgStorageCageDetails selectConformGlass(String glassId, int threshold);
+
+    /**
+     * 鑾峰彇鍑虹墖淇℃伅鏁版嵁
+     * @param glassId
+     * @param threshold
+     * @return
+     */
+    EdgStorageCageDetails selectOutGlass(String glassId, int threshold);
 }

--
Gitblit v1.8.0