From 8e944cfabb253fc2556588e308e282586043f7b0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 22:09:56 +0800
Subject: [PATCH] 即时消息时间出现负数的问题修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
index 4cf90f8..25163d8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
@@ -16,11 +16,23 @@
import com.qianwen.smartman.modules.report.vo.WorkstaionAlarmByShiftReportVO;
import com.qianwen.smartman.modules.report.vo.WorkstaionAlarmByTimeReportVO;
-@DS("tdengine")
+@DS("iotdb")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
public interface SuperAlarmMapper extends BaseMapper<SuperAlarm> {
+ /**
+ * 鏌ヨ鍛婅鍒嗛〉鏁版嵁
+ * @param workstationId
+ * @param start
+ * @param end
+ * @return
+ */
List<AlarmAnalysisWorkstationVO> alarmByWorkstation(@Param("workstationId") String workstationId, @Param("start") Integer start, @Param("end") Integer end);
+ /**
+ * 鏌ヨ鍛婅鏁版嵁鏉℃暟
+ * @param workstationId
+ * @return
+ */
Integer alarmByWorkstationTotal(@Param("workstationId") String workstationId);
void createTable(Long workstationId);
@@ -29,13 +41,32 @@
Long countAlarm(@Param("vo") AlarmShiftSearchVO vo, @Param("queryTime") String queryTime);
- List<SuperAlarm> selectListAlarm(@Param("vo") AlarmShiftSearchVO vo, @Param("queryTime") String queryTime);
+ /**
+ * 鎶ヨ鐨勫垪琛ㄦ煡璇紝鎸夋椂闂�
+ * @param vo 鏌ヨ鍙傛暟
+ * @param queryTime
+ * @return
+ */
+ List<SuperAlarm> selectListAlarm(@Param("vo") AlarmShiftSearchVO vo, @Param("factoryDate") int factoryDate);
- List<SuperAlarm> queryAlarm(@Param("query") Query query, @Param("vo") AlarmShiftSearchVO vo, @Param("queryTime") String queryTime);
+ /**
+ * 鏌ヨ鎶ヨ鍒嗛〉鏁版嵁
+ * @param query
+ * @param vo
+ * @param factoryDate
+ * @return
+ */
+ List<SuperAlarm> queryAlarm(@Param("query") Query query, @Param("vo") AlarmShiftSearchVO vo, @Param("factoryDate") int factoryDate);
List<SuperAlarm> selectAllAlarm(@Param("vo") AlarmShiftSearchExcelVO vo, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("year") Integer year, @Param("list") List<Integer> list);
-
- List<SuperAlarm> selectListAlarmByShift(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("workstationId") Long workstationId);
+ /**
+ * 鎸夌彮娆℃煡璇㈡姤璀︽暟鎹�
+ * @param startDate
+ * @param endDate
+ * @param workstationId
+ * @return
+ */
+ List<SuperAlarm> selectListAlarmByShift(@Param("startFactoryDate") int startFactoryDate, @Param("endFactoryDate") int endFactoryDate, @Param("workstationId") Long workstationId);
List<WorkstaionAlarmByTimeReportVO> alarmReportByTime(@Param("ids") List<Long> workstationIds, @Param("beginTime") String startDate, @Param("endTime") String endDate);
--
Gitblit v1.9.3