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-24 21:53:04 +08:00
parent 463b1e69cf
commit 725e45903b
8 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -202,7 +202,7 @@ public class DataScopeHandler implements DataPermissionHandler {
}
}
//解析ai视频预警
//解析ai预警
List<String> filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true);
if (CollUtil.isNotEmpty(filterAis)) {
List<String> videoItems = aiAnalyseHardWareRecordService.getAiAnalyseHardIdsByEnterpriseId(id);

4
src/main/java/com/zhgd/xmgl/modules/environment/controller/RainAlarmController.java
View File

@ -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<RainAlarm> add(@RequestBody @Validate RainAlarm rainAlarm) {
rainAlarmService.add(rainAlarm);
log.info("添加雨量监测报警记录信息:{}", JSON.toJSONString(rainAlarm));
rainAlarmService.add(rainAlarm);
return Result.ok();
}

2
src/main/java/com/zhgd/xmgl/modules/environment/controller/RainRecordController.java
View File

@ -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<RainRecord> add(@RequestBody @Validate RainRecord rainRecord) {
log.info("添加雨量监测记录信息:{}", JSON.toJSONString(rainRecord));
rainRecordService.add(rainRecord);
return Result.ok();
}

6
src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java
View File

@ -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")

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

@ -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<RainAlarmMapper, RainAlarm> implements IRainAlarmService {
@Autowired
private RainDevMapper rainDevMapper;
@Autowired
private RainAlarmMapper rainAlarmMapper;
@ -59,7 +64,13 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
@Override
public void add(RainAlarm rainAlarm) {
RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
.eq(RainDev::getDevSn, rainAlarm.getDevSn()));
if (dev != null) {
throw new OpenAlertException("设备不存在");
}
rainAlarm.setId(null);
rainAlarm.setProjectSn(rainAlarm.getProjectSn());
baseMapper.insert(rainAlarm);
}

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

@ -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<RainRecordMapper, RainRecord> implements IRainRecordService {
@Autowired
private RainRecordMapper rainRecordMapper;
@Autowired
private RainDevMapper rainDevMapper;
@Override
public IPage<RainRecord> queryPageList(HashMap<String, Object> param) {
@ -59,7 +64,13 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
@Override
public void add(RainRecord rainRecord) {
RainDev dev = rainDevMapper.selectOne(new LambdaQueryWrapper<RainDev>()
.eq(RainDev::getDevSn, rainRecord.getDevSn()));
if (dev != null) {
throw new OpenAlertException("设备不存在");
}
rainRecord.setId(null);
rainRecord.setProjectSn(dev.getProjectSn());
baseMapper.insert(rainRecord);
}

5
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml
View File

@ -18,8 +18,9 @@
where qrtu.user_id = #{userId}
</select>
<select id="getAiAnalyseHardIdsByEnterpriseId" resultType="java.lang.String">
select distinct qrtaah.ai_analyse_hard_ware_record_id
from quality_region_to_ai_analyse_hard qrtaah
select distinct aahwr.hardware_id
from ai_analyse_hard_ware_record aahwr
join quality_region_to_ai_analyse_hard qrtaah on aahwr.id = qrtaah.ai_analyse_hard_ware_record_id
join quality_region_to_enterprise qrte on qrte.quality_region_id = qrtaah.quality_region_id
where (qrte.enterprise_id = #{enterpriseId} OR qrte.enterprise_id IN ( SELECT DISTINCT t2.enterprise_id FROM
(SELECT id FROM project_enterprise WHERE enterprise_id = #{enterpriseId}) t join project_enterprise t2 on

2
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -80,6 +80,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests()
//请求路径允许访问
.antMatchers("/xmgl/rainRecord/add").permitAll()
.antMatchers("/xmgl/rainAlarm/add").permitAll()
.antMatchers("/xmgl/vrSecurityWorkerLoginInfo/add").permitAll()
.antMatchers("/xmgl/securityWorkerCourseInfo/add").permitAll()
.antMatchers("/xmgl/xzEmergencyType/**").permitAll()