From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 e09fb31..c1f69a7 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,9 +1,8 @@
package com.mes.edgstoragecage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.edgglasstask.entity.request.IdentWornRequest;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.pp.entity.OptimizeDetail;
import java.util.List;
import java.util.Map;
@@ -18,13 +17,7 @@
*/
public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
- /**
- * 璇嗗埆 鐮存崯/鎷胯蛋
- * @param glassId
- * @param ControlsId
- * @return
- */
- boolean identWorn(String glassId,int ControlsId);
+// boolean identWorn(Map<String, Object> arguments);
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@@ -37,7 +30,38 @@
* @param current
* @return
*/
- List<Map<String, Object>> selectCurrentCutTerritory(String current);
+ List<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);
+
+ /**
+ * 璇嗗埆 鎷胯蛋:9/鐮存崯:8
+ *
+ * @param request
+ * @return
+ */
+ String identControls(IdentWornRequest request);
+
+ /**
+ * 纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆�
+ *
+ * @param request
+ * @return
+ */
+ String edgReportStatus(IdentWornRequest request);
}
--
Gitblit v1.8.0