| src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/StandardFeatureCurveService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/SubTablePageInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/util/SubTablePageInfoUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/BattalarmDataHistoryMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java
@@ -17,7 +17,7 @@ int getCount(AlarmPar param); List<AlarmRes> getList2(AlarmPar data); //List<AlarmRes> getList2(AlarmPar data); List<AlarmRes> getBattAlarmHistory(List battgroupIds);
@@ -3,6 +3,7 @@ import cn.hutool.json.JSONUtil; import com.whyc.dto.InterfaceParam; import com.whyc.dto.StandardFeatureCurve; import com.whyc.dto.paramter.AlarmPar; import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.mapper.CallBack; import com.whyc.mapper.CommonMapper; @@ -115,8 +116,8 @@ Date date1 = null; Date date2 = null; try { date1 = ActionUtil.sdf.parse("2023-03-01 14:08:02" ); date2 = ActionUtil.sdf.parse("2023-03-01 16:40:45"); date1 = ActionUtil.sdf.parse("2023-03-27 10:10:01" ); date2 = ActionUtil.sdf.parse("2023-03-31 14:36:55"); } catch (ParseException e) { e.printStackTrace(); } @@ -279,7 +280,7 @@ list.add(count);*/ /*32 List list=subService.searchAll("tb_pwrdev_alarm_param_110000001");*/ /*34*/ /*34 InterfaceParam param=new InterfaceParam(); param.setRecordYear("tb_devalarm_data_history_2023_03"); param.setStartTime(date1); @@ -292,7 +293,32 @@ param.setLimitEnd(10); int count=subService.getCountForInterface(param); List list=new ArrayList(); list.add(count); list.add(count);*/ AlarmPar param=new AlarmPar(); param.setRecordYear("tb_battalarm_data_history_2023_03"); param.setAlmIdOne(119001); param.setAlmIdTwo(119002); param.setAlmIdThree(119003); param.setAlmIdFour(119004); param.setAlmIdFive(119005); param.setAlmIdSix(119006); param.setAlmIdSeven(1190011); param.setAlmIdEight(1190012); param.setAlmSignalIdOne(0); param.setAlmSignalIdTwo(1); param.setAlmLevelOne(1); param.setAlmLevelTwo(2); param.setAlmLevelThree(3); param.setAlmLevelFour(4); param.setStationname(""); param.setStationname1(""); param.setAlmStartTime(date1); param.setAlmStartTime1(date2); param.setBattGroupId(0); param.setUId(1002); param.setLimitStart(0); param.setLimitEnd(100); List list= subService.getList2(param); return list; } } src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -2,6 +2,7 @@ import com.whyc.dto.InterfaceParam; import com.whyc.dto.StandardFeatureCurve; import com.whyc.dto.paramter.AlarmPar; import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.dto.result.AlarmRes; import com.whyc.mapper.CallBack; @@ -1083,4 +1084,84 @@ } return num; } //35-SubTablePageInfoUtils.java;176行 public List<AlarmRes> getList2(AlarmPar param){ String sql="select history.BattGroupId,history.num,alm_signal_id,history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time " + " ,alm_severity,stationname,StationName1,StationName2,StationName3,StationName5,battgroupname " + " from db_alarm."+param.getRecordYear()+" history,db_battinf.tb_battinf " + " where history.battgroupid=db_battinf.tb_battinf.battgroupid " + " and alm_id in("+param.getAlmIdOne()+","+param.getAlmIdTwo()+", "+param.getAlmIdThree()+ ", "+param.getAlmIdFour()+ ", "+param.getAlmIdFive()+ ", "+param.getAlmIdSix()+ ", "+param.getAlmIdSeven()+ ", "+param.getAlmIdEight()+ ") " + " and alm_signal_id%2 in("+param.getAlmSignalIdOne()+","+param.getAlmSignalIdTwo()+") " + " and alm_level in( "+param.getAlmLevelOne()+ ", "+param.getAlmLevelTwo()+ ", "+param.getAlmLevelThree()+ ", "+param.getAlmLevelFour()+ ") " + " and alm_start_time>='"+ActionUtil.sdf.format(param.getAlmStartTime())+"' and alm_start_time <='"+ActionUtil.sdf.format(param.getAlmStartTime1())+"' " + " and db_battinf.tb_battinf.stationname1 like '%"+param.getStationname1()+"%' " + " and db_battinf.tb_battinf.stationname like '%"+param.getStationname()+"%' "; if(param.getBattGroupId()==0){ sql+=" and db_battinf.tb_battinf.battgroupid!="+param.getBattGroupId()+" "; }else{ sql+=" and db_battinf.tb_battinf.battgroupid="+param.getBattGroupId()+" "; } sql+=" and history.BattGroupId " + " in(select distinct db_battinf.tb_battinf.battgroupid from " + " db_battinf.tb_battinf,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.BattGroupId=db_battinf.tb_battinf.BattGroupId " + " 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="+param.getUId()+" " + " )"; sql+=" order by history.BattGroupId asc,history.alm_start_time desc,history.monnum asc limit "+param.getLimitStart()+","+param.getLimitEnd()+" "; List<AlarmRes> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { @Override public List getResults(ResultSet rs) throws SQLException { List<AlarmRes> list=new ArrayList<>(); int id=0; int i=0; List dataList=new ArrayList(); AlarmRes ph=new AlarmRes(); while (rs.next()){ int battGroupId=rs.getInt("BattGroupId"); if(battGroupId!=id){ ph.setAdataHs(dataList); dataList=new ArrayList(); } BattalarmDataHistory data=new BattalarmDataHistory(); data.setNum(rs.getLong("num")); data.setBattGroupId(rs.getInt("BattGroupId")); data.setAlmSignalId(rs.getInt("alm_signal_id")); data.setMonNum(rs.getInt("monnum")); data.setAlmValue(rs.getFloat("alm_value")); data.setAlmLevel(rs.getInt("alm_level")); data.setAlmIsConfirmed(rs.getInt("alm_is_confirmed")); data.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time")); data.setAlmStartTime(rs.getTimestamp("alm_start_time")); data.setAlmEndTime(rs.getTimestamp("alm_end_time")); data.setAlmSeverity(rs.getInt("alm_severity")); dataList.add(data); if(battGroupId!=id){ if(i!=0){ list.add(ph); } id=battGroupId; ph=new AlarmRes(); ph.setBattGroupId(battGroupId); ph.setStationName(rs.getString("stationname")); ph.setStationName1(rs.getString("stationname1")); ph.setStationName2(rs.getString("stationname2")); ph.setStationName3(rs.getString("stationname3")); ph.setStationName5(rs.getString("stationname5")); ph.setBattGroupName(rs.getString("battgroupname")); } if(rs.isLast()){ ph.setAdataHs(dataList); list.add(ph); } i++; } return list; } }); return list; } } src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -184,7 +184,8 @@ data.setLimitStart(limitList.get(0)); data.setLimitEnd(limitList.get(1)); data.setRecordYear(recordYear); List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data); //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data); List<AlarmRes> list = subService.getList2(data); dataList.addAll(list); } else if (pojo instanceof DevAlarmPar) { @@ -430,7 +431,8 @@ data.setLimitStart(limitList.get(0)); data.setLimitEnd(limitList.get(1)); data.setRecordYear(recordYear); List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data); //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data); List<AlarmRes> list = subService.getList2(data); dataList.addAll(list); } else if (pojo instanceof DevAlarmPar) { src/main/resources/mapper/BattalarmDataHistoryMapper.xml
@@ -57,7 +57,7 @@ order by db_alarm.tb_battalarm_data_history.alm_start_time desc,db_alarm.tb_battalarm_data_history.monnum asc </select> <select id="getList2" resultMap="alarmRes"> <!-- <select id="getList2" resultMap="alarmRes"> select history.BattGroupId,history.num,alm_signal_id,history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time ,alm_severity,stationname,StationName1,StationName2,StationName3,StationName5,battgroupname @@ -88,7 +88,7 @@ </where> order by history.alm_start_time desc,history.monnum asc limit #{limitStart},#{limitEnd} </select> --> <select id="getCount" resultType="java.lang.Integer"> select <!--count(*)-->
