whyclxw
2025-02-08 c7ce756b2d25b5862ff8446b1b3d2b8a08bb4f8e
实时界面点击查看历史信息
3个文件已修改
20 ■■■■ 已修改文件
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarmHis.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTableService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/util/SubTablePageInfoUtil.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarmHis.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.whyc.pojo.db_area.LockInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -75,5 +76,6 @@
    @ApiModelProperty("结束时间")
    private Date endTime;
    @TableField(exist = false)
    private LockInf linf;
}
src/main/java/com/whyc/service/SubTableService.java
@@ -138,7 +138,7 @@
        return num;
    }
    //锁的告警历史记录
    public List<LockHis> getLockAlmHisList(LockAlarmHis his) {
    public List<LockAlarmHis> getLockAlmHisList(LockAlarmHis his) {
        String sql="SELECT * FROM db_lock_alarm."+ his.getRecordYear()+" history " +
                " where history.lock_id="+  his.getLockId() ;
        if(his.getStartTime()!=null){
@@ -148,7 +148,7 @@
            sql+=" and alm_start_time  <='"+ThreadLocalUtil.format(his.getEndTime(),1)+"' ";
        }
        sql+="  ORDER BY alm_start_time asc  limit "+ his.getLimitStart()+","+ his.getLimitEnd()+" ";
        List<LockHis> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
        List<LockAlarmHis> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List list=new ArrayList();
src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -3,6 +3,9 @@
import com.github.pagehelper.PageInfo;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
import com.whyc.mapper.LockInfMapper;
import com.whyc.pojo.db_area.LockInf;
import com.whyc.pojo.db_lock_alarm.LockAlarm;
import com.whyc.pojo.db_lock_alarm.LockAlarmHis;
import com.whyc.pojo.db_lock_his.LockHis;
import com.whyc.service.SubTableService;
@@ -27,6 +30,9 @@
    @Autowired
    private SubTableService service;
    @Autowired(required = false)
    private LockInfMapper linfMapper;
@@ -97,7 +103,11 @@
                List<Integer> limitList = tableAndLimitMap.get(key);
                his.setLimitStart(limitList.get(0));
                his.setLimitEnd(limitList.get(1));
                List<LockHis> list =  service.getLockAlmHisList(his);
                List<LockAlarmHis> list =  service.getLockAlmHisList(his);
                for (LockAlarmHis alm:list) {
                    LockInf linf=linfMapper.getlinfBylockId(alm.getLockId());
                    alm.setLinf(linf);
                }
                dataList.addAll(list);
            }