From 73729d9227f8c1af365a09948553975e9805ab68 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 28 四月 2025 08:12:19 +0800
Subject: [PATCH] 推送和导出
---
src/main/java/com/whyc/service/LockInfService.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockInfService.java b/src/main/java/com/whyc/service/LockInfService.java
index 43824ab..2306b2a 100644
--- a/src/main/java/com/whyc/service/LockInfService.java
+++ b/src/main/java/com/whyc/service/LockInfService.java
@@ -284,39 +284,43 @@
map.put("closeNum",0);
map.put("unLoadNum",0);
//鏍规嵁dto涓璼tationid鍜屽寘鏈虹粍id鏌ヨ鍑虹鐞嗙殑lockid
- List<Integer> lockIdList=bjLockMapper.getLocIdByStationidAndBjId(dto.getStationId(),dto.getBaojiId());
- List<LockInf> linfs=mapper.getRealLock(lockIdList);
- //鍖呮満缁勪笅閿佺殑浣嶇疆淇℃伅
- List<LockAddress> addressList=addressMapper.getAddressList(lockIdList);
- //鏈烘埧涓嬫墍鏈夐攣鐨勪綅缃�
- List<LockAddress> AllAddressList=addressMapper.getAllAddress(dto.getStationId());
- if(linfs!=null&&linfs.size()>0){
- map.put("sumLinf",linfs.size());
- Map<Integer, List<LockInf>> onlinemap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockOnline));
- for (Integer state : onlinemap.keySet()) {
- if(state==0){
- map.put("offLineNum", onlinemap.get(0).size());//绂荤嚎
+ try {
+ List<Integer> lockIdList=bjLockMapper.getLocIdByStationidAndBjId(dto.getStationId(),dto.getBaojiId());
+ List<LockInf> linfs=mapper.getRealLock(lockIdList);
+ //鍖呮満缁勪笅閿佺殑浣嶇疆淇℃伅
+ List<LockAddress> addressList=addressMapper.getAddressList(lockIdList);
+ //鏈烘埧涓嬫墍鏈夐攣鐨勪綅缃�
+ List<LockAddress> AllAddressList=addressMapper.getAllAddress(dto.getStationId());
+ if(linfs!=null&&linfs.size()>0){
+ map.put("sumLinf",linfs.size());
+ Map<Integer, List<LockInf>> onlinemap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockOnline));
+ for (Integer state : onlinemap.keySet()) {
+ if(state==0){
+ map.put("offLineNum", onlinemap.get(0).size());//绂荤嚎
+ }
+ if(state==1){
+ map.put("onlineNum", onlinemap.get(1).size());//鍦ㄧ嚎
+ }
}
- if(state==1){
- map.put("onlineNum", onlinemap.get(1).size());//鍦ㄧ嚎
+ Map<Integer, List<LockInf>> openmap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockState));
+ for (Integer open : openmap.keySet()) {
+ if(open==0){
+ map.put("closeNum", openmap.get(0).size());//闂攣
+ }
+ if(open==1){
+ map.put("openNum", openmap.get(1).size());//寮�閿�
+ }
+ if(open==-1){
+ map.put("unLoadNum", openmap.get(-1).size());//鏈畨瑁�
+ }
}
}
- Map<Integer, List<LockInf>> openmap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockState));
- for (Integer open : openmap.keySet()) {
- if(open==0){
- map.put("closeNum", openmap.get(0).size());//闂攣
- }
- if(open==1){
- map.put("openNum", openmap.get(1).size());//寮�閿�
- }
- if(open==-1){
- map.put("unLoadNum", openmap.get(-1).size());//鏈畨瑁�
- }
- }
+ PageInfo pageInfo= PageInfoUtils.list2PageInfo(linfs, dto.getPageNum(), dto.getPageSize());
+ map.put("pageInfo",pageInfo);
+ return new Response().setIV(1,linfs!=null,map,addressList,AllAddressList,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
+ } catch (Exception e) {
+ return new Response().set(1,false,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
}
- PageInfo pageInfo= PageInfoUtils.list2PageInfo(linfs, dto.getPageNum(), dto.getPageSize());
- map.put("pageInfo",pageInfo);
- return new Response().setIV(1,linfs!=null,map,addressList,AllAddressList,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
}
//鏌ヨ閿佺殑淇℃伅鍜宨d鍗�
public Response getLockId(LockIdDto dto) {
--
Gitblit v1.9.1