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 cf8e3ab92..ce83e15d2 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 @@ -4,14 +4,11 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; 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.service.impl.NoticeServiceImpl; 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.RefUtil; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; 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.stream.Collectors; @@ -47,6 +44,12 @@ public class RainRecordServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -73,23 +76,17 @@ public class RainRecordServiceImpl extends ServiceImpl dealList(List list) { return list; } - @Lazy - @Autowired - private SystemUserMapper systemUserMapper; - @Lazy - @Autowired - private NoticeServiceImpl noticeService; + @Override + @Transactional(rollbackFor = Exception.class) public void add(RainRecord rainRecord) { RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper() .eq(RainDev::getDevSn, rainRecord.getDevSn())); if (dev == null) { throw new OpenAlertException("设备不存在"); } - if (Objects.equals(dev.getOnline(), 0)) { - dev.setLastUploadTime(new Date()); - rainDevMapper.updateById(dev); - } + dev.setLastUploadTime(new Date()); + rainDevMapper.updateById(dev); rainRecord.setId(null); rainRecord.setProjectSn(dev.getProjectSn()); baseMapper.insert(rainRecord);