bug修改

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<SewageData> queryNewestData(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(sewageDataService.queryNewestData(paramMap));
+    }
+
     /**
      * 添加
      *

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;
+
+
 }

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;
+
 }

src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java

@@ -23,4 +23,6 @@ public interface SewageDataMapper extends BaseMapper<SewageData> {
     Page<SewageData> queryDevAndNewestData(@Param(Constants.WRAPPER) QueryWrapper<SewageData> queryWrapper, Page<SewageData> page);
 
     List<SewageData> countSewageDataTrend(HashMap<String, Object> paramMap);
+
+    SewageData queryNewestData(HashMap<String, Object> paramMap);
 }

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}
     </select>
+
+    <select id="queryNewestData" resultType="com.zhgd.xmgl.modules.sewage.entity.SewageData">
+        select * from sewage_data
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+        order by create_date desc
+        limit 1
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java

@@ -24,4 +24,6 @@ public interface ISewageDataService extends IService<SewageData> {
     void add(SewageData sewageData);
 
     List<SewageData> countSewageDataTrend(HashMap<String, Object> paramMap);
+
+    SewageData queryNewestData(HashMap<String, Object> paramMap);
 }

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<SewageDataMapper, SewageD
         return rtList;
     }
 
+    @Override
+    public SewageData queryNewestData(HashMap<String, Object> paramMap) {
+        SewageData sewageData = baseMapper.queryNewestData(paramMap);
+        List<SewageAlarm> sewageAlarms = sewageAlarmMapper.selectList(new LambdaQueryWrapper<SewageAlarm>()
+                .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();

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()