From c63a72a68bc6739f3617a00bc15a187b59f06bae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 15:53:21 +0800
Subject: [PATCH] 1、解决引入milo-spring-boot-starter依赖系统无法启动异常 2、opc服务可配置开关服务，避免无opc环境下系统启动报错 3、删除无用的opc代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 577e794..3c25501 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,7 @@
package com.mes.edgstoragecage.service;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.edgglasstask.entity.request.IdentWornRequest;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import java.util.List;
@@ -16,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);
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@@ -35,21 +30,52 @@
* @param current
* @return
*/
- List<Map<String, Object>> selectCurrentCutTerritory(String current);
+ List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ * @param current
+ * @return
+ */
+ List<List<Map<String, Object>>> selectTemperingTerritory(String current);
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
* @param glassId
- * @param poor
+ * @param threshold
* @return
*/
- EdgStorageCageDetails selectConformGlass(String glassId, int poor);
+ EdgStorageCageDetails selectConformGlass(String glassId, int threshold);
/**
* 鑾峰彇鍑虹墖淇℃伅鏁版嵁
+ *
* @param glassId
- * @param poor
+ * @param threshold
* @return
*/
- EdgStorageCageDetails selectOutGlass(String glassId, int poor);
+ 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);
}
--
Gitblit v1.8.0