From 3a6d4de77253bb86aed3383f9b9c54be5c25752c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 21 四月 2025 11:13:05 +0800
Subject: [PATCH] 锁的位置管理
---
src/main/java/com/whyc/service/LockInfService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockInfService.java b/src/main/java/com/whyc/service/LockInfService.java
index e358f20..7972956 100644
--- a/src/main/java/com/whyc/service/LockInfService.java
+++ b/src/main/java/com/whyc/service/LockInfService.java
@@ -10,6 +10,7 @@
import com.whyc.dto.RealDto;
import com.whyc.dto.Response;
import com.whyc.mapper.*;
+import com.whyc.pojo.plus_inf.LockAddress;
import com.whyc.pojo.plus_inf.LockInf;
import com.whyc.pojo.plus_inf.StationInf;
import com.whyc.pojo.plus_lock_ram.LockIdcard;
@@ -46,6 +47,10 @@
@Autowired(required = false)
private LockIdcardMapper idcardMapper;
+
+ @Autowired(required = false)
+ private LockAddressMapper addressMapper;
+
@Autowired
private ProcessSurveyService processSurveyService;
@@ -250,6 +255,8 @@
//鏍规嵁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);
if(linfs!=null&&linfs.size()>0){
map.put("sumLinf",linfs.size());
Map<Integer, List<LockInf>> onlinemap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockOnline));
@@ -276,7 +283,7 @@
}
PageInfo pageInfo= PageInfoUtils.list2PageInfo(linfs, dto.getPageNum(), dto.getPageSize());
map.put("pageInfo",pageInfo);
- return new Response().setII(1,linfs!=null,map,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
+ return new Response().setIII(1,linfs!=null,map,addressList,"瀹炴椂鑾峰彇鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�");
}
//鏌ヨ閿佺殑淇℃伅鍜宨d鍗�
public Response getLockId(LockIdDto dto) {
--
Gitblit v1.9.1