src/main/java/com/whyc/mapper/PwrdevTimeAdjAlarmMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PwrdevTimeAdjAlarmService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/StandardFeatureCurveService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/SubTablePageInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/PwrdevTimeAdjAlarmMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/PwrdevTimeAdjAlarmMapper.java
@@ -7,5 +7,5 @@ public interface PwrdevTimeAdjAlarmMapper extends CustomMapper<PwrdevTimeAdjAlarm>{ //监控主站告警 List<PwrdevTimeAdjAlarm> getList(int uId, @Param("alarmParamTableName") String alarmParamTableName); //List<PwrdevTimeAdjAlarm> getList(int uId, @Param("alarmParamTableName") String alarmParamTableName); } src/main/java/com/whyc/service/PwrdevTimeAdjAlarmService.java
@@ -8,6 +8,7 @@ import com.whyc.pojo.PwrdevTimeOutAlarm; import com.whyc.pojo.UserInf; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -21,6 +22,9 @@ @Resource private PwrdevAlarmParamMapper paramMapper; @Autowired private SubTablePageInfoService subService; //监控主站告警--查询 @@ -38,7 +42,8 @@ List<String> tablelist=paramMapper.getParamList(); //取第一条记录,即param表 String alarmParamTableName = tablelist.get(0); List<PwrdevTimeAdjAlarm> list=mapper.getList(uId,alarmParamTableName); //List<PwrdevTimeAdjAlarm> list=mapper.getList(uId,alarmParamTableName); List<PwrdevTimeAdjAlarm> list=subService.getList_adj(uId,alarmParamTableName); PageInfo pageInfo=new PageInfo(list); return new Response().set(1,pageInfo); } src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -392,6 +392,8 @@ list.add(flag);*/ /*58 subService.createTable4PowerAlarmHistoryByYear("2019");*/ return null; /*63*/ List list=subService.getList_adj(1002,"tb_pwrdev_alarm_param_115000001"); return list; } } src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -706,7 +706,7 @@ return list; } //16,19,30-SubTablePageInfoUtils.java;188行 //16,19,30,61-SubTablePageInfoUtils.java;188行 public List getList2(DevAlarmPar param){ String sql=" SELECT history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity, " + " db_battinf.tb_battinf.stationName,stationName1,stationName2,stationName3,stationName5,db_battinf.tb_battinf.FbsDeviceName as dev_name " + @@ -853,7 +853,7 @@ return list; } //23-SubTablePageInfoUtils.java;469行 //23,60-SubTablePageInfoUtils.java;469行,235行 public List<DevalarmDataHistory> getListForInterface_dev(InterfaceParam param){ String sql=" SELECT history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " + " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName1,db_battinf.tb_battinf.stationName2,db_battinf.tb_battinf.stationName3," + @@ -1427,4 +1427,38 @@ " ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8"; sqlExecuteService.execute(sql); } //63-PwrdevTimeAdjAlarmService.java;41行 public List<PwrdevTimeAdjAlarm> getList_adj(int uId, String alarmParamTableName){ String sql=" SELECT adj.num num ,adj.PowerDeviceId PowerDeviceId,alarm_typeId,detect_datetime,record_datetime,alarm_name,StationName " + " FROM db_pwrdev_alarm.tb_pwrdev_time_adj_alarm adj ,db_pwrdev_alarm."+alarmParamTableName+" p2,db_pwrdev_inf.tb_pwrdev_inf inf " + " WHERE adj.alarm_typeId = p2.alarm_id and adj.PowerDeviceId= inf.PowerDeviceId " + " AND adj.PowerDeviceId in ( SELECT DISTINCT devInf.PowerDeviceId " + " FROM db_pwrdev_inf.tb_pwrdev_inf devInf, " + " db_user.tb_user_battgroup_baojigroup_battgroup group1, " + " db_user.tb_user_battgroup_baojigroup_usr groupUser " + " WHERE " + " devInf.StationId = group1.StationId " + " AND group1.baoji_group_id = groupUser.baoji_group_id " + " AND groupUser.uId ="+uId+")"; List<PwrdevTimeAdjAlarm> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { @Override public List getResults(ResultSet rs) throws SQLException { List<PwrdevTimeAdjAlarm> list=new ArrayList<>(); while (rs.next()){ PwrdevTimeAdjAlarm ph=new PwrdevTimeAdjAlarm(); ph.setNum(rs.getLong("num")); ph.setPowerDeviceId(rs.getLong("PowerDeviceId")); ph.setAlarmTypeid(rs.getInt("alarm_typeId")); ph.setDetectDatetime(rs.getTimestamp("detect_datetime")); ph.setRecordDatetime(rs.getTimestamp("record_datetime")); ph.setAlarmName(rs.getString("alarm_name")); ph.setStationName(rs.getString("StationName")); list.add(ph); } return list; } }); return list; } } src/main/resources/mapper/PwrdevTimeAdjAlarmMapper.xml
@@ -1,7 +1,7 @@ <?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.PwrdevTimeAdjAlarmMapper"> <select id="getList" resultType="PwrdevTimeAdjAlarm"> <!-- <select id="getList" resultType="PwrdevTimeAdjAlarm"> SELECT adj.num num ,adj.PowerDeviceId PowerDeviceId,alarm_typeId,detect_datetime,record_datetime,alarm_name,StationName FROM db_pwrdev_alarm.tb_pwrdev_time_adj_alarm adj ,db_pwrdev_alarm.${alarmParamTableName} p2,db_pwrdev_inf.tb_pwrdev_inf inf WHERE adj.alarm_typeId = p2.alarm_id and adj.PowerDeviceId= inf.PowerDeviceId @@ -13,7 +13,7 @@ devInf.StationId = group1.StationId AND group1.baoji_group_id = groupUser.baoji_group_id AND groupUser.uId =#{uId}) </select> </select>--> </mapper>