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 getQueryWrapper(HashMap param) { String alias = "t."; QueryWrapper 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() .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 getQueryWrapper(HashMap param) { String alias = "t."; QueryWrapper 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() .eq(RainDev::getDevSn, rainRecord.getDevSn())); - if (dev != null) { + if (dev == null) { throw new OpenAlertException("设备不存在"); } rainRecord.setId(null);