admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

雨量bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-27 11:07:32 +08:00
parent 6e92b68ab7
commit 6a0a44b2b5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java
View File

@ -54,7 +54,7 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
private QueryWrapper<RainAlarm> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<RainAlarm> getQueryWrapper(HashMap<String, Object> param) {
String alias = "t."; String alias = "t.";
QueryWrapper<RainAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(RainAlarm.class, param, alias); 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; return queryWrapper;
} }
@ -66,11 +66,11 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
public void add(RainAlarm rainAlarm) { public void add(RainAlarm rainAlarm) {
RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>() RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
.eq(RainDev::getDevSn, rainAlarm.getDevSn())); .eq(RainDev::getDevSn, rainAlarm.getDevSn()));
if (dev != null) { if (dev == null) {
throw new OpenAlertException("设备不存在"); throw new OpenAlertException("设备不存在");
} }
rainAlarm.setId(null); rainAlarm.setId(null);
rainAlarm.setProjectSn(rainAlarm.getProjectSn()); rainAlarm.setProjectSn(dev.getProjectSn());
baseMapper.insert(rainAlarm); baseMapper.insert(rainAlarm);
} }

4
src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java
View File

@ -54,7 +54,7 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
private QueryWrapper<RainRecord> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<RainRecord> getQueryWrapper(HashMap<String, Object> param) {
String alias = "t."; String alias = "t.";
QueryWrapper<RainRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(RainRecord.class, param, alias); 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; return queryWrapper;
} }
@ -66,7 +66,7 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
public void add(RainRecord rainRecord) { public void add(RainRecord rainRecord) {
RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>() RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
.eq(RainDev::getDevSn, rainRecord.getDevSn())); .eq(RainDev::getDevSn, rainRecord.getDevSn()));
if (dev != null) { if (dev == null) {
throw new OpenAlertException("设备不存在"); throw new OpenAlertException("设备不存在");
} }
rainRecord.setId(null); rainRecord.setId(null);