From eccb0480d1e57337db5f56d57fb5ed3f91b57e7f Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Tue, 20 Feb 2024 18:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E5=8F=B0=E7=AB=99=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1=E5=8F=B0=E7=AB=99?=
 =?UTF-8?q?=E4=B8=8E=E5=85=B3=E6=B3=A8=E5=8F=B0=E7=AB=99=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysUserFocusStationServiceImpl.java  | 44 ++++++-------------
 1 file changed, 13 insertions(+), 31 deletions(-)

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 7c10d296..cb9a031e 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
@@ -241,16 +241,19 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStat
                     if (Objects.nonNull(stationInfoMap.get(item.getStationId()))){
                         //获取台站信息
                         GardsStations stations = (GardsStations) stationInfoMap.get(item.getStationId());
-                        //获取台站类型
-                        String stationType = stationTypeUtil.getStationType(stations.getStationId());
-                        item.setStationType(stationType);
-                        item.setStationCode(stations.getStationCode());
-                        item.setLon(stations.getLon());
-                        item.setLat(stations.getLat());
-                        item.setStatus(stations.getStatus());
-                        item.setAltitude(Objects.isNull(stations.getElevation())?"--":stations.getElevation()+"m");
-                        item.setScheduling(false);
-                        resultList.add(item);
+                        //如果排班任务台站id数组中 不包含当前关注台站id  则关注台站正常存储
+                        if (!taskStation.contains(stations.getStationId().toString())) {
+                            //获取台站类型
+                            String stationType = stationTypeUtil.getStationType(stations.getStationId());
+                            item.setStationType(stationType);
+                            item.setStationCode(stations.getStationCode());
+                            item.setLon(stations.getLon());
+                            item.setLat(stations.getLat());
+                            item.setStatus(stations.getStatus());
+                            item.setAltitude(Objects.isNull(stations.getElevation())?"--":stations.getElevation()+"m");
+                            item.setScheduling(false);
+                            resultList.add(item);
+                        }
                     }
                 }
             }
@@ -282,27 +285,6 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStat
                 }
             }
         }
-        List<Integer> removeIndex = new LinkedList<>();
-        for (int i=0; i<resultList.size(); i++) {
-            SysUserFocusStationStation nowStation = resultList.get(i);
-            for (int j=i+1; j<resultList.size(); j++) {
-                SysUserFocusStationStation compareStation = resultList.get(j);
-                //如果当前台站与对比台站的台站编码一致
-                if (nowStation.getStationCode().equals(compareStation.getStationCode())) {
-                    //如果当前台站不是排班任务的台站  对比的台站是排班任务台站 将当前台站的下标记录用于移除处理
-                    if (!nowStation.isScheduling() && compareStation.isScheduling()) {
-                        removeIndex.add(i);
-                    } else {//否则移除对比台站 将对比台站下标记录用于移除处理
-                        removeIndex.add(j);
-                    }
-                }
-            }
-        }
-        if (CollectionUtils.isNotEmpty(removeIndex)) {
-            for (int index:removeIndex) {
-                resultList.remove(index);
-            }
-        }
         if (CollectionUtils.isNotEmpty(resultList)) {
             resultList = resultList.stream().distinct().sorted(Comparator.comparing(SysUserFocusStationStation::getStationCode)).collect(Collectors.toList());
         }