diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 3c6410c..f889a9e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -54,24 +54,41 @@
     Page<DeviceMonitorResponseDTO> deviceMonitorList(Page<DeviceMonitorResponseDTO> page, @Param("request") DeviceMonitorRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
     
-    @Select("WITH station_temp as ( " +
-            "SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,    " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time,'in' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_IN_CODE=sv.point  " +
-            " " +
-            "UNION ALL SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,   " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time ,'out' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_OUT_CODE=sv.point ) " +
-
-            "  SELECT  bl.LEDGER_NAME as tagName,st.TAG_NUMBER,st.OWNER_SHIP,   " +
-            "             st.AREA,    " +
-            "             st.TYPE,st.press_type,st.value,st.updt_time as logTime,st.flag ,bl.LNG_GAODE,bl.LAT_GAODE from " +
-
-            " station_temp st  " +
-            " LEFT JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
-            "             AND bl.valid = '1'    " +
-            "             AND bl.type = '2'")
+    @Select("WITH station_temp AS ( " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'in' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_IN_CODE = sv.point UNION ALL " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'out' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_OUT_CODE = sv.point  " +
+            "   ) SELECT " +
+            "    bl.LEDGER_NAME AS tagName, " +
+            "   st.TAG_NUMBER, " +
+            "   st.TYPE, " +
+            "   st.press_type, " +
+            "   st.value, " +
+            "   st.updt_time AS logTime, " +
+            "   st.flag, " +
+            "   bl.LNG_GAODE, " +
+            "   bl.LAT_GAODE  " +
+            "FROM " +
+            "   station_temp st " +
+            "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
+            "   where  bl.valid = '1'  " +
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
     List<StationDTO> dataStation();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 3c6410c..f889a9e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -54,24 +54,41 @@
     Page<DeviceMonitorResponseDTO> deviceMonitorList(Page<DeviceMonitorResponseDTO> page, @Param("request") DeviceMonitorRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
     
-    @Select("WITH station_temp as ( " +
-            "SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,    " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time,'in' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_IN_CODE=sv.point  " +
-            " " +
-            "UNION ALL SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,   " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time ,'out' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_OUT_CODE=sv.point ) " +
-
-            "  SELECT  bl.LEDGER_NAME as tagName,st.TAG_NUMBER,st.OWNER_SHIP,   " +
-            "             st.AREA,    " +
-            "             st.TYPE,st.press_type,st.value,st.updt_time as logTime,st.flag ,bl.LNG_GAODE,bl.LAT_GAODE from " +
-
-            " station_temp st  " +
-            " LEFT JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
-            "             AND bl.valid = '1'    " +
-            "             AND bl.type = '2'")
+    @Select("WITH station_temp AS ( " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'in' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_IN_CODE = sv.point UNION ALL " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'out' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_OUT_CODE = sv.point  " +
+            "   ) SELECT " +
+            "    bl.LEDGER_NAME AS tagName, " +
+            "   st.TAG_NUMBER, " +
+            "   st.TYPE, " +
+            "   st.press_type, " +
+            "   st.value, " +
+            "   st.updt_time AS logTime, " +
+            "   st.flag, " +
+            "   bl.LNG_GAODE, " +
+            "   bl.LAT_GAODE  " +
+            "FROM " +
+            "   station_temp st " +
+            "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
+            "   where  bl.valid = '1'  " +
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 56e49e0..079fde2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -36,6 +36,7 @@
 import com.casic.missiles.util.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 3c6410c..f889a9e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -54,24 +54,41 @@
     Page<DeviceMonitorResponseDTO> deviceMonitorList(Page<DeviceMonitorResponseDTO> page, @Param("request") DeviceMonitorRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
     
-    @Select("WITH station_temp as ( " +
-            "SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,    " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time,'in' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_IN_CODE=sv.point  " +
-            " " +
-            "UNION ALL SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,   " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time ,'out' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_OUT_CODE=sv.point ) " +
-
-            "  SELECT  bl.LEDGER_NAME as tagName,st.TAG_NUMBER,st.OWNER_SHIP,   " +
-            "             st.AREA,    " +
-            "             st.TYPE,st.press_type,st.value,st.updt_time as logTime,st.flag ,bl.LNG_GAODE,bl.LAT_GAODE from " +
-
-            " station_temp st  " +
-            " LEFT JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
-            "             AND bl.valid = '1'    " +
-            "             AND bl.type = '2'")
+    @Select("WITH station_temp AS ( " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'in' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_IN_CODE = sv.point UNION ALL " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'out' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_OUT_CODE = sv.point  " +
+            "   ) SELECT " +
+            "    bl.LEDGER_NAME AS tagName, " +
+            "   st.TAG_NUMBER, " +
+            "   st.TYPE, " +
+            "   st.press_type, " +
+            "   st.value, " +
+            "   st.updt_time AS logTime, " +
+            "   st.flag, " +
+            "   bl.LNG_GAODE, " +
+            "   bl.LAT_GAODE  " +
+            "FROM " +
+            "   station_temp st " +
+            "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
+            "   where  bl.valid = '1'  " +
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 56e49e0..079fde2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -36,6 +36,7 @@
 import com.casic.missiles.util.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index e2ec84e..09007b7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.enums.DeviceTypeEnum;
@@ -22,6 +23,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,6 +74,8 @@
 
     }
 
+
+    @Async
     @Transactional
     @Override
     public boolean processAcceptGasData(Map dataParams) {
@@ -118,6 +122,8 @@
     }
 
 
+
+
     private void processSingleData(PanDataDTO panDataDTO) {
         try {
             String devCode = panDataDTO.getDeviceCode();
@@ -182,7 +188,13 @@
 //    public boolean processAcceptGasData(Map dataParams) {
 //        JSONObject jsonObject = new JSONObject(dataParams);
 //        JSONArray jsonArray = jsonObject.getJSONArray("data");
+//        jsonArray.parallelStream().forEach(item -> {
+//            processSingleData(new PanDataDTO(item));
+//        });
 //        String devCode = "";
+//        jsonArray.stream().forEach(item -> {
+//            // 处理单个数据项的逻辑，这里也可以使用异步方式调用processDataItem方法
+//        });
 //        for (int i = 0; i < jsonArray.size(); i++) {
 //            try {
 //                devCode = ((JSONObject) jsonArray.get(i)).getString("deviceCode");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 3c6410c..f889a9e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -54,24 +54,41 @@
     Page<DeviceMonitorResponseDTO> deviceMonitorList(Page<DeviceMonitorResponseDTO> page, @Param("request") DeviceMonitorRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
     
-    @Select("WITH station_temp as ( " +
-            "SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,    " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time,'in' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_IN_CODE=sv.point  " +
-            " " +
-            "UNION ALL SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,   " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time ,'out' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_OUT_CODE=sv.point ) " +
-
-            "  SELECT  bl.LEDGER_NAME as tagName,st.TAG_NUMBER,st.OWNER_SHIP,   " +
-            "             st.AREA,    " +
-            "             st.TYPE,st.press_type,st.value,st.updt_time as logTime,st.flag ,bl.LNG_GAODE,bl.LAT_GAODE from " +
-
-            " station_temp st  " +
-            " LEFT JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
-            "             AND bl.valid = '1'    " +
-            "             AND bl.type = '2'")
+    @Select("WITH station_temp AS ( " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'in' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_IN_CODE = sv.point UNION ALL " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'out' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_OUT_CODE = sv.point  " +
+            "   ) SELECT " +
+            "    bl.LEDGER_NAME AS tagName, " +
+            "   st.TAG_NUMBER, " +
+            "   st.TYPE, " +
+            "   st.press_type, " +
+            "   st.value, " +
+            "   st.updt_time AS logTime, " +
+            "   st.flag, " +
+            "   bl.LNG_GAODE, " +
+            "   bl.LAT_GAODE  " +
+            "FROM " +
+            "   station_temp st " +
+            "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
+            "   where  bl.valid = '1'  " +
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 56e49e0..079fde2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -36,6 +36,7 @@
 import com.casic.missiles.util.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index e2ec84e..09007b7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.enums.DeviceTypeEnum;
@@ -22,6 +23,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,6 +74,8 @@
 
     }
 
+
+    @Async
     @Transactional
     @Override
     public boolean processAcceptGasData(Map dataParams) {
@@ -118,6 +122,8 @@
     }
 
 
+
+
     private void processSingleData(PanDataDTO panDataDTO) {
         try {
             String devCode = panDataDTO.getDeviceCode();
@@ -182,7 +188,13 @@
 //    public boolean processAcceptGasData(Map dataParams) {
 //        JSONObject jsonObject = new JSONObject(dataParams);
 //        JSONArray jsonArray = jsonObject.getJSONArray("data");
+//        jsonArray.parallelStream().forEach(item -> {
+//            processSingleData(new PanDataDTO(item));
+//        });
 //        String devCode = "";
+//        jsonArray.stream().forEach(item -> {
+//            // 处理单个数据项的逻辑，这里也可以使用异步方式调用processDataItem方法
+//        });
 //        for (int i = 0; i < jsonArray.size(); i++) {
 //            try {
 //                devCode = ((JSONObject) jsonArray.get(i)).getString("deviceCode");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
index 13ee2ec..377588c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
@@ -119,6 +119,11 @@
                 AND bt.IS_USED = '1'
                 AND FIND_IN_SET( '2', bt.WATCH_TYPE )
                 AND bd.MONITOR_TYPE = '1'
+            <where>
+                <if test="deptIds != null and deptIds !=''">
+                    and bv.deptid in (${deptIds})
+                </if>
+            </where>
     </select>
 
     <select id="getWatchData" resultType="java.util.Map">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 3c6410c..f889a9e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -54,24 +54,41 @@
     Page<DeviceMonitorResponseDTO> deviceMonitorList(Page<DeviceMonitorResponseDTO> page, @Param("request") DeviceMonitorRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
     
-    @Select("WITH station_temp as ( " +
-            "SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,    " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time,'in' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_IN_CODE=sv.point  " +
-            " " +
-            "UNION ALL SELECT bs.TAG_NUMBER,   " +
-            "             bs.OWNER_SHIP,   " +
-            "             bs.AREA,   " +
-            "             bs.TYPE,bs.press_type,sv.value,sv.updt_time ,'out' as 'flag' FROM `bus_station` bs LEFT JOIN scada_view sv on bs.PRESS_OUT_CODE=sv.point ) " +
-
-            "  SELECT  bl.LEDGER_NAME as tagName,st.TAG_NUMBER,st.OWNER_SHIP,   " +
-            "             st.AREA,    " +
-            "             st.TYPE,st.press_type,st.value,st.updt_time as logTime,st.flag ,bl.LNG_GAODE,bl.LAT_GAODE from " +
-
-            " station_temp st  " +
-            " LEFT JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
-            "             AND bl.valid = '1'    " +
-            "             AND bl.type = '2'")
+    @Select("WITH station_temp AS ( " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'in' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_IN_CODE = sv.point UNION ALL " +
+            "   SELECT " +
+            "  bs.TAG_NUMBER, " +
+            "  bs.TYPE, " +
+            "  bs.press_type, " +
+            "  sv.value, " +
+            "  sv.updt_time, " +
+            "  'out' AS 'flag'  " +
+            "   FROM " +
+            "  `bus_station` bs " +
+            "  LEFT JOIN scada_view sv ON bs.PRESS_OUT_CODE = sv.point  " +
+            "   ) SELECT " +
+            "    bl.LEDGER_NAME AS tagName, " +
+            "   st.TAG_NUMBER, " +
+            "   st.TYPE, " +
+            "   st.press_type, " +
+            "   st.value, " +
+            "   st.updt_time AS logTime, " +
+            "   st.flag, " +
+            "   bl.LNG_GAODE, " +
+            "   bl.LAT_GAODE  " +
+            "FROM " +
+            "   station_temp st " +
+            "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
+            "   where  bl.valid = '1'  " +
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 56e49e0..079fde2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -36,6 +36,7 @@
 import com.casic.missiles.util.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index e2ec84e..09007b7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.enums.DeviceTypeEnum;
@@ -22,6 +23,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,6 +74,8 @@
 
     }
 
+
+    @Async
     @Transactional
     @Override
     public boolean processAcceptGasData(Map dataParams) {
@@ -118,6 +122,8 @@
     }
 
 
+
+
     private void processSingleData(PanDataDTO panDataDTO) {
         try {
             String devCode = panDataDTO.getDeviceCode();
@@ -182,7 +188,13 @@
 //    public boolean processAcceptGasData(Map dataParams) {
 //        JSONObject jsonObject = new JSONObject(dataParams);
 //        JSONArray jsonArray = jsonObject.getJSONArray("data");
+//        jsonArray.parallelStream().forEach(item -> {
+//            processSingleData(new PanDataDTO(item));
+//        });
 //        String devCode = "";
+//        jsonArray.stream().forEach(item -> {
+//            // 处理单个数据项的逻辑，这里也可以使用异步方式调用processDataItem方法
+//        });
 //        for (int i = 0; i < jsonArray.size(); i++) {
 //            try {
 //                devCode = ((JSONObject) jsonArray.get(i)).getString("deviceCode");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
index 13ee2ec..377588c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDamageMonitorMapper.xml
@@ -119,6 +119,11 @@
                 AND bt.IS_USED = '1'
                 AND FIND_IN_SET( '2', bt.WATCH_TYPE )
                 AND bd.MONITOR_TYPE = '1'
+            <where>
+                <if test="deptIds != null and deptIds !=''">
+                    and bv.deptid in (${deptIds})
+                </if>
+            </where>
     </select>
 
     <select id="getWatchData" resultType="java.util.Map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
index c9a2594..7fd7d9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
@@ -31,20 +31,20 @@
     private String latGaode;
 
 
-    @ApiModelProperty("产权性质")
-    private String ownerShip;
+//    @ApiModelProperty("产权性质")
+//    private String ownerShip;
+//
+//    @ApiModelProperty("区域")
+//    private String area;
 
-    @ApiModelProperty("区域")
-    private String area;
-
-    @ApiModelProperty("进站压力")
-    private String inPress;
+//    @ApiModelProperty("进站压力")
+//    private String inPress;
 
     @ApiModelProperty("压力级制")
     private String pressType;
 
-    @ApiModelProperty("出站压力")
-    private String outPress;
+//    @ApiModelProperty("出站压力")
+//    private String outPress;
     @ApiModelProperty("上传时间")
     private Date logTime;