From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 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..2dfceff 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,16 +1,16 @@
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 com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import java.util.List;
import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -18,26 +18,75 @@
*/
public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
- /**
- * 璇嗗埆 鐮存崯/鎷胯蛋
- * @param glassId
- * @param ControlsId
- * @return
- */
- boolean identWorn(String glassId,int ControlsId);
+// boolean identWorn(Map<String, Object> arguments);
/**
- * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * 鎸夌収璁惧鍙婄嚎璺紝鑾峰彇褰撳墠绾胯矾姝ｅ湪鍒囧壊鐨勭増鍥句俊鎭�
+ * @param deviceId
+ * @param stationCell
* @return
*/
- List<Map<String, Object>> selectCutTerritory();
+ List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell);
+
+ Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence);
/**
- * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ *
* @param current
* @return
*/
- List<Map<String, Object>> selectCurrentCutTerritory(String current);
+ List<Map<String, Object>> selectTemperingTerritory(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);
+
+ /**
+ * 杩涚墖 鎵爜ID楠岃瘉閲嶅
+ *
+ * @param glassId
+ * @return
+ */
+ boolean inToVerify(String glassId);
+
+ /**
+ * 鎸夌収灏哄
+ *
+ * @param deviceId
+ * @param width
+ * @param height
+ * @return
+ */
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height);
}
--
Gitblit v1.8.0