whyclxw
2025-02-17 70f6a8d6b295e8149e209b9ca9add886c57a4e11
src/main/java/com/whyc/service/LockAlarmHisService.java
@@ -30,7 +30,7 @@
    //查询锁告警的历史状态
    public Response getLockAlmHis(Integer areaId, Integer almId,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
    public Response getLockAlmHis(Integer areaId, String almIds,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
        LockAlarmHis his=new LockAlarmHis();
        if(areaId!=null){
            List<Integer> areaList=new ArrayList();
@@ -47,7 +47,7 @@
                his.setLids(lockIdList);
            }
        }
        his.setAlmId(almId);
        his.setAlmIds(almIds);
        PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
                ,"db_lock_alarm","tb_lock_alarm",his);
        return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"查询锁告警的历史状态");