From c510153793c2a4e0dc7d845d8944315776088320 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 22 四月 2025 08:12:27 +0800
Subject: [PATCH] 锁的位置管理
---
src/main/java/com/whyc/service/LockInfService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockInfService.java b/src/main/java/com/whyc/service/LockInfService.java
index 7972956..3067bae 100644
--- a/src/main/java/com/whyc/service/LockInfService.java
+++ b/src/main/java/com/whyc/service/LockInfService.java
@@ -255,8 +255,10 @@
//鏍规嵁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));
@@ -283,7 +285,7 @@
}
PageInfo pageInfo= PageInfoUtils.list2PageInfo(linfs, dto.getPageNum(), dto.getPageSize());
map.put("pageInfo",pageInfo);
- return new Response().setIII(1,linfs!=null,map,addressList,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
+ return new Response().setIV(1,linfs!=null,map,addressList,AllAddressList,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
}
//鏌ヨ閿佺殑淇℃伅鍜宨d鍗�
public Response getLockId(LockIdDto dto) {
--
Gitblit v1.9.1