From 61ee4370522cabe7453e55ea0b8da547adaea3fc Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng>
Date: Wed, 14 Jun 2023 18:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8F=B0=E7=AB=99=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=A2=9E=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/entity/SysUserFocusStation.java   |  6 ++++++
 .../impl/SysUserFocusStationServiceImpl.java  | 20 +++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java
index 0b20e647..394e13b9 100644
--- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java
+++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java
@@ -39,4 +39,10 @@ public class SysUserFocusStation implements Serializable {
     @TableField(value = "create_by")
     private String createBy;
 
+    @TableField(exist = false)
+    private Double lon;
+
+    @TableField(exist = false)
+    private Double lat;
+
 }
diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
index 00df0993..6d8c6ce0 100644
--- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
+++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
@@ -6,32 +6,44 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.entity.SysUser;
 import org.jeecg.modules.entity.SysUserFocusStation;
 import org.jeecg.modules.mapper.SysUserFocusStationMapper;
 import org.jeecg.modules.mapper.SysUserMapper;
 import org.jeecg.modules.service.ISysUserFocusStationService;
+import org.jeecg.modules.system.entity.GardsStations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Service("sysUserFocusStationService")
 public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStationMapper, SysUserFocusStation> implements ISysUserFocusStationService {
 
+    @Autowired
+    private RedisUtil redisUtil;
     @Autowired
     private SysUserMapper sysUserMapper;
 
     @Override
     public List<SysUserFocusStation> findList() {
+        //查询全部台站信息
+        HashMap<String, Object> stationInfoMap = (HashMap<String, Object>) redisUtil.get("stationInfoMap");
         List<SysUserFocusStation> sysUserFocusStations = this.baseMapper.selectList(new LambdaQueryWrapper<>());
         if (CollectionUtils.isNotEmpty(sysUserFocusStations)){
+            sysUserFocusStations.stream().forEach(item->{
+                if (CollectionUtils.isNotEmpty(stationInfoMap)){
+                    if (Objects.nonNull(stationInfoMap.get(item.getStationId()))){
+                        GardsStations stations = (GardsStations) stationInfoMap.get(item.getStationId());
+                        item.setLon(stations.getLon());
+                        item.setLat(stations.getLat());
+                    }
+                }
+            });
             return sysUserFocusStations;
         }
         return Collections.emptyList();