From 69962e25b95593a0138f7be2b49dd51fa76ab8d7 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期六, 14 十月 2023 17:13:58 +0800 Subject: [PATCH] 增加大华sdk初始化环境 增加大华设备登录 增加大华ptz获取和云台控制接口 增加相机通用SDK接口 --- ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java index 5ca3909..b04585d 100644 --- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java @@ -661,14 +661,14 @@ int planNum = dayNum+onceNum; //杩欏ぉ鎬诲叴瓒g偣鏁� int wellNum = dayWell+onceWell; - QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_id",userId).like("record_time",ymd); - List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper); //宸叉墦鍗℃�绘潯鏁� + QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id",userId).like("record_time",ymd).isNull("del"); + List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper); int num = list.size(); //搴旀墦鍗℃�绘潯鏁� int record = planNum*wellNum; - if(num==record){ + if(num>=record){ recordBoolean = true; } } -- Gitblit v1.9.3