src/main/java/com/whyc/mapper/BattAlarmHisMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattAlarmHisService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/SubTableService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BattAlarmHisMapper.java
@@ -1,6 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.db_alarm.BattAlarmHis; import com.whyc.pojo.db_alarm.BattAlarmHistory; public interface BattAlarmHisMapper extends CustomMapper<BattAlarmHis>{ public interface BattAlarmHisMapper extends CustomMapper<BattAlarmHistory>{ } src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
File was renamed from src/main/java/com/whyc/pojo/db_alarm/BattAlarmHis.java @@ -1,6 +1,7 @@ package com.whyc.pojo.db_alarm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -15,7 +16,8 @@ @NoArgsConstructor @ToString @ApiModel(value="告警历史记录", description="") public class BattAlarmHis { @TableName(schema = "db_alarm",value = "batt_alarm_history") public class BattAlarmHistory { @TableField("num") @ApiModelProperty("主键编号") private Integer num; src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -2,7 +2,7 @@ import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.pojo.db_alarm.BattAlarmHis; import com.whyc.pojo.db_alarm.BattAlarmHistory; import com.whyc.util.SubTablePageInfoUtil; import com.whyc.util.ThreadLocalUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,7 @@ //查询电池组历史时间告警 public Response getHisAlatm(int binfId, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException { BattAlarmHis his=new BattAlarmHis(); BattAlarmHistory his=new BattAlarmHistory(); his.setBinfId(binfId); PageInfo pageInfo=util.getPageInfoByMonthTable(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1) ,"db_alarm","batt_alarm",his); src/main/java/com/whyc/service/SubTableService.java
@@ -1,7 +1,7 @@ package com.whyc.service; import com.whyc.mapper.CallBack; import com.whyc.pojo.db_alarm.BattAlarmHis; import com.whyc.pojo.db_alarm.BattAlarmHistory; import com.whyc.pojo.db_dis_batt.BattTestInfData; import com.whyc.util.ActionUtil; import com.whyc.util.ThreadLocalUtil; @@ -53,14 +53,14 @@ return list; } //告警历史实时计算每张表查询总数 public int getBattHisCount(BattAlarmHis battAlarmHis) { String sql="SELECT count(*) as number FROM db_alarm."+battAlarmHis.getRecordYear()+" history " + " where history.binf_id="+battAlarmHis.getBinfId() ; if(battAlarmHis.getAlmStartTime()!=null){ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHis.getAlmStartTime(),1)+"' "; public int getBattHisCount(BattAlarmHistory battAlarmHistory) { String sql="SELECT count(*) as number FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " + " where history.binf_id="+ battAlarmHistory.getBinfId() ; if(battAlarmHistory.getAlmStartTime()!=null){ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' "; } if(battAlarmHis.getAlmEndTime()!=null){ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHis.getAlmEndTime(),1)+"' "; if(battAlarmHistory.getAlmEndTime()!=null){ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHistory.getAlmEndTime(),1)+"' "; } List list = sqlExecuteService.executeQuery_call(sql, new CallBack() { @Override @@ -82,22 +82,22 @@ return num; } //告警历史实时 public List<BattAlarmHis> getBattHisList(BattAlarmHis battAlarmHis) { String sql="SELECT * FROM db_alarm."+battAlarmHis.getRecordYear()+" history " + " where history.binf_id="+battAlarmHis.getBinfId() ; if(battAlarmHis.getAlmStartTime()!=null){ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHis.getAlmStartTime(),1)+"' "; public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) { String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " + " where history.binf_id="+ battAlarmHistory.getBinfId() ; if(battAlarmHistory.getAlmStartTime()!=null){ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' "; } if(battAlarmHis.getAlmEndTime()!=null){ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHis.getAlmEndTime(),1)+"' "; if(battAlarmHistory.getAlmEndTime()!=null){ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHistory.getAlmEndTime(),1)+"' "; } sql+=" ORDER BY alm_start_time asc limit "+battAlarmHis.getLimitStart()+","+battAlarmHis.getLimitEnd()+" "; List<BattAlarmHis> list=sqlExecuteService.executeQuery_call(sql, new CallBack() { sql+=" ORDER BY alm_start_time asc limit "+ battAlarmHistory.getLimitStart()+","+ battAlarmHistory.getLimitEnd()+" "; List<BattAlarmHistory> list=sqlExecuteService.executeQuery_call(sql, new CallBack() { @Override public List getResults(ResultSet rs) throws SQLException { List list=new ArrayList(); while (rs.next()){ BattAlarmHis data=new BattAlarmHis(); BattAlarmHistory data=new BattAlarmHistory(); data.setNum(rs.getInt("num")); data.setBinfId(rs.getInt("binf_id")); data.setAlmStartTime(rs.getTimestamp("alm_start_time")); src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -3,7 +3,7 @@ import com.github.pagehelper.PageInfo; import com.whyc.factory.ThreadPoolExecutorFactory; import com.whyc.mapper.CommonMapper; import com.whyc.pojo.db_alarm.BattAlarmHis; import com.whyc.pojo.db_alarm.BattAlarmHistory; import com.whyc.service.SubTableService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,13 +68,13 @@ } pool.execute(()-> { //====== 根据不同类型类型对象对应调整 ====== if (pojo instanceof BattAlarmHis) { BattAlarmHis battAlarmHis = new BattAlarmHis(); BeanUtils.copyProperties(pojo,battAlarmHis); battAlarmHis.setAlmStartTime(queryTime.get(0)); battAlarmHis.setAlmEndTime(queryTime.get(1)); battAlarmHis.setRecordYear(tableName); int currentCount = service.getBattHisCount(battAlarmHis); if (pojo instanceof BattAlarmHistory) { BattAlarmHistory battAlarmHistory = new BattAlarmHistory(); BeanUtils.copyProperties(pojo, battAlarmHistory); battAlarmHistory.setAlmStartTime(queryTime.get(0)); battAlarmHistory.setAlmEndTime(queryTime.get(1)); battAlarmHistory.setRecordYear(tableName); int currentCount = service.getBattHisCount(battAlarmHistory); queryCountMap.put(tableYear, currentCount); } latch.countDown(); @@ -115,16 +115,16 @@ List<Date> queryTime = queryTimeForSubTables.get(key); //====== 根据不同类型类型对象对应调整 ====== String recordYear = key.equals("default") ? tablePrefix : tablePrefix + "_" + key; if(pojo instanceof BattAlarmHis) { BattAlarmHis battAlarmHis = new BattAlarmHis(); BeanUtils.copyProperties(pojo,battAlarmHis); battAlarmHis.setAlmStartTime(queryTime.get(0)); battAlarmHis.setAlmEndTime(queryTime.get(1)); battAlarmHis.setRecordYear(recordYear); if(pojo instanceof BattAlarmHistory) { BattAlarmHistory battAlarmHistory = new BattAlarmHistory(); BeanUtils.copyProperties(pojo, battAlarmHistory); battAlarmHistory.setAlmStartTime(queryTime.get(0)); battAlarmHistory.setAlmEndTime(queryTime.get(1)); battAlarmHistory.setRecordYear(recordYear); List<Integer> limitList = tableAndLimitMap.get(key); battAlarmHis.setLimitStart(limitList.get(0)); battAlarmHis.setLimitEnd(limitList.get(1)); List<BattAlarmHis> list = service.getBattHisList(battAlarmHis); battAlarmHistory.setLimitStart(limitList.get(0)); battAlarmHistory.setLimitEnd(limitList.get(1)); List<BattAlarmHistory> list = service.getBattHisList(battAlarmHistory); dataList.addAll(list); } }