diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
new file mode 100644
index 0000000..aca8803
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2023-04-21
+ */
+@Data
+public class StationStateStatisticsVO{
+
+    private Long stationId;
+
+    private String stationName;
+
+    private Long total;
+
+    private Long online;
+
+    private Long offline;
+
+}

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
new file mode 100644
index 0000000..aca8803
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2023-04-21
+ */
+@Data
+public class StationStateStatisticsVO{
+
+    private Long stationId;
+
+    private String stationName;
+
+    private Long total;
+
+    private Long online;
+
+    private Long offline;
+
+}
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 7fddde8..eeac8b8 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
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -31,6 +30,4 @@
 
     ResponseData monitorDetail(Long id);
 
-    ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO);
-
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
new file mode 100644
index 0000000..aca8803
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2023-04-21
+ */
+@Data
+public class StationStateStatisticsVO{
+
+    private Long stationId;
+
+    private String stationName;
+
+    private Long total;
+
+    private Long online;
+
+    private Long offline;
+
+}
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 7fddde8..eeac8b8 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
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -31,6 +30,4 @@
 
     ResponseData monitorDetail(Long id);
 
-    ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO);
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
index b14a1b3..34fce82 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -29,4 +30,6 @@
 
     ResponseData deleteStation(Long busStationInfoId);
 
+    List<StationStateStatisticsVO> statisticsStatus();
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
new file mode 100644
index 0000000..aca8803
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2023-04-21
+ */
+@Data
+public class StationStateStatisticsVO{
+
+    private Long stationId;
+
+    private String stationName;
+
+    private Long total;
+
+    private Long online;
+
+    private Long offline;
+
+}
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 7fddde8..eeac8b8 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
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -31,6 +30,4 @@
 
     ResponseData monitorDetail(Long id);
 
-    ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO);
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
index b14a1b3..34fce82 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -29,4 +30,6 @@
 
     ResponseData deleteStation(Long busStationInfoId);
 
+    List<StationStateStatisticsVO> statisticsStatus();
+
 }
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 b75f4da..6c168f3 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
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -9,7 +7,6 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper;
@@ -89,9 +86,4 @@
         return ResponseData.success(busMonipoiInfo);
     }
 
-    @Override
-    public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) {
-        return null;
-    }
-
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 43b9c31..b77e0a7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,18 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -30,6 +37,8 @@
     private IAlarmRuleService alarmRuleService;
 
 
+
+
     /**
      * 获取告警规则列表
      */
@@ -95,15 +104,14 @@
     }
 
     /**
-     * 告警规则详情
+     * 监测点/设备信息详情
      */
