src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/DevalarmDataHistoryMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/PwrdevAlarmHistoryMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PwrdevAlarmHistoryService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/PwrdevAlarmHistoryMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java
@@ -3,6 +3,7 @@ import com.whyc.dto.paramter.AlarmPar; import com.whyc.dto.result.AlarmRes; import com.whyc.pojo.BattalarmDataHistory; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,5 +15,5 @@ List<AlarmRes> getBattAlarmHistory(List battgroupIds); //查询分级告警的个数 int serchByLevel(int i, int uId); int serchByLevel(@Param("alarmLevel") int alarmLevel, @Param("uId") int uId); } src/main/java/com/whyc/mapper/DevalarmDataHistoryMapper.java
@@ -2,6 +2,7 @@ import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.pojo.DevalarmDataHistory; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,7 +11,7 @@ List serchByCondition(DevAlarmPar par); List getDevAlarmHistory(List deviceIds); //查询分级告警的个数 int serchByLevel(int i, int uId); int serchByLevel(@Param("alarmLevel") int alarmLevel, @Param("uId") int uId); } src/main/java/com/whyc/mapper/PwrdevAlarmHistoryMapper.java
@@ -1,11 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.PwrdevAlarm; import com.whyc.pojo.PwrdevAlarmHistory; import org.apache.ibatis.annotations.Param; import java.util.List; public interface PwrdevAlarmHistoryMapper extends CustomMapper<PwrdevAlarmHistory>{ public interface PwrdevAlarmHistoryMapper extends CustomMapper<PwrdevAlarmHistory> { //查询所有的实时历史告警信息 List getHistoryAllPage(PwrdevAlarmHistory pwrH); @@ -14,4 +14,6 @@ List<PwrdevAlarmHistory> getPwrdevAlarmHistory(List powerDeviceIds); //查询分级告警的个数 int serchByLevel(@Param("alarmLevel") int alarmLevel, @Param("uId") int uId, @Param("almTypes") List<Integer> almTypes); } src/main/java/com/whyc/service/PwrdevAlarmHistoryService.java
@@ -1,13 +1,11 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.AlarmDaoFactory; import com.whyc.dto.Response; import com.whyc.mapper.PwrdevAlarmHistoryMapper; import com.whyc.mapper.PwrdevAlarmParamMapper; import com.whyc.pojo.PwrdevAlarm; import com.whyc.pojo.PwrdevAlarmHistory; import com.whyc.pojo.PwrdevAlarmParam; import com.whyc.util.ActionUtil; @@ -15,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,29 +26,43 @@ private PwrdevAlarmParamMapper paramMapper; //查询所有的电源历史告警信息 public Response getHistoryAllPage(PwrdevAlarmHistory pwrH){ PageHelper.startPage(pwrH.getPage().getPageCurr(),pwrH.getPage().getPageSize()); public Response getHistoryAllPage(PwrdevAlarmHistory pwrH) { PageHelper.startPage(pwrH.getPage().getPageCurr(), pwrH.getPage().getPageSize()); pwrH.setUsrId(ActionUtil.getUser().getUId().intValue()); List<PwrdevAlarmHistory> list= mapper.getHistoryAllPage(pwrH); for (PwrdevAlarmHistory p:list) { List<PwrdevAlarmHistory> list = mapper.getHistoryAllPage(pwrH); for (PwrdevAlarmHistory p : list) { p.setAlarmName(AlarmDaoFactory.getAllAlarmName(p.getAlmType())); } PageInfo pageInfo=new PageInfo(list); return new Response<>().set(1,pageInfo); PageInfo pageInfo = new PageInfo(list); List levelList = serchByLevel(ActionUtil.getUser().getUId().intValue(), pwrH.getAlmTypes()); return new Response<>().setII(1, pageInfo, levelList, "返回结果"); } //查询分级告警的个数 public List serchByLevel(int uId, List<Integer> almTypes) { List list = new ArrayList(); //分四级查询个数 for (int i = 1; i <= 4; i++) { int countLevel = mapper.serchByLevel(i, uId, almTypes); list.add(countLevel); } return list; } //电源历史告警删除 public Response delete(int num) { int flag=mapper.deleteById(num); int flag = mapper.deleteById(num); return new Response().set(flag); } //电源历史告警删除批量 @Transactional public Response deletepro(List<Integer> list) { int flag=0; for (Integer num:list) { flag=mapper.deleteById(num); int flag = 0; for (Integer num : list) { flag = mapper.deleteById(num); } return new Response().set(flag); return new Response().set(flag); } //查询所有的通讯电源历史告警信息 public Response getHistoryAllPage2(PwrdevAlarmHistory pwrH) { src/main/resources/mapper/PwrdevAlarmHistoryMapper.xml
@@ -43,15 +43,39 @@ db_user.tb_user_battgroup_baojigroup_usr, db_user.tb_user_inf where db_user.tb_user_battgroup_baojigroup_battgroup.StationId=inf.StationId and 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_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=#{usrId} ) </where> </select> <select id="serchByLevel" resultType="java.lang.Integer"> select alarm.*,inf.StationName from db_pwrdev_alarm.tb_pwrdev_alarm_history alarm,db_pwrdev_inf.tb_pwrdev_inf inf <where> alarm.PowerDeviceId = inf.PowerDeviceId and alm_level = #{alarmLevel} <if test="almTypes!=null and almTypes.size>0"> <foreach collection="almTypes" item="almType" open="and alm_type in (" close=")" separator=","> #{almType} </foreach> </if> and StationId in ( select distinct inf.StationId from (select StationId from db_battinf.tb_battinf union select StationId from db_pwrdev_inf.tb_pwrdev_inf ) inf, 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_battgroup.StationId=inf.StationId and 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=#{usrId} ) </where> </select> <select id="getHistoryAllPage2" resultType="PwrdevAlarmHistory"> select alarm.*,inf.StationName from db_pwrdev_alarm.tb_pwrdev_alarm_history alarm,db_pwrdev_inf.tb_pwrdev_inf inf select alarm.*,inf.StationName from db_pwrdev_alarm.tb_pwrdev_alarm_history alarm,db_pwrdev_inf.tb_pwrdev_inf inf <where> alarm.PowerDeviceId = inf.PowerDeviceId <if test="stationName1!=null "> @@ -110,4 +134,5 @@ ORDER BY alarm.alm_start_time DESC </select> </mapper>