From c27b939fa5fa6ce4d712f7e9ced2ad811d69d5ec Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 30 十月 2024 20:46:25 +0800
Subject: [PATCH] 去掉dnc部分
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
index 8a74230..8151d68 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
@@ -4,9 +4,11 @@
import java.util.List;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
-import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.smis.dto.WorkstationWcsDmpDTO;
+import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
+import com.qianwen.smartman.modules.mdc.dto.ProcessParameterVO;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
import com.qianwen.smartman.modules.mdc.vo.AllShiftTimeDetail;
import com.qianwen.smartman.modules.mdc.vo.CollectParamResVO;
@@ -26,7 +28,12 @@
IPage<ProcessParameterRealVO> pageProcessParameter(Query query, ProcessParameterItemSearchVO vo);
- List<WorkstationWcsDmpDTO> processParam(String workstationId);
+ /**
+ * 鑾峰彇宸ヤ綅鐨勬墍鏈夐噰闆嗗弬鏁板垪琛�,璋冭瘯瀹屾垚鍚庨渶瑕佸垹闄�
+ * @param workstationId
+ * @return
+ */
+ //List<WorkstationWcsDmpDTO> processParam(String workstationId);
ProParamSheetVO queryProcessParameterSheet(ProcessParameterSearchVO vo, Boolean isFilterProcessParameter);
@@ -34,14 +41,35 @@
ShiftTimeVO getShiftTime(ProcessParameterSearchVO vo);
+ /**
+ * 鏌ヨ鍗曚釜杩囩▼鍙傛暟鐨勫浘琛ㄦ暟鎹�
+ * @param vo
+ * @return
+ */
CollectParamResVO<?> queryProcessParameterOneChart(CollectParamSearchVO vo);
List<AllShiftTimeDetail> getAllShiftTime(WorkstationShiftSearchVO vo);
/**
- * 鏌ヨ宸ヤ綅鏈�鏂扮殑鍙傛暟鍊�
+ * 鏌ヨ宸ヤ綅鏈�鏂扮殑鍙傛暟鍊硷紙鐢眂ollect淇濆瓨鐨勶級
* @param workstationId 宸ヤ綅id
* @return 鍙傛暟鍊煎垪琛紙n,v锛�
*/
- List<WorkstationCollectData> lastParameter(long workstationId);
+ //List<WorkstationCollectData> lastParameter(long workstationId);
+
+ /**
+ * 鏌ヨ宸ヤ綅鏈�鏂板弬鏁伴泦鍚堬紙iotdb浣跨敤mybatis鏌ヨ鏈夐棶棰橈紝鑷繁瀹炵幇锛�
+ * @param workstationId
+ * @return
+ */
+ List<WorkstationCollectData> queryLastParameter(long workstationId);
+
+ /**
+ * 鑾峰彇宸ヤ綅鐨勬墍鏈夋暟鎹偣鍙傛暟(鍏佽杩囩▼鍙傛暟灞曠ず鐨�)
+ * @param workstationId 宸ヤ綅id
+ * @return
+ */
+ List<DatapointDTO> processParams(String workstationId);
+
+
}
--
Gitblit v1.9.3