diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 02e2520..a546f77 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -53,9 +53,9 @@
     @ApiOperation("离线统计")
     @PostMapping("/offLine")
     @ResponseBody
-    public ReturnDTO<DeviceOffDTO> offLine() {
+    public ReturnDTO<DeviceOffDTO> offLine(Long deptId) {
 
-        return ReturnUtil.success(iBusDeviceStaticsService.offLine());
+        return ReturnUtil.success(iBusDeviceStaticsService.offLine(deptId));
     }
 
     @ApiOperation("管理单位设备统计")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 02e2520..a546f77 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -53,9 +53,9 @@
     @ApiOperation("离线统计")
     @PostMapping("/offLine")
     @ResponseBody
-    public ReturnDTO<DeviceOffDTO> offLine() {
+    public ReturnDTO<DeviceOffDTO> offLine(Long deptId) {
 
-        return ReturnUtil.success(iBusDeviceStaticsService.offLine());
+        return ReturnUtil.success(iBusDeviceStaticsService.offLine(deptId));
     }
 
     @ApiOperation("管理单位设备统计")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
index a52c43f..ce7161a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
@@ -115,11 +115,12 @@
     @TableField("MONITOR_STATE")
     private String monitorState;
 
-
+    @ExcelProperty(value = "负责人", order = 9)
     @ApiModelProperty("产权单位联系人")
     @TableField("PROPERTY_PERSON")
     private String propertyPerson;
 
+    @ExcelProperty(value = "联系电话", order = 10)
     @ApiModelProperty("产权单位联系电话")
     @TableField("PROPERTY_PHONE")
     private String propertyPhone;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 02e2520..a546f77 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -53,9 +53,9 @@
     @ApiOperation("离线统计")
     @PostMapping("/offLine")
     @ResponseBody
-    public ReturnDTO<DeviceOffDTO> offLine() {
+    public ReturnDTO<DeviceOffDTO> offLine(Long deptId) {
 
-        return ReturnUtil.success(iBusDeviceStaticsService.offLine());
+        return ReturnUtil.success(iBusDeviceStaticsService.offLine(deptId));
     }
 
     @ApiOperation("管理单位设备统计")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
index a52c43f..ce7161a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
@@ -115,11 +115,12 @@
     @TableField("MONITOR_STATE")
     private String monitorState;
 
-
+    @ExcelProperty(value = "负责人", order = 9)
     @ApiModelProperty("产权单位联系人")
     @TableField("PROPERTY_PERSON")
     private String propertyPerson;
 
+    @ExcelProperty(value = "联系电话", order = 10)
     @ApiModelProperty("产权单位联系电话")
     @TableField("PROPERTY_PHONE")
     private String propertyPhone;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 99d9b17..5a2bc11 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -20,7 +20,7 @@
 
     List<ResultDTO> deviceType();
 
-    List<DeviceOffDTO> offLine();
+    List<DeviceOffDTO> offLine(Long deptId);
 
     List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 02e2520..a546f77 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -53,9 +53,9 @@
     @ApiOperation("离线统计")
     @PostMapping("/offLine")
     @ResponseBody
-    public ReturnDTO<DeviceOffDTO> offLine() {
+    public ReturnDTO<DeviceOffDTO> offLine(Long deptId) {
 
-        return ReturnUtil.success(iBusDeviceStaticsService.offLine());
+        return ReturnUtil.success(iBusDeviceStaticsService.offLine(deptId));
     }
 
     @ApiOperation("管理单位设备统计")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
index a52c43f..ce7161a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
@@ -115,11 +115,12 @@
     @TableField("MONITOR_STATE")
     private String monitorState;
 
-
+    @ExcelProperty(value = "负责人", order = 9)
     @ApiModelProperty("产权单位联系人")
     @TableField("PROPERTY_PERSON")
     private String propertyPerson;
 
+    @ExcelProperty(value = "联系电话", order = 10)
     @ApiModelProperty("产权单位联系电话")
     @TableField("PROPERTY_PHONE")
     private String propertyPhone;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 99d9b17..5a2bc11 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -20,7 +20,7 @@
 
     List<ResultDTO> deviceType();
 
-    List<DeviceOffDTO> offLine();
+    List<DeviceOffDTO> offLine(Long deptId);
 
     List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 45f4a4f..92bbf75 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -35,6 +35,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.casic.missiles.enums.BusinessExceptionEnum.DEVICE_DUPLICATE;
+
 /**
  * <p>
  * 设备管理	 服务实现类
@@ -64,6 +66,10 @@
     @Override
     public boolean saveDevice(BusDevice busDevice) {
         try {
+            //判断是否存在
+            if(this.isSaveDevice(busDevice.getDevcode())){
+                throw new BusinessException(DEVICE_DUPLICATE);
+            }
             //先保存设备
             this.baseMapper.insert(busDevice);
             //存储绑定关系
@@ -73,7 +79,7 @@
             //添加设备操作日志
             iBusDeviceLogService.saveBusDeviceLog(busDevice.getDevcode(), "1", busDevice.getTagNumber());
         } catch (DataAccessException dax) {
-            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE.getCode(), dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
+            throw new BusinessException(DEVICE_DUPLICATE.getCode(), dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
 //            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE);
         }
 
@@ -658,4 +664,10 @@
         updateWrapper.set("ONLINE_STATE", DictEnum.DEVICE_FAILURE);
         return this.update(updateWrapper);
     }
+    public boolean isSaveDevice(String devCode){
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("DEVCODE", devCode);
+        queryWrapper.in("VALID", Arrays.asList("1", "2", "3"));
+        return this.count(queryWrapper) > 0;
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 9c2060c..b009683 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -116,10 +116,16 @@
     @ApiOperation("点位视图")
     @PostMapping("/pointStatistics")
     @ResponseBody
-    public ReturnDTO<PointMonitorDTO> pointStatistics() {
-        return ReturnUtil.success(iOverViewService.pointStatistics());
+    public ReturnDTO<PointMonitorDTO> pointStatistics(Long deptId) {
+        return ReturnUtil.success(iOverViewService.pointStatistics(deptId));
     }
 
+    @ApiOperation("一分站箱数据")
+    @PostMapping("/dataStationOne")
+    @ResponseBody
+    public ReturnDTO<List<Map<String, Object>>> dataStationOne() {
+        return ReturnUtil.success(iOverViewService.dataStationOne());
+    }
     @ApiOperation("站箱数据")
     @PostMapping("/dataStation")
     @ResponseBody
@@ -127,6 +133,7 @@
         return ReturnUtil.success(iOverViewService.dataStation());
     }
 
+
     @ApiOperation("获取站箱点位详细信息")
     @PostMapping("/stationDetail")
     @ResponseBody
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 88d2ed7..a2d374d 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
@@ -113,6 +113,35 @@
             "   AND bl.LNG_GAODE IS NOT NULL")
     List<StationDTO> dataStation();
 
+    @Select({
+            "<script>",
+            "WITH station_temp AS (   " +
+                    "                 WITH scada_temp AS ( SELECT point FROM ods_scada_data_temp ) SELECT DISTINCT   " +
+                    "                 TAG_NUMBER,   " +
+                    "                 type    " +
+                    "                 FROM   " +
+                    "                    bus_station bs    " +
+                    "                 WHERE   " +
+                    "                    bs.PRESS_IN_CODE IN ( SELECT point FROM scada_temp )    " +
+                    "                 OR bs.PRESS_OUT_CODE IN ( SELECT point FROM scada_temp )) SELECT   " +
+                    "                 bl.TAG_NUMBER,   " +
+                    "                 st.type,   " +
+                    "                 bl.LNG_GAODE,   " +
+                    "                 bl.LAT_GAODE    " +
+                    "              FROM   " +
+                    "                 bus_ledger bl   " +
+                    "                 JOIN station_temp st ON st.TAG_NUMBER = bl.TAG_NUMBER    " +
+                    "              WHERE   " +
+                    "                 bl.valid = '1'    " +
+                    "                 AND bl.type = '2'    " +
+                    "                 AND bl.LNG_GAODE IS NOT NULL" +
+                    "                AND bl.DEPTID IN ",
+            "<foreach collection='deptIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    List<StationDTO> dataStationOne(@Param("deptIds") List<Long> deptIds);
 
     @Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
     List<StationDataDTO> stationDetail(@Param("tagNumber") String tagNumber);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index f3eaa3b..19e9aed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -331,7 +331,7 @@
         bus_device_ledger bl
         JOIN bus_device bd ON bl.DEVICE_ID = bd.id
         AND bl.VALID = '1'
-        AND bd.VALID >'0'
+        AND bd.VALID = '1'
         JOIN bus_ledger_all_view bv ON bl.LEDGER_ID = bv.id
         AND bv.type = bl.TYPE
         AND bv.VALID = '1'
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index eef3876..9bdcfa9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -29,10 +29,12 @@
 
     Map<String,Object> areaStatistics();
 
-    List<PointMonitorDTO> pointStatistics();
+    List<PointMonitorDTO> pointStatistics(Long deptId);
 
     List<Map<String, Object>> dataStation();
 
+    List<Map<String, Object>> dataStationOne();
+
     List<StationDataDTO> stationDetail(String tagNumber);
 
     List<Map<String,Object>> lineData();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 009e223..9a9fdf2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -232,6 +232,24 @@
 
 
     @Override
+    public List<Map<String, Object>> dataStationOne() {
+        List<Long>  deptIds  =commonServer.getDeptIds(1291646176141991938L);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<StationDTO> resultDTOList = baseMapper.dataStationOne(deptIds);
+        resultDTOList.forEach(resultDTO -> {
+            Map<String, Object> map = new HashMap<>();
+            if (ObjectUtil.isAllNotEmpty(resultDTO.getTagNumber(), resultDTO.getType(), resultDTO.getLngGaode(), resultDTO.getLatGaode())) {
+                map.put("data", resultDTO.getTagNumber().concat(",").concat(resultDTO.getType()).concat(",").concat(resultDTO.getLngGaode().concat(",").concat(resultDTO.getLatGaode())));
+                mapList.add(map);
+            }
+        });
+        return mapList;
+    }
+
+
+
+
+    @Override
     public List<Map<String, Object>> dataStation() {
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<StationDTO> resultDTOList = baseMapper.dataStation();
@@ -252,8 +270,8 @@
     }
 
     @Override
-    public List<PointMonitorDTO> pointStatistics() {
-        return baseMapper.pointStatistics(commonServer.getDeptIds());
+    public List<PointMonitorDTO> pointStatistics(Long deptId) {
+        return baseMapper.pointStatistics(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 02e2520..a546f77 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -53,9 +53,9 @@
     @ApiOperation("离线统计")
     @PostMapping("/offLine")
     @ResponseBody
-    public ReturnDTO<DeviceOffDTO> offLine() {
+    public ReturnDTO<DeviceOffDTO> offLine(Long deptId) {
 
-        return ReturnUtil.success(iBusDeviceStaticsService.offLine());
+        return ReturnUtil.success(iBusDeviceStaticsService.offLine(deptId));
     }
 
     @ApiOperation("管理单位设备统计")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
index a52c43f..ce7161a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java
@@ -115,11 +115,12 @@
     @TableField("MONITOR_STATE")
     private String monitorState;
 
-
+    @ExcelProperty(value = "负责人", order = 9)
     @ApiModelProperty("产权单位联系人")
     @TableField("PROPERTY_PERSON")
     private String propertyPerson;
 
+    @ExcelProperty(value = "联系电话", order = 10)
     @ApiModelProperty("产权单位联系电话")
     @TableField("PROPERTY_PHONE")
     private String propertyPhone;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 99d9b17..5a2bc11 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -20,7 +20,7 @@
 
     List<ResultDTO> deviceType();
 
-    List<DeviceOffDTO> offLine();
+    List<DeviceOffDTO> offLine(Long deptId);
 
     List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 45f4a4f..92bbf75 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -35,6 +35,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.casic.missiles.enums.BusinessExceptionEnum.DEVICE_DUPLICATE;
+
 /**
  * <p>
  * 设备管理	 服务实现类
@@ -64,6 +66,10 @@
     @Override
     public boolean saveDevice(BusDevice busDevice) {
         try {
+            //判断是否存在
+            if(this.isSaveDevice(busDevice.getDevcode())){
+                throw new BusinessException(DEVICE_DUPLICATE);
+            }
             //先保存设备
             this.baseMapper.insert(busDevice);
             //存储绑定关系
@@ -73,7 +79,7 @@
             //添加设备操作日志
             iBusDeviceLogService.saveBusDeviceLog(busDevice.getDevcode(), "1", busDevice.getTagNumber());
         } catch (DataAccessException dax) {
-            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE.getCode(), dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
+            throw new BusinessException(DEVICE_DUPLICATE.getCode(), dax.getMessage().contains("Duplicate entry") && dax.getMessage().contains("DEVCODE") ? "设备编号已存在" : "设备编号已存在");
 //            throw new BusinessException(BusinessExceptionEnum.DEVICE_DUPLICATE);
         }
 
@@ -658,4 +664,10 @@
         updateWrapper.set("ONLINE_STATE", DictEnum.DEVICE_FAILURE);
         return this.update(updateWrapper);
     }
+    public boolean isSaveDevice(String devCode){
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("DEVCODE", devCode);
+        queryWrapper.in("VALID", Arrays.asList("1", "2", "3"));
+        return this.count(queryWrapper) > 0;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
index 88e276e..02204f5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
@@ -51,8 +51,8 @@
 
 
     @Override
-    public List<DeviceOffDTO> offLine() {
-        return this.baseMapper.offLine(commonServer.getDeptIds());
+    public List<DeviceOffDTO> offLine(Long deptId) {
+        return this.baseMapper.offLine(ObjectUtil.isNotEmpty(deptId)?commonServer.getDeptScopeIds(deptId):commonServer.getDeptIds());
     }