From cda74cda7ece9e046b0350a22017567a90702001 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 08 一月 2025 09:04:50 +0800
Subject: [PATCH] 区域管理员点击查看开锁操作记录--区域管理员
---
src/main/java/com/whyc/service/AreaInfService.java | 103 ++++++++++++++++++++++-----------------------------
1 files changed, 44 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/whyc/service/AreaInfService.java b/src/main/java/com/whyc/service/AreaInfService.java
index e4216cc..2d45f22 100644
--- a/src/main/java/com/whyc/service/AreaInfService.java
+++ b/src/main/java/com/whyc/service/AreaInfService.java
@@ -9,6 +9,7 @@
import com.whyc.pojo.db_area.AreaUser;
import com.whyc.pojo.db_area.KeyInf;
import com.whyc.pojo.db_area.LockInf;
+import com.whyc.pojo.db_lock_ram.LockCtlLog;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
@@ -43,7 +44,11 @@
@Autowired(required = false)
private AreaUserService areaUserService;
- //鏌ョ湅褰撳墠鐢ㄦ埛绠＄悊鐨勬墍鏈夊尯鍩�
+ @Autowired(required = false)
+ private LockCtlLogService ctlLogService;
+
+
+ //鏌ョ湅褰撳墠鐢ㄦ埛绠＄悊鐨勬墍鏈夊尯鍩�
public List getAllAreaUser(int uid,int urole){
//鑾峰彇鐢ㄦ埛鎵�绠＄悊鐨勫尯鍩�
List<Integer> list =areaUserService.setAreaId(uid);
@@ -254,64 +259,44 @@
return new Response().setII(1,linfs!=null,linfs,"鍖哄煙绠＄悊鍛樼偣鍑绘寚瀹氬尯鍩熸煡鐪嬫墍鏈夌殑閿佷俊鎭�--鍖哄煙绠＄悊鍛�");
}
- //鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夌敤鎴蜂俊鎭�
- /* public Response getUinfById(Integer id, int pageNum, int pageSize) {
- //鑾峰彇鑾峰彇id涓嬫墍鏈夌殑鍖哄煙id
- List uinfList=new ArrayList();
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("id",id);
- wrapper.last("limit 1");
- AreaInf ainf=mapper.selectOne(wrapper);
- if(ainf!=null){
- uinfList.add(ainf.getAreaUname());
- }
- getAllUinfId(id,uinfList);
- QueryWrapper wrapper1=new QueryWrapper();
- wrapper1.select("uid","uname","CREATE_TIME");
- wrapper1.in("uname",uinfList);
- List<UserInf> list=uInfMapper.selectList(wrapper1);
- PageInfo pageInfo=PageInfoUtils.list2PageInfo(list,pageNum,pageSize);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夌敤鎴蜂俊鎭�");
- }*/
-
- /* //鑾峰彇鑾峰彇id涓嬫墍鏈夌殑鍖哄煙鐢ㄦ埛鍚�
- private void getAllUinfId(Integer id,List uinfList) {
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("parent_id",id);
- List<AreaInf> list=mapper.selectList(wrapper);
- if(list!=null){
- for (AreaInf painf:list) {
- uinfList.add(painf.getAreaUname());
- getAllUinfId(painf.getId(),uinfList);
+ //鍖哄煙绠＄悊鍛樼偣鍑绘煡鐪嬪紑閿佹搷浣滆褰�--鍖哄煙绠＄悊鍛�
+ public Response getCtlog(int pageNum, int pageSize) {
+ Map<String,Object> map=new HashMap<>();
+ PageInfo pageInfo=new PageInfo();
+ map.put("sumLog",0);
+ map.put("goodLogNum",0);
+ map.put("errorLogNum",0);
+ map.put("allLogs",pageInfo);
+ UserInf uinf= ActionUtil.getUser();
+ //鏌ョ湅鎵�鏈夊尯鍩�
+ List areaList=getAllAreaUser(uinf.getUid(),uinf.getUrole());
+ //鏌ョ湅鍖哄煙涓嬫墍鏈夌殑閿�
+ QueryWrapper linfWrapper=new QueryWrapper();
+ linfWrapper.in("area_id",areaList);
+ List<LockInf> linfs=linfMapper.selectList(linfWrapper);
+ if(linfs!=null&&linfs.size()>0){
+ List lockIds=linfs.stream().map(LockInf::getLockId) // 鎻愬彇鐢ㄦ埛鍚�
+ .collect(Collectors.toList()); // 杞崲涓哄垪琛�*/
+ //鑾峰彇閿佺殑鏃ュ織
+ List<LockCtlLog> logList=ctlLogService.getAllLog(lockIds);
+ if(logList!=null&&logList.size()>0){
+ map.put("sumLog",logList.size());
+ Map<Integer, List<LockCtlLog>> logmap = logList.stream().collect(Collectors.groupingBy(LockCtlLog::getCtlResult));
+ for (Integer result : logmap.keySet()) {
+ if(result==0){
+ map.put("errorLogNum", logmap.get(0).size());//澶辫触
+ }
+ if(result==1){
+ map.put("goodLogNum", logmap.get(1).size());//鎴愬姛
+ }
+ }
+ pageInfo=PageInfoUtils.list2PageInfo(logList,pageNum,pageSize);
+ map.put("allLogs",pageInfo);
}
+
}
- }*/
- //鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夐挜鍖欎俊鎭�
- /* public Response getKinfById(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<KeyInf> list=kinfMapper.selectList(wrapper);
- 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,"鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夊紑閿佹棩蹇�");
- }*/
+ return new Response().setII(1,true,map,"鍖哄煙绠＄悊鍛樼偣鍑绘煡鐪嬪紑閿佹搷浣滆褰�--鍖哄煙绠＄悊鍛�");
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1