From 725e45903bc414933b27a9a6ffa1886564148e29 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 24 Jun 2024 21:53:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/mybatis/DataScopeHandler.java | 2 +- .../environment/controller/RainAlarmController.java | 4 +++- .../environment/controller/RainRecordController.java | 2 ++ .../xmgl/modules/environment/entity/RainAlarm.java | 6 ++++++ .../service/impl/RainAlarmServiceImpl.java | 11 +++++++++++ .../service/impl/RainRecordServiceImpl.java | 11 +++++++++++ .../mapper/xml/AiAnalyseHardWareRecordMapper.xml | 5 +++-- .../com/zhgd/xmgl/security/WebSecurityConfig.java | 2 ++ 8 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index 1468153f9..2b3ee39c5 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -202,7 +202,7 @@ public class DataScopeHandler implements DataPermissionHandler { } } - //解析ai视频预警 + //解析ai预警 List filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true); if (CollUtil.isNotEmpty(filterAis)) { List videoItems = aiAnalyseHardWareRecordService.getAiAnalyseHardIdsByEnterpriseId(id); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainAlarmController.java index e8aa5236c..11647ff08 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainAlarmController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.environment.controller; +import com.gexin.fastjson.JSON; import com.zhgd.xmgl.modules.environment.entity.RainAlarm; import com.zhgd.xmgl.modules.environment.service.IRainAlarmService; import io.swagger.annotations.Api; @@ -74,7 +75,8 @@ public class RainAlarmController { @ApiOperation(value = "添加雨量监测报警记录信息", notes = "添加雨量监测报警记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate RainAlarm rainAlarm) { - rainAlarmService.add(rainAlarm); + log.info("添加雨量监测报警记录信息:{}", JSON.toJSONString(rainAlarm)); + rainAlarmService.add(rainAlarm); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainRecordController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainRecordController.java index e9e52b5e9..351d55b1b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/RainRecordController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.environment.controller; +import com.gexin.fastjson.JSON; import com.zhgd.xmgl.modules.environment.entity.RainRecord; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -74,6 +75,7 @@ public class RainRecordController { @ApiOperation(value = "添加雨量监测记录信息", notes = "添加雨量监测记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate RainRecord rainRecord) { + log.info("添加雨量监测记录信息:{}", JSON.toJSONString(rainRecord)); rainRecordService.add(rainRecord); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java index a3baa3199..5a22d689a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java @@ -49,6 +49,12 @@ public class RainAlarm implements Serializable { @Excel(name = "所属项目SN", width = 15) @ApiModelProperty(value = "所属项目SN") private java.lang.String projectSn; + /** + * 设备SN + */ + @Excel(name = "设备SN", width = 15) + @ApiModelProperty(value = "设备SN") + private java.lang.String devSn; @ApiModelProperty(value = "报警时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") 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 f98f8ed9d..34b17f6e3 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 @@ -1,7 +1,10 @@ package com.zhgd.xmgl.modules.environment.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.environment.entity.RainDev; import com.zhgd.xmgl.modules.environment.mapper.RainAlarmMapper; +import com.zhgd.xmgl.modules.environment.mapper.RainDevMapper; import com.zhgd.xmgl.modules.environment.service.IRainAlarmService; import com.zhgd.xmgl.modules.environment.entity.RainAlarm; import org.springframework.stereotype.Service; @@ -28,6 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired; @Service @Transactional(rollbackFor = Exception.class) public class RainAlarmServiceImpl extends ServiceImpl implements IRainAlarmService { + @Autowired + private RainDevMapper rainDevMapper; @Autowired private RainAlarmMapper rainAlarmMapper; @@ -59,7 +64,13 @@ public class RainAlarmServiceImpl extends ServiceImpl() + .eq(RainDev::getDevSn, rainAlarm.getDevSn())); + if (dev != null) { + throw new OpenAlertException("设备不存在"); + } rainAlarm.setId(null); + rainAlarm.setProjectSn(rainAlarm.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 60b0b4cd0..113f23c01 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 @@ -1,7 +1,10 @@ package com.zhgd.xmgl.modules.environment.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.environment.entity.RainDev; import com.zhgd.xmgl.modules.environment.entity.RainRecord; +import com.zhgd.xmgl.modules.environment.mapper.RainDevMapper; import com.zhgd.xmgl.modules.environment.mapper.RainRecordMapper; import com.zhgd.xmgl.modules.environment.service.IRainRecordService; import org.springframework.stereotype.Service; @@ -30,6 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired; public class RainRecordServiceImpl extends ServiceImpl implements IRainRecordService { @Autowired private RainRecordMapper rainRecordMapper; + @Autowired + private RainDevMapper rainDevMapper; @Override public IPage queryPageList(HashMap param) { @@ -59,7 +64,13 @@ public class RainRecordServiceImpl extends ServiceImpl() + .eq(RainDev::getDevSn, rainRecord.getDevSn())); + if (dev != null) { + throw new OpenAlertException("设备不存在"); + } rainRecord.setId(null); + rainRecord.setProjectSn(dev.getProjectSn()); baseMapper.insert(rainRecord); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml index 9ae23a898..1a8b7f198 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml @@ -18,8 +18,9 @@ where qrtu.user_id = #{userId}