diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java index 9e57ae268..cac3fbf3d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java @@ -2,11 +2,11 @@ package com.zhgd.xmgl.modules.environment.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO; import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo; import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo; import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; @@ -57,14 +57,14 @@ public class EnvironmentAlarmController { @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) - @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result>(); - IPage pageList = environmentAlarmService.queryEnvironmentAlarmPageList(map); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + @PostMapping(value = "/list") + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result>(); + IPage pageList = environmentAlarmService.queryEnvironmentAlarmPageList(map); + result.setSuccess(true); + result.setResult(pageList); + return result; + } @ApiOperation(value = "查询绿色设备最新10条报警数据信息", notes = "查询绿色设备最新10条报警数据信息", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmVo.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmVo.java new file mode 100644 index 000000000..d7add00f3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.environment.entity.vo; + +import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm; +import lombok.Data; + +@Data +public class EnvironmentAlarmVo extends EnvironmentAlarm { + private Double exceedVal; + private String alarmTypeName; + private String tempAlarmTime; + private String deviceName; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java index 282ba723a..b7a4fa858 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java @@ -1,17 +1,17 @@ package com.zhgd.xmgl.modules.environment.mapper; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.environment.entity.*; import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo; import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; /** * @Description: 绿色设备报警预警数据 @@ -22,12 +22,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface EnvironmentAlarmMapper extends BaseMapper { /** - * * @param page * @param map * @return */ - List queryEnvironmentAlarmPageList(Page page, @Param("param")Map map); + List queryEnvironmentAlarmPageList(Page page, @Param("param") Map map); /** * diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml index 963940672..2f0acd1fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml @@ -1,7 +1,8 @@ - SELECT a.*, ifnull(a.avg_data - a.alarm_value, 0) exceed_val, b.alarm_type @@ -23,10 +24,11 @@ and a.alarm_type_id = #{param.alarmTypeId} - AND a.alarm_time >= CONCAT(DATE_FORMAT(#{param.startTime}, '%Y-%m-%d'), ' 00:00:00') + AND a.alarm_time >= #{param.startTime} - AND a.alarm_time <= CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' 23:59:59') + AND a.alarm_time <= if(LENGTH(#{param.endTime}) = 10, CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' + 23:59:59'), #{param.endTime}) order by a.alarm_time desc diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java index d8c28b90c..3d95d4e2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java @@ -2,10 +2,10 @@ package com.zhgd.xmgl.modules.environment.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.environment.entity.*; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.environment.entity.*; import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo; import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; @@ -20,7 +20,7 @@ import java.util.Map; */ public interface IEnvironmentAlarmService extends IService { - IPage queryEnvironmentAlarmPageList(Map map); + IPage queryEnvironmentAlarmPageList(Map map); void addEnvironmentAlarm(DustNoiseData dustNoiseData, EnvironmentDev environmentDev); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java index 3b77a9084..f1f3154f7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java @@ -7,7 +7,6 @@ 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.mybatis.EntityMap; -import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.async.AsyncEnvironment; import com.zhgd.xmgl.modules.basicdata.entity.Notice; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; @@ -18,6 +17,7 @@ import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper; import com.zhgd.xmgl.modules.environment.entity.*; import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper; @@ -71,11 +71,11 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl queryEnvironmentAlarmPageList(Map map) { + public IPage queryEnvironmentAlarmPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); - Page page = new Page<>(pageNo, pageSize); - List list = environmentAlarmMapper.queryEnvironmentAlarmPageList(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = environmentAlarmMapper.queryEnvironmentAlarmPageList(page, map); return page.setRecords(list); }