From a7fef2846505b08e0711345b17902e7381612d23 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 25 三月 2025 14:02:16 +0800
Subject: [PATCH] 查询锁的蓝牙开启时间段记录添加area_path
---
src/main/java/com/whyc/service/LockCtlLogService.java | 41 ++++-------------------------------------
1 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockCtlLogService.java b/src/main/java/com/whyc/service/LockCtlLogService.java
index 5e728bf..02edd61 100644
--- a/src/main/java/com/whyc/service/LockCtlLogService.java
+++ b/src/main/java/com/whyc/service/LockCtlLogService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.dto.HomeCtlGroupDto;
import com.whyc.dto.Response;
import com.whyc.mapper.LockCtlLogMapper;
import com.whyc.mapper.LockInfMapper;
+import com.whyc.pojo.db_area.AreaUser;
import com.whyc.pojo.db_area.LockInf;
import com.whyc.pojo.db_lock_ram.LockCtlLog;
import com.whyc.pojo.db_user.UserInf;
@@ -13,51 +15,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class LockCtlLogService {
@Autowired(required = false)
private LockCtlLogMapper mapper;
- @Autowired(required = false)
- private LockInfMapper linfmapper;
-
- //鏌ヨ寮�閿佹棩蹇�
- public Response getLockLog(LockCtlLog log, int pageNum, int pageSize) {
- PageHelper.startPage(pageNum,pageSize);
- QueryWrapper wrapper=new QueryWrapper();
- if(log.getLockId()!=null){
- wrapper.eq("lock_id",log.getLockId());
- }
- if(log.getCtlResult()!=null){
- wrapper.eq("ctl_result",log.getCtlResult());
- }
- if(log.getCtlType()!=null){
- wrapper.eq("ctl_type",log.getCtlType());
- }
- if(log.getCtlUname()!=null){
- wrapper.eq("ctl_uname",log.getCtlUname());
- }
- if(log.getStartTime()!=null){
- wrapper.gt("ctl_time",log.getStartTime());
- }
- if(log.getEndTime()!=null){
- wrapper.lt("ctl_time",log.getEndTime());
- }
- wrapper.orderByDesc("ctl_time");
- List<LockCtlLog> list=mapper.selectList(wrapper);
- for (LockCtlLog l:list) {
- QueryWrapper wrapper1=new QueryWrapper();
- wrapper1.eq("lock_id",l.getLockId());
- wrapper1.last("limit 1");
- LockInf linf=linfmapper.selectOne(wrapper1);
- l.setLockName(linf.getLockName());
- }
- PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鏈�杩戠殑寮�閿佹棩蹇�");
- }
//鑾峰彇寮�閿侀敊璇殑鏃ュ織
public List getAllErrorLog(List lockIds) {
List<LockCtlLog> list=mapper.getAllErrorLog(lockIds);
--
Gitblit v1.9.1