whyclxw
2025-03-25 a7fef2846505b08e0711345b17902e7381612d23
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);
            }