-//    @RequestMapping(value = "/detail/{alarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) {
-//        ResultData<AlarmRule> resultData = new ResultData<AlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(alarmRuleService.selectById(alarmRuleId));
-//        return resultData;
-//    }
+    @RequestMapping(value = "/config")
+    public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return alarmRuleService.configMonitor(alarmRule);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
index c961a39..e46b2c4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
@@ -1,106 +1,44 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.casic.missiles.modular.system.service.IBusPatrolLogService;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusPatrolLog;
-//import com.stylefeng.guns.modular.system.service.IBusPatrolLogService;
-//
-///**
-// * 巡检日志控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:25
-// */
-//@Controller
-//@RequestMapping("/busPatrolLog")
-//public class BusPatrolLogController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusPatrolLogService busPatrolLogService;
-//
-//
-//    /**
-//     * 获取巡检日志列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busPatrolLogService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡检日志分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusPatrolLog> page = new PageFactory<BusPatrolLog>().defaultPage();
-//        EntityWrapper<BusPatrolLog> query = new EntityWrapper<>();
-//        page =  busPatrolLogService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡检日志
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.insert(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡检日志
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busPatrolLogId) {
-//        busPatrolLogService.deleteById(busPatrolLogId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busPatrolLogIds") List<String> busPatrolLogIds) {
-//        busPatrolLogService.deleteBatchIds(busPatrolLogIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡检日志
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusPatrolLog busPatrolLog) {
-//        busPatrolLogService.updateById(busPatrolLog);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡检日志详情
-//     */
-//    @RequestMapping(value = "/detail/{busPatrolLogId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busPatrolLogId") String busPatrolLogId) {
-//        ResultData<BusPatrolLog> resultData = new ResultData<BusPatrolLog>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busPatrolLogService.selectById(busPatrolLogId));
-//        return resultData;
-//    }
-//}
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.BusPatrolLog;
+import com.casic.missiles.modular.system.service.IBusPatrolLogService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 巡检日志控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:25
+ */
+@RestController
+@RequestMapping("/busPatrolLog")
+public class BusPatrolLogController extends ExportController {
+
+
+    @Autowired
+    private IBusPatrolLogService busPatrolLogService;
+
+    /**
+     * 获取巡检日志分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    public Object listPage(Long monitorId, String startTime, String endTime) {
+        Page<BusPatrolLog> page = PageFactory.defaultPage();
+        return ResponseData.success(super.packForBT(busPatrolLogService.patrolLogListPage(page, monitorId, startTime, endTime)));
+    }
+
+    /**
+     * 删除巡检日志
+     */
+    @RequestMapping(value = "/delete")
+    public Object delete(Long monitorId, String startTime, String endTime) {
+        return busPatrolLogService.deletePatrolLog(monitorId, startTime, endTime);
+    }
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
index 1bd4951..4501ea2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolLogMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,14 @@
  */
 public interface BusPatrolLogMapper extends BaseMapper<BusPatrolLog> {
 
+    List<BusPatrolLog> patrolLogListPage(@Param("page") Page<BusPatrolLog> page,
+                                         @Param("scope") DataScope dataScope,
+                                         @Param("monitorId") Long monitorId,
+                                         @Param("monitorId") String startTime,
+                                         @Param("monitorId") String endTime);
+
+    Integer deletePatrolLog( @Param("scope") DataScope dataScope,
+                             @Param("monitorId") Long monitorId,
+                             @Param("monitorId") String startTime,
+                             @Param("monitorId") String endTime);
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
index 81ea661..a0e0792 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolLogMapper.xml
@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusPatrolLog">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STATION_ID" property="stationId" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="GAS" property="gas" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STATION_ID" property="stationId"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="GAS" property="gas"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -19,4 +19,45 @@
         ID AS id, MONITOR_ID AS monitorId, STATION_ID AS stationId, LINE_NUM AS lineNum, DIRECTION AS direction, PITCH AS pitch, GAS AS gas, TS AS ts
     </sql>
 
+    <select id="patrolLogListPage" resultType="com.casic.missiles.modular.system.model.BusPatrolLog">
+        SELECT  <include refid="Base_Column_List"/>
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
+
+    <select id="deletePatrolLog" resultType="java.lang.Integer">
+        DELETE
+        FROM bus_patrol_log
+        JOIN (
+            SELECT  id as idd,DEPT_ID
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        WHERE VAILD=0
+        <if test="monitorId != null and monitorId !=''">
+            AND monitor_id = #{monitorId}
+        </if>
+        <if test="startTime!='' and startTime!=null">
+            AND TS <![CDATA[  >=  ]]> #{startTime}
+        </if>
+        <if test="endTime!='' and request.endTime!=null">
+            AND TS <![CDATA[  <=  ]]> #{endTime}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
new file mode 100644
index 0000000..d79f7f7
--- /dev/null
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java
@@ -0,0 +1,36 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AlarmConfigDTO {
+
+    @NotNull
+    private Long id;
+    /**
+     * 默认巡航速度(m/s)1~63
+     */
+    @NotNull
+    private String speed;
+
+    /**
+     * 默认停留时间(s)0~255秒
+     */
+    @NotNull
+    private String stopTime;
+
+    /**
+     * 默认报警阈值
+     */
+    @NotNull
+    private String high;
+
+    /**
+     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
+     */
+    @NotNull
+    private String angle;
+
+}
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 1faf2f6..c2296a2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,7 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.elasticsearch.client.Response;
 
 /**
  * <p>
@@ -13,4 +16,6 @@
  */
 public interface IAlarmRuleService extends IService<AlarmRule> {
 
+   ResponseData configMonitor( AlarmRule alarmRule);
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
index c0f5419..0e4b4b4 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,10 @@
  */
 public interface IBusPatrolLogService extends IService<BusPatrolLog> {
 
+    Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime);
+
+
+    ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime);
+
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index e3ebf5b..df86e39 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,5 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmConfigDTO;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -17,4 +21,13 @@
 @Service
 public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
 
+    @Override
+    public ResponseData configMonitor(AlarmRule alarmRule) {
+        int addFlag = this.baseMapper.insert(alarmRule);
+        if (addFlag > 0) {
+            return ResponseData.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index 6aa45f3..1df6ca2 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusPatrolLog;
 import com.casic.missiles.modular.system.dao.BusPatrolLogMapper;
 import com.casic.missiles.modular.system.service.IBusPatrolLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检日志 服务实现类
@@ -15,6 +24,26 @@
  * @since 2023-04-18
  */
 @Service
+@AllArgsConstructor
 public class BusPatrolLogServiceImpl extends ServiceImpl<BusPatrolLogMapper, BusPatrolLog> implements IBusPatrolLogService {
 
+
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public Page<BusPatrolLog> patrolLogListPage(Page<BusPatrolLog> page, Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<BusPatrolLog> busPatrolLogs = this.baseMapper.patrolLogListPage(page,dataScope, monitorId, startTime, endTime);
+        page.setRecords(busPatrolLogs);
+        return page;
+    }
+
+    @Override
+    public ResponseData deletePatrolLog(Long monitorId, String startTime, String endTime) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        this.baseMapper.deletePatrolLog(dataScope, monitorId, startTime, endTime);
+        return ResponseData.success();
+    }
 }
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 4f39bc1..9d12b2c 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
@@ -7,7 +7,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,15 +84,4 @@
         return busMonipoiInfoService.monitorDetail(id);
     }
 
-    /**
-     * 监测点/设备信息详情
-     */
-    @RequestMapping(value = "/config")
-    public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) {
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return busMonipoiInfoService.configMonitor(monitorConfigDTO);
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
index bc718cc..d77dac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
@@ -23,8 +23,8 @@
  * @Date 2023-04-18 15:46:00
  */
 @RestController
-@RequestMapping("/busStationInfo")
-public class BusStationInfoController  extends ExportController {
+@RequestMapping("/station")
+public class BusStationInfoController extends ExportController {
 
 
     @Autowired
@@ -47,6 +47,7 @@
         Page<BusStationInfo> page = PageFactory.defaultPage();
         return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword)));
     }
+
     /**
      * 新增场站信息
      */
@@ -77,4 +78,14 @@
         return busStationInfoService.deleteStation(id);
     }
 
+
+    /**
+     * 场站状态统计
+     */
+    @RequestMapping(value = "/statistics")
+    public Object statisticsStatus() {
+        return ResponseData.success(busStationInfoService.statisticsStatus());
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
index 34ba2ec..879b935 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@
     List<BusStationInfo> stationListPage(@Param("page") Page<BusStationInfo> page, @Param("dataScope") DataScope dataScope,
                                            @Param("keyword")String keyword);
 
+    List<StationStateStatisticsVO> statisticsStatus(@Param("scope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
index 6bd217d..7756ed2 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
@@ -31,5 +31,20 @@
         </if>
     </select>
 
+    <select id="statisticsStatus" resultType="com.casic.missiles.modular.system.dto.StationStateStatisticsVO">
+        SELECT count(id) AS total,station_name AS "stationName",
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '1' THEN 1 ELSE 0 END))
+          AS online,
+        COALESCE(SUM(CASE DEVICE_STATUS WHEN '0' THEN 1 ELSE 0 END))
+          AS offline,station_id AS "stationId"
+        FROM bus_monipoi_info
+        JOIN (
+            SELECT  id as idd,DEPT_ID,station_name
+            FROM bus_station_info
+            WHERE valid=0
+        )bsi  ON bsi.idd=station_id
+        where valid=0
+        GROUP BY station_id
+    </select>
 
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
deleted file mode 100644
index a5eeb2f..0000000
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MonitorConfigDTO {
-
-    @NotNull
-    private Long id;
-    /**
-     * 默认巡航速度(m/s)1~63
-     */
-    @NotNull
-    private String speed;
-
-    /**
-     * 默认停留时间(s)0~255秒
-     */
-    @NotNull
-    private String stopTime;
-
-    /**
-     * 默认报警阈值
-     */
-    @NotNull
-    private String high;
-
-    /**
-     * 局部扫描角度配置(1~255实际对应0.1°~25.5°),
-     */
-    @NotNull
-    private String angle;
-
-}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
new file mode 100644
index 0000000..aca8803
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationStateStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2023-04-21
+ */
+@Data
+public class StationStateStatisticsVO{
+
+    private Long stationId;
+
+    private String stationName;
+
+    private Long total;
+
+    private Long online;
+
+    private Long offline;
+
+}
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 7fddde8..eeac8b8 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
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -31,6 +30,4 @@
 
     ResponseData monitorDetail(Long id);
 
-    ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO);
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
index b14a1b3..34fce82 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -29,4 +30,6 @@
 
     ResponseData deleteStation(Long busStationInfoId);
 
+    List<StationStateStatisticsVO> statisticsStatus();
+
 }
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 b75f4da..6c168f3 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
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -9,7 +7,6 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.MonitorConfigDTO;
 import com.casic.missiles.modular.system.dto.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper;
@@ -89,9 +86,4 @@
         return ResponseData.success(busMonipoiInfo);
     }
 
-    @Override
-    public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) {
-        return null;
-    }
-
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java
index 8cc132e..ff233c5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.StationPointList;
+import com.casic.missiles.modular.system.dto.StationStateStatisticsVO;
 import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.dao.BusStationInfoMapper;
 import com.casic.missiles.modular.system.service.IBusStationInfoService;
@@ -76,4 +77,12 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public   List<StationStateStatisticsVO> statisticsStatus(){
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        List<StationStateStatisticsVO> stateStatisticsVOS = this.baseMapper.statisticsStatus(dataScope);
+        return stateStatisticsVOS;
+    }
+
 }