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

雨量bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-07-03 10:59:26 +08:00
parent b5f945faa5
commit 9c31326994
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,11 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.basicdata.entity.Notice;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl; import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.environment.entity.RainDev; import com.zhgd.xmgl.modules.environment.entity.RainDev;
@ -23,15 +20,15 @@ import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*; import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -47,6 +44,12 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
private RainRecordMapper rainRecordMapper; private RainRecordMapper rainRecordMapper;
@Autowired @Autowired
private RainDevMapper rainDevMapper; private RainDevMapper rainDevMapper;
@Lazy
@Autowired
private SystemUserMapper systemUserMapper;
@Lazy
@Autowired
private NoticeServiceImpl noticeService;
@Override @Override
public IPage<RainRecord> queryPageList(HashMap<String, Object> param) { public IPage<RainRecord> queryPageList(HashMap<String, Object> param) {
@ -73,23 +76,17 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
private List<RainRecord> dealList(List<RainRecord> list) { private List<RainRecord> dealList(List<RainRecord> list) {
return list; return list;
} }
@Lazy
@Autowired
private SystemUserMapper systemUserMapper;
@Lazy
@Autowired
private NoticeServiceImpl noticeService;
@Override @Override
@Transactional(rollbackFor = Exception.class)
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("设备不存在");
} }
if (Objects.equals(dev.getOnline(), 0)) {
dev.setLastUploadTime(new Date()); dev.setLastUploadTime(new Date());
rainDevMapper.updateById(dev); rainDevMapper.updateById(dev);
}
rainRecord.setId(null); rainRecord.setId(null);
rainRecord.setProjectSn(dev.getProjectSn()); rainRecord.setProjectSn(dev.getProjectSn());
baseMapper.insert(rainRecord); baseMapper.insert(rainRecord);