From 6a0a44b2b5e680a26fd12b2bedae81262fb9df53 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 27 Jun 2024 11:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=A8=E9=87=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../environment/service/impl/RainAlarmServiceImpl.java      | 6 +++---
 .../environment/service/impl/RainRecordServiceImpl.java     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java
index 9d041330c..cd79c2a0f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java
@@ -54,7 +54,7 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
     private QueryWrapper<RainAlarm> getQueryWrapper(HashMap<String, Object> param) {
         String alias = "t.";
         QueryWrapper<RainAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(RainAlarm.class, param, alias);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainAlarm::getId));
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainAlarm::getAlarmTime));
         return queryWrapper;
     }
 
@@ -66,11 +66,11 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
     public void add(RainAlarm rainAlarm) {
         RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
                 .eq(RainDev::getDevSn, rainAlarm.getDevSn()));
-        if (dev != null) {
+        if (dev == null) {
             throw new OpenAlertException("设备不存在");
         }
         rainAlarm.setId(null);
-        rainAlarm.setProjectSn(rainAlarm.getProjectSn());
+        rainAlarm.setProjectSn(dev.getProjectSn());
         baseMapper.insert(rainAlarm);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java
index 7c3cae262..d2d10b96f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java
@@ -54,7 +54,7 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
     private QueryWrapper<RainRecord> getQueryWrapper(HashMap<String, Object> param) {
         String alias = "t.";
         QueryWrapper<RainRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(RainRecord.class, param, alias);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainRecord::getId));
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainRecord::getRecordTime));
         return queryWrapper;
     }
 
@@ -66,7 +66,7 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
     public void add(RainRecord rainRecord) {
         RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
                 .eq(RainDev::getDevSn, rainRecord.getDevSn()));
-        if (dev != null) {
+        if (dev == null) {
             throw new OpenAlertException("设备不存在");
         }
         rainRecord.setId(null);