From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配
---
collect/src/main/java/com/qianwen/mdc/collect/mapper/iotdb/DeviceStateMapper.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/mapper/iotdb/DeviceStateMapper.java b/collect/src/main/java/com/qianwen/mdc/collect/mapper/iotdb/DeviceStateMapper.java
index a2f7e8e..7f28a5c 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/mapper/iotdb/DeviceStateMapper.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/mapper/iotdb/DeviceStateMapper.java
@@ -13,7 +13,7 @@
@DS("iotdb")
@InterceptorIgnore(tenantLine = "true")
public interface DeviceStateMapper extends BaseMapper<DeviceState> {
- void createSuperTable();
+ //void createSuperTable();
//void createTable(Long workstationId);
@@ -51,5 +51,67 @@
*/
List<DeviceState> statesInTimeRange(@Param("workstationId")Long workstationId,@Param("timeRange") StateAggregateTimeDTO timeRange);
+ /**
+ * 鏌ヨ鏌愬ぉ鍥哄畾鐐规暟閲�
+ * @param factoryDate
+ * @return
+ */
+ Long fixPointCountByDate(int factoryDate);
+
+ /**
+ * 鏍规嵁宸ヤ綅id,鑾峰彇 灏忎簬鏃堕棿鎴� 鐨勯潪鍙嶉鐐规暟鎹�
+ * @param workstationId 宸ヤ綅id
+ * @param time 鏃堕棿鎴�
+ * @return
+ */
+ DeviceState lastNoFeedbackStateLessThanTime(@Param("workstationId")Long workstationId, @Param("time")Long time);
+ /**
+ * 鏍规嵁宸ヤ綅id,鑾峰彇 灏忎簬绛変簬鏃堕棿鎴� 鐨勯潪鍙嶉鐐规暟鎹�
+ * @param workstationId
+ * @param time
+ * @return
+ */
+ DeviceState lastNoFeedbackStateLeTime(@Param("workstationId")Long workstationId, @Param("time")Long time);
+ /**
+ * 鏍规嵁宸ヤ綅id鍜屾椂闂存埑绮剧‘鑾峰彇涓�鏉＄姸鎬佹暟鎹�
+ * @param workstationId
+ * @param time
+ * @return
+ */
+ DeviceState getByWorkstationIdAndTime(@Param("workstationId")Long workstationId, @Param("time")Long time);
+
+ /**
+ * 鏍规嵁宸ヤ綅id鍜屾椂闂存埑绮剧‘鑾峰彇涓�鏉＄姸鎬佹暟鎹�
+ * @param workstationId
+ * @param time
+ * @return
+ */
+ DeviceState getLastByWorkstationIdAndLeTimeAndShiftIndexNotNull(@Param("workstationId")Long workstationId, @Param("time")Long time);
+
+ /**
+ * 鏍规嵁鏃堕棿鍜屽伐浣峣d锛岃幏鍙栦竴涓浐瀹氱偣
+ * @param workstationId
+ * @param time
+ * @return
+ */
+ DeviceState getFixPointByWorkstationIdAndTime(@Param("workstationId")Long workstationId, @Param("time")Long time);
+
+ /**
+ * 鑾峰彇鎸囧畾宸ヤ綅鏃堕棿鍖洪棿鍐呯殑闈炲弽棣堢偣鐘舵�佹暟鎹垪琛�
+ * @param workstationId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<DeviceState> workstationNoFeedbackPointStatesInTimeRange(@Param("workstationId")Long workstationId, @Param("startTime")Long startTime, @Param("endTime")Long endTime);
+
+ /**
+ * 鑾峰彇鎸囧畾宸ヤ綅鏃堕棿鍖洪棿鍐呯殑 鍥哄畾鐐� 鐘舵�佹暟鎹垪琛�
+ * @param workstationId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<DeviceState> workstationFixPointStatesInTimeRange(@Param("workstationId")Long workstationId, @Param("startTime")Long startTime, @Param("endTime")Long endTime);
}
--
Gitblit v1.9.3