diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 1ae1fce..5f672d8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -31,4 +31,5 @@
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
+    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 1ae1fce..5f672d8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -31,4 +31,5 @@
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
+    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 8a14363..f63a319 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -98,10 +98,29 @@
                  WHERE valid = 0
              ) bmi
                  JOIN (
+        SELECT id AS monitorId,
+                monitor_name AS monitorName,
+                longitude,
+                latitude,
+                station_name AS stationName,
+                location,
+                device_status AS deviceStatus
+        FROM
+        (
+            SELECT * FROM bus_monipoi_info
+            WHERE valid = 0
+            <if test="keyword!= null and keyword !=''">
+                and monitor_name like concat('%',#{keyword},'%')
+            </if>
+        ) bmi JOIN (
             SELECT id AS idd, DEPT_ID, station_name
             FROM bus_station_info
             WHERE valid = 0
         ) bsi ON bsi.idd = bmi.station_id
+            <if test="keyword!= null and keyword !=''">
+                and STATION_NAME like concat('%',#{keyword},'%')
+            </if>
+        ) bsi ON bsi.idd = bmi.station_id
     </select>
 
 

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 1ae1fce..5f672d8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -31,4 +31,5 @@
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
+    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 8a14363..f63a319 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -98,10 +98,29 @@
                  WHERE valid = 0
              ) bmi
                  JOIN (
+        SELECT id AS monitorId,
+                monitor_name AS monitorName,
+                longitude,
+                latitude,
+                station_name AS stationName,
+                location,
+                device_status AS deviceStatus
+        FROM
+        (
+            SELECT * FROM bus_monipoi_info
+            WHERE valid = 0
+            <if test="keyword!= null and keyword !=''">
+                and monitor_name like concat('%',#{keyword},'%')
+            </if>
+        ) bmi JOIN (
             SELECT id AS idd, DEPT_ID, station_name
             FROM bus_station_info
             WHERE valid = 0
         ) bsi ON bsi.idd = bmi.station_id
+            <if test="keyword!= null and keyword !=''">
+                and STATION_NAME like concat('%',#{keyword},'%')
+            </if>
+        ) bsi ON bsi.idd = bmi.station_id
     </select>
 
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
index e087602..2490d78 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -3,12 +3,15 @@
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author zt
  */
 @Data
-public class BusObserpoiResponse {
+public class BusObserpoiResponse  implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     //预置点id
     private Long id;

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 1ae1fce..5f672d8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -31,4 +31,5 @@
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
+    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 8a14363..f63a319 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -98,10 +98,29 @@
                  WHERE valid = 0
              ) bmi
                  JOIN (
+        SELECT id AS monitorId,
+                monitor_name AS monitorName,
+                longitude,
+                latitude,
+                station_name AS stationName,
+                location,
+                device_status AS deviceStatus
+        FROM
+        (
+            SELECT * FROM bus_monipoi_info
+            WHERE valid = 0
+            <if test="keyword!= null and keyword !=''">
+                and monitor_name like concat('%',#{keyword},'%')
+            </if>
+        ) bmi JOIN (
             SELECT id AS idd, DEPT_ID, station_name
             FROM bus_station_info
             WHERE valid = 0
         ) bsi ON bsi.idd = bmi.station_id
+            <if test="keyword!= null and keyword !=''">
+                and STATION_NAME like concat('%',#{keyword},'%')
+            </if>
+        ) bsi ON bsi.idd = bmi.station_id
     </select>
 
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
index e087602..2490d78 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -3,12 +3,15 @@
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author zt
  */
 @Data
-public class BusObserpoiResponse {
+public class BusObserpoiResponse  implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     //预置点id
     private Long id;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
index da4bf5e..50a83fd 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
@@ -32,7 +32,7 @@
 
     ResponseData monitorDetail(Long id);
 
-    List<MonitorOverviewMap> overviewMap() throws Exception;
+    List<MonitorOverviewMap> overviewMap(String keyword) throws Exception;
 
     MonitorBaseInfo selectInfoByDeviceIp(String deviceIp);
 

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f5a1cfe..c7d58b2 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -11,11 +11,14 @@
     HANDLE_FAILED(500, "操作失败"),
 
     DEVICE_BOUND_FAILED(500, "设备绑定，场站删除失败"),
+
+    MONITOR_VAILD_FAILED(2099, "云台登录地址重复"),
     DEVICE_REGISTER_FAILED(2500, "设备注册失败"),
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"),
     CRUISE_DELETE_ERROR(2503, "巡航路径删除过程中对设备操作异常");
 
+
     private Integer code;
     private String message;
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index b6d5ee4..5249831 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.KeywordDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -104,8 +105,8 @@
      * 设备列表（地图）
      */
     @RequestMapping(value = "/overview")
-    public Object mapOverview() throws Exception {
-        return ResponseData.success(busMonipoiInfoService.overviewMap());
+    public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 1ae1fce..5f672d8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -31,4 +31,5 @@
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
+    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 8a14363..f63a319 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -98,10 +98,29 @@
                  WHERE valid = 0
              ) bmi
                  JOIN (
+        SELECT id AS monitorId,
+                monitor_name AS monitorName,
+                longitude,
+                latitude,
+                station_name AS stationName,
+                location,
+                device_status AS deviceStatus
+        FROM
+        (
+            SELECT * FROM bus_monipoi_info
+            WHERE valid = 0
+            <if test="keyword!= null and keyword !=''">
+                and monitor_name like concat('%',#{keyword},'%')
+            </if>
+        ) bmi JOIN (
             SELECT id AS idd, DEPT_ID, station_name
             FROM bus_station_info
             WHERE valid = 0
         ) bsi ON bsi.idd = bmi.station_id
+            <if test="keyword!= null and keyword !=''">
+                and STATION_NAME like concat('%',#{keyword},'%')
+            </if>
+        ) bsi ON bsi.idd = bmi.station_id
     </select>
 
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
index e087602..2490d78 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -3,12 +3,15 @@
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author zt
  */
 @Data
-public class BusObserpoiResponse {
+public class BusObserpoiResponse  implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     //预置点id
     private Long id;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
index da4bf5e..50a83fd 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
@@ -32,7 +32,7 @@
 
     ResponseData monitorDetail(Long id);
 
-    List<MonitorOverviewMap> overviewMap() throws Exception;
+    List<MonitorOverviewMap> overviewMap(String keyword) throws Exception;
 
     MonitorBaseInfo selectInfoByDeviceIp(String deviceIp);
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
index 050e477..1666fa5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
@@ -55,7 +55,7 @@
     public Page<BusMonipoiInfo> monitorListPage(Page<BusMonipoiInfo> page, Long stationId, String keyword) throws Exception {
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         dataScope.setScopeName("DEPT_ID");
-        List<BusMonipoiInfo> monitorPointLists = this.baseMapper.monitorListPage(page,dataScope, stationId, keyword);
+        List<BusMonipoiInfo> monitorPointLists = this.baseMapper.monitorListPage(page, dataScope, stationId, keyword);
         for (BusMonipoiInfo busMonipoiInfo : monitorPointLists) {
             DictCodeUtils.convertDictCodeToName(busMonipoiInfo);
         }
@@ -65,6 +65,7 @@
 
     @Override
     public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) {
+        checkIsExist(busMonipoiInfo);
         int addFlag = this.baseMapper.insert(busMonipoiInfo);
         if (addFlag > 0) {
             return ResponseData.success();
@@ -74,6 +75,7 @@
 
     @Override
     public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) {
+        checkIsExist(busMonipoiInfo);
         int updateFlag = this.baseMapper.updateById(busMonipoiInfo);
         if (updateFlag > 0) {
             return ResponseData.success();
@@ -132,12 +134,11 @@
         }
     }
 
-
     @Override
-    public List<MonitorOverviewMap> overviewMap() throws Exception {
+    public List<MonitorOverviewMap> overviewMap(String keyword) throws Exception {
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         dataScope.setScopeName("DEPT_ID");
-        List<MonitorOverviewMap> monitorOverviewMaps = this.baseMapper.overviewMap(dataScope);
+        List<MonitorOverviewMap> monitorOverviewMaps = this.baseMapper.overviewMap(dataScope,keyword);
         for (MonitorOverviewMap monitorOverviewMap : monitorOverviewMaps) {
             DictCodeUtils.convertDictCodeToName(monitorOverviewMap);
         }
@@ -149,10 +150,35 @@
         BusMonipoiInfo busMonipoiInfo = selectByDeviceIp(deviceIp);
         if (null != busMonipoiInfo) {
             busMonipoiInfo.setDeviceStatus(status);
-            if(this.baseMapper.updateById(busMonipoiInfo)>0){
+            if (this.baseMapper.updateById(busMonipoiInfo) > 0) {
                 return true;
             }
         }
         return false;
     }
+
+    private void checkIsExist(BusMonipoiInfo newBusMonitor) {
+        List<BusMonipoiInfo> busMonipoiInfoList = this.baseMapper.selectList(null);
+        for (BusMonipoiInfo oldBusMonitor : busMonipoiInfoList) {
+            //不为空，是更新跳过
+            if (ObjectUtil.isNotEmpty(newBusMonitor.getId()) && newBusMonitor.getId().equals(oldBusMonitor.getId())) {
+                continue;
+            }
+            compareToOld(oldBusMonitor.getDeviceIp(), newBusMonitor.getDeviceIp(), "云台登陆地址重复注册，保存失败");
+            compareToOld(oldBusMonitor.getNvrIp(), newBusMonitor.getNvrIp(), "NVR登录地址重复注册，保存失败");
+            compareToOld(oldBusMonitor.getDoorIp(), newBusMonitor.getDoorIp(), "控制开关重复注册，保存失败");
+        }
+    }
+
+    /**
+     * 新旧比较
+     */
+    private void compareToOld(String oldValue, String newValue, String msg) {
+        if (oldValue.equals(newValue)) {
+            BusinessExceptionEnum.MONITOR_VAILD_FAILED.setMessage(msg);
+            throw new BusinessException(BusinessExceptionEnum.MONITOR_VAILD_FAILED);
+        }
+    }
+
+
 }