From e13263f5567d0b3ea1129626b8a53244e47ae986 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 十二月 2024 09:28:50 +0800
Subject: [PATCH] 查询所有区域下所有开锁信息
---
src/main/java/com/whyc/service/AreaInfService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/AreaInfService.java b/src/main/java/com/whyc/service/AreaInfService.java
index b0f18aa..87c0def 100644
--- a/src/main/java/com/whyc/service/AreaInfService.java
+++ b/src/main/java/com/whyc/service/AreaInfService.java
@@ -4,10 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
-import com.whyc.mapper.AreaInfMapper;
-import com.whyc.mapper.KeyInfMapper;
-import com.whyc.mapper.LockInfMapper;
-import com.whyc.mapper.UserInfMapper;
+import com.whyc.mapper.*;
import com.whyc.pojo.db_area.AreaInf;
import com.whyc.pojo.db_area.KeyInf;
import com.whyc.pojo.db_area.LockInf;
@@ -19,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class AreaInfService {
@@ -34,6 +32,9 @@
@Autowired(required = false)
private UserInfMapper uInfMapper;
+
+ @Autowired(required = false)
+ private LockCtlLogMapper ctlLogMapper;
//鏌ヨ鎵�鏈夊尯鍩熶俊鎭�
@@ -191,4 +192,20 @@
PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夐挜鍖欎俊鎭�");
}
+ //鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夊紑閿佹棩蹇�
+ public Response getLogById(Integer id, int pageNum, int pageSize) {
+ //鑾峰彇鑾峰彇id涓嬫墍鏈夌殑鍖哄煙id
+ List areaList=new ArrayList();
+ areaList.add(id);
+ getAllAreaId(id,areaList);
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.in("area_id",areaList);
+ List<LockInf> lockList=linfMapper.selectList(wrapper);
+ List<Integer> lockIdList=lockList.stream().map(LockInf::getLockId).collect(Collectors.toList());
+ QueryWrapper logwrapper=new QueryWrapper();
+ wrapper.in("lock_id",lockIdList);
+ List<KeyInf> list=ctlLogMapper.selectList(logwrapper);
+ PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
+ return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夊紑閿佹棩蹇�");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1