From 8c6849d98fc168369d6de2d94d2f42a6d67cd9c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 11:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java
index 7524185..a42756c 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java
@@ -20,7 +20,7 @@
 	 * @param result
 	 * @return
 	 */
-	List<UPWarnMsgAdptInfo> findByResultIsAndPushTimeBefore(int result, long pushTime);
+	List<UPWarnMsgAdptInfo> findByResultIsAndLevelNotNullAndPushTimeBefore(int result, long pushTime);
 	
 	
 	/**
@@ -31,4 +31,13 @@
 	 */
 	List<UPWarnMsgAdptInfo> findByCreateTimeAfter(Long createTime);
 	
+	
+	/**
+	 * 根据信息id查询数据
+	 *
+	 * @param infoId
+	 * @return
+	 */
+	UPWarnMsgAdptInfo findByInfoIdIs(String infoId);
+	
 }

--
Gitblit v1.7.1