From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
index 01ef236..1be3479 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
@@ -1,24 +1,28 @@
package com.qianwen.smartman.modules.mdc.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+
import java.util.List;
import org.apache.ibatis.annotations.Param;
+
+import com.qianwen.smartman.common.constant.FmsConstant;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterVO;
import com.qianwen.smartman.modules.mdc.dto.TimeDTO;
import com.qianwen.smartman.modules.mdc.entity.LastProcessParam;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
-//@DS("tdengine")
@DS("iotdb")
+@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
public interface SuperProcessParameterMapper {
- @Deprecated
- List<WorkstationCollectData> queryLastParameter(@Param("workstationId") String workstationId);
+ //杩欎釜鍦≒rocessParameterService涓疄鐜颁簡锛宮ybatisplus瀵规鏈塨ug
+ //List<WorkstationCollectData> queryLastParameter(@Param("workstationId") String workstationId);
/**
- * 鏌ヨ宸ヤ綅鏈�鏂板弬鏁�
+ * 鏌ヨ宸ヤ綅鏈�鏂板弬鏁帮紝yys澧炲姞锛屽彲鑳介渶瑕佷娇鐢╭ueryLastParameter浜嗭紙濡傛灉娌￠棶棰橈級
* @param workstationId
* @return
*/
- LastProcessParam getLastParameters(@Param("workstationId") String workstationId);
+ //LastProcessParam getLastParameters(@Param("workstationId") String workstationId);
List<ProcessParameterVO> queryProcessParameter(@Param("workstationId") String workstationId, @Param("collectItems") List<String> collectItems, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
@@ -31,6 +35,14 @@
List<ProcessParameterVO> processParameterListByShift(@Param("times") List<TimeDTO> times, @Param("collectItems") List<String> collectItems, @Param("workstationId") String workstationId);
+ /**
+ *
+ * @param workstationId
+ * @param item
+ * @param startTime
+ * @param endTime
+ * @return
+ */
List<ProcessParameterVO> oldOneCollectList(@Param("workstationId") Long workstationId, @Param("item") String item, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
/**
@@ -41,7 +53,7 @@
* @return
*/
//ProcessParameterVO oldFirstStatue(@Param("workstationId") String workstationId, @Param("item") String item, @Param("startTime") Long startTime);
- LastProcessParam lastParameterLessThanTime(@Param("workstationId") Long workstationId, @Param("item") String item, @Param("startTime") Long startTime);
+ //LastProcessParam lastParameterLessThanTime(@Param("workstationId") Long workstationId, @Param("item") String item, @Param("startTime") Long startTime);
/**
*
@@ -51,9 +63,25 @@
* @return
*/
//ProcessParameterVO oldLastStatue(@Param("workstationId") String workstationId, @Param("item") String item, @Param("endTime") Long endTime);
- LastProcessParam lastParameterGreaterThanTime(@Param("workstationId") Long workstationId, @Param("item") String item, @Param("endTime") Long endTime);
+ //LastProcessParam lastParameterGreaterThanTime(@Param("workstationId") Long workstationId, @Param("item") String item, @Param("endTime") Long endTime);
+ /**
+ * 鑾峰彇涓�涓噰闆嗗弬鏁颁笉绛変簬鏌愬�肩殑鏈�鍚庝竴鏉�
+ * @param workstationId 宸ヤ綅id
+ * @param item 鍙傛暟鍚嶇О
+ * @param value 鍊�
+ * @return
+ */
+ ProcessParameterVO lastParameterNotEqValue(@Param("workstationId") Long workstationId,@Param("item")String item,@Param("value")String value);
-
+ ProcessParameterVO firstParameterEqValueGtTime(@Param("workstationId") Long workstationId,@Param("item")String item,@Param("value")String value,@Param("time")long time);
+ /**
+ * 鑾峰彇涓�涓噰闆嗗弬鏁扮瓑浜庢煇鍊肩殑鏈�鏃╀竴鏉�
+ * @param workstationId
+ * @param n
+ * @param value
+ * @return
+ */
+ ProcessParameterVO firstParameterEqValue(@Param("workstationId") Long workstationId,@Param("item")String item,@Param("value")String value);
}
--
Gitblit v1.9.3