src/main/java/com/whyc/controller/AlarmManualClearController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/AlarmManualClearMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/AlarmManualClear.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/AlarmManualClearService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/AlarmManualClearMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/AlarmManualClearController.java
@@ -29,10 +29,11 @@ } @ApiOperation("查询所有告警手动消除记录") @GetMapping("all") public Response getAll(){ return service.getAll(); @ApiOperation("查询所有告警手动消除记录分页") @GetMapping("page") public Response getPage(@RequestParam int pageNum, @RequestParam int pageSize){ return service.getPage(pageNum,pageSize); } } src/main/java/com/whyc/mapper/AlarmManualClearMapper.java
@@ -1,6 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.AlarmManualClear; import org.apache.ibatis.annotations.Param; import java.util.List; public interface AlarmManualClearMapper extends CustomMapper<AlarmManualClear> { List<AlarmManualClear> getAll(@Param("userId") int userId); } src/main/java/com/whyc/pojo/AlarmManualClear.java
@@ -14,9 +14,17 @@ private Integer id; private String stationId; private String stationName1; private String stationName2; private String stationName3; private String stationName4; private String stationName5; private Integer alarmType; private Integer battGroupId; private String battGroupName; private Integer monNum; private Integer deviceId; private String deviceName; private Integer powerDeviceId; private Date almStartTime; private Integer almId; @@ -131,4 +139,68 @@ public void setAlarmName(String alarmName) { this.alarmName = alarmName; } public String getStationName1() { return stationName1; } public void setStationName1(String stationName1) { this.stationName1 = stationName1; } public String getStationName2() { return stationName2; } public void setStationName2(String stationName2) { this.stationName2 = stationName2; } public String getStationName3() { return stationName3; } public void setStationName3(String stationName3) { this.stationName3 = stationName3; } public String getStationName4() { return stationName4; } public void setStationName4(String stationName4) { this.stationName4 = stationName4; } public String getStationName5() { return stationName5; } public void setStationName5(String stationName5) { this.stationName5 = stationName5; } public String getBattGroupName() { return battGroupName; } public void setBattGroupName(String battGroupName) { this.battGroupName = battGroupName; } public Integer getMonNum() { return monNum; } public void setMonNum(Integer monNum) { this.monNum = monNum; } public String getDeviceName() { return deviceName; } public void setDeviceName(String deviceName) { this.deviceName = deviceName; } } src/main/java/com/whyc/service/AlarmManualClearService.java
@@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.AlarmDaoFactory; import com.whyc.dto.Response; import com.whyc.mapper.AlarmManualClearMapper; @@ -12,6 +14,8 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Service public class AlarmManualClearService { @@ -67,8 +71,18 @@ } public Response getAll() { public Response getPage(int pageNum,int pageSize) { int userId = ActionUtil.getUser().getUId().intValue(); return null; //查询所有的记录分页 PageHelper.startPage(pageNum,pageSize); List<AlarmManualClear> list = mapper.getAll(userId); PageInfo<AlarmManualClear> pageInfo = new PageInfo<>(list); ////装配电池/设备/电源信息 //List<AlarmManualClear> dataList = pageInfo.getList(); //List<Integer> battGroupIdList = dataList.stream().filter(data -> data.getAlarmType() == 1).map(AlarmManualClear::getBattGroupId).collect(Collectors.toList()); //List<Integer> deviceIdList = dataList.stream().filter(data -> data.getAlarmType() == 2).map(AlarmManualClear::getDeviceId).collect(Collectors.toList()); //List<Integer> powerDeviceIdList = dataList.stream().filter(data -> data.getAlarmType() == 3).map(AlarmManualClear::getPowerDeviceId).collect(Collectors.toList()); return new Response().set(1,pageInfo); } } src/main/resources/mapper/AlarmManualClearMapper.xml
New file @@ -0,0 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.whyc.mapper.AlarmManualClearMapper" > <select id="getAll" resultType="com.whyc.pojo.AlarmManualClear"> select * from db_alarm.tb_alarm_manual_clear where station_id in (select distinct stationId from db_user.tb_user_battgroup_baojigroup_battgroup , db_user.tb_user_battgroup_baojigroup_usr , db_user.tb_user_inf where db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id = db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid = #{userId}) </select> </mapper>