diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java index c6faf8274..8a7ac2ef5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.sewage.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.sewage.entity.SewageData; import com.zhgd.xmgl.modules.sewage.service.ISewageDataService; import io.swagger.annotations.Api; @@ -80,6 +79,16 @@ public class SewageDataController { return Result.success(sewageDataService.queryDevAndNewestData(paramMap)); } + @ApiOperation(value = "查询最新的一条数据信息", notes = "查询最新的一条数据信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + }) + @GetMapping(value = "/newestData") + public Result queryNewestData(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(sewageDataService.queryNewestData(paramMap)); + } + /** * 添加 * diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java index 0af6612cf..86a86d0be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java @@ -134,4 +134,10 @@ public class SewageAlarm implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "设备名称") private java.lang.String devName; + + @TableField(exist = false) + @ApiModelProperty(value = "污水数据id") + private java.lang.Long sewageDataId; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java index c40a5fd94..70c528791 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java @@ -110,4 +110,8 @@ public class SewageData implements Serializable { @ApiModelProperty(value = "time") private java.lang.String time; + @TableField(exist = false) + @ApiModelProperty(value = "是否报警") + private java.lang.Boolean isWarning; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java index ff565bfd5..5de3b040e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java @@ -23,4 +23,6 @@ public interface SewageDataMapper extends BaseMapper { Page queryDevAndNewestData(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, Page page); List countSewageDataTrend(HashMap paramMap); + + SewageData queryNewestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml index 177003951..b8348e1b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml @@ -38,4 +38,17 @@ on d.dev_sn = sd.dev_sn ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java index afd73721c..116125b41 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java @@ -24,4 +24,6 @@ public interface ISewageDataService extends IService { void add(SewageData sewageData); List countSewageDataTrend(HashMap paramMap); + + SewageData queryNewestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java index 912cabe81..3c3cd0ed4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.sewage.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -141,6 +142,19 @@ public class SewageDataServiceImpl extends ServiceImpl paramMap) { + SewageData sewageData = baseMapper.queryNewestData(paramMap); + List sewageAlarms = sewageAlarmMapper.selectList(new LambdaQueryWrapper() + .eq(SewageAlarm::getSewageDataId, sewageData.getId())); + if (CollUtil.isNotEmpty(sewageAlarms)) { + sewageData.setIsWarning(true); + } else { + sewageData.setIsWarning(false); + } + return sewageData; + } + private void insertAlarmIfLe(Double data, Double threshold, SewageDev dev, String c, Integer alarmType) { if (NumberUtils.le(data, threshold)) { SewageAlarm entity = new SewageAlarm(); diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 1112b070a..a10b2b44d 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -303,6 +303,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/steelStructureCurrentData/lrk/add").permitAll() .antMatchers("/xmgl/exteriorScaffoldingCurrentData/lrk/add").permitAll() .antMatchers("/xmgl/exteriorScaffoldingCurrentData/exportData").permitAll() + .antMatchers("/xmgl/weight/weighInfo/add").permitAll() + .antMatchers("/xmgl/weight/weighBookVehicleInfo/list").permitAll() + .antMatchers("/xmgl/weight/weighPic/add").permitAll() + .antMatchers("/upload/image").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()