whyclxw
2025-05-15 96510a549bfb313920bf297b28089c4cf57f0146
src/main/java/com/whyc/service/LockHisService.java
@@ -29,7 +29,7 @@
    //实时界面点击查看历史信息
    public Response getLockHisWithReal(int lockId, String startTime, String endTime) throws ParseException {
        LockHisDto his=new LockHisDto();
        LockHis his=new LockHis();
        his.setLockId(lockId);
        List<LockHis> list=util.getLockHisWithReal(ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
                ,"plus_lock_his","tb_lock_his_"+lockId,his);
@@ -54,7 +54,7 @@
        //获取当天的结束时间
        Date nowendTime = new Date(date.getYear(), date.getMonth(), date.getDate(), 23, 59, 59);
        List<LockHis> nowList =util.getLockHisWithReal(nowstartTime,nowendTime
                ,"db_lock_his","tb_lock_his_"+lockId,his);
                ,"plus_lock_his","tb_lock_his_"+lockId,his);
        Map<Integer, List<LockHis>> nowstatemap = nowList.stream().collect(Collectors.groupingBy(LockHis::getLockState));
        for (Integer state : nowstatemap.keySet()) {
            if (state == 0) {