diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
index 1728a47..5db7716 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
@@ -32,7 +32,7 @@
     /**
      * 获取列表
      */
-    @PostMapping(value = "/listByDevice")
+    @GetMapping(value = "/listByDevice")
     public Object listByDevice(AlarmRuleVO vo) {
         return bizAlarmRuleService.selectListByDevice(vo);
     }
@@ -45,7 +45,7 @@
         Page<BizAlarmRule> page = new PageFactory<BizAlarmRule>().defaultPage();
         EntityWrapper<BizAlarmRule> query = new EntityWrapper<>();
         page = bizAlarmRuleService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
@@ -75,17 +75,4 @@
         bizAlarmRuleService.updateById(bizAlarmRule);
         return ResponseData.success();
     }
-
-//    /**
-//     * 详情
-//     */
-//    @RequestMapping(value = "/detail/{bizAlarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("bizAlarmRuleId") String bizAlarmRuleId) {
-//        ResultData<BizAlarmRule> resultData = new ResultData<BizAlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(bizAlarmRuleService.selectById(bizAlarmRuleId));
-//        return resultData;
-//    }
-}
+}
\ No newline at end of file

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
index 1728a47..5db7716 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
@@ -32,7 +32,7 @@
     /**
      * 获取列表
      */
-    @PostMapping(value = "/listByDevice")
+    @GetMapping(value = "/listByDevice")
     public Object listByDevice(AlarmRuleVO vo) {
         return bizAlarmRuleService.selectListByDevice(vo);
     }
@@ -45,7 +45,7 @@
         Page<BizAlarmRule> page = new PageFactory<BizAlarmRule>().defaultPage();
         EntityWrapper<BizAlarmRule> query = new EntityWrapper<>();
         page = bizAlarmRuleService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
@@ -75,17 +75,4 @@
         bizAlarmRuleService.updateById(bizAlarmRule);
         return ResponseData.success();
     }
-
-//    /**
-//     * 详情
-//     */
-//    @RequestMapping(value = "/detail/{bizAlarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("bizAlarmRuleId") String bizAlarmRuleId) {
-//        ResultData<BizAlarmRule> resultData = new ResultData<BizAlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(bizAlarmRuleService.selectById(bizAlarmRuleId));
-//        return resultData;
-//    }
-}
+}
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
index cedddf9..e160686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
@@ -1,9 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.system.model.BizAlarmRecords;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +20,10 @@
 
     /**
      * 告警记录分页检索
-     * @param page 分页参数
+     *
+     * @param page  分页参数
      * @param query 检索条件
      * @return 结果集
      */
-    List<BizAlarmRecords> selectRecordsPage(Page<BizAlarmRecords> page, EntityWrapper<BizAlarmRecords> query);
+    List<BizAlarmRecords> selectRecordsPage(@Param("page") Page<BizAlarmRecords> page, @Param("ew") EntityWrapper<BizAlarmRecords> query);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
index 1728a47..5db7716 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
@@ -32,7 +32,7 @@
     /**
      * 获取列表
      */
-    @PostMapping(value = "/listByDevice")
+    @GetMapping(value = "/listByDevice")
     public Object listByDevice(AlarmRuleVO vo) {
         return bizAlarmRuleService.selectListByDevice(vo);
     }
@@ -45,7 +45,7 @@
         Page<BizAlarmRule> page = new PageFactory<BizAlarmRule>().defaultPage();
         EntityWrapper<BizAlarmRule> query = new EntityWrapper<>();
         page = bizAlarmRuleService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
@@ -75,17 +75,4 @@
         bizAlarmRuleService.updateById(bizAlarmRule);
         return ResponseData.success();
     }
-
-//    /**
-//     * 详情
-//     */
-//    @RequestMapping(value = "/detail/{bizAlarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("bizAlarmRuleId") String bizAlarmRuleId) {
-//        ResultData<BizAlarmRule> resultData = new ResultData<BizAlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(bizAlarmRuleService.selectById(bizAlarmRuleId));
-//        return resultData;
-//    }
-}
+}
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
index cedddf9..e160686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
@@ -1,9 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.system.model.BizAlarmRecords;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +20,10 @@
 
     /**
      * 告警记录分页检索
-     * @param page 分页参数
+     *
+     * @param page  分页参数
      * @param query 检索条件
      * @return 结果集
      */
-    List<BizAlarmRecords> selectRecordsPage(Page<BizAlarmRecords> page, EntityWrapper<BizAlarmRecords> query);
+    List<BizAlarmRecords> selectRecordsPage(@Param("page") Page<BizAlarmRecords> page, @Param("ew") EntityWrapper<BizAlarmRecords> query);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
index 1601caf..e8e3c04 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
@@ -24,18 +24,18 @@
             resultType="com.casic.missiles.modular.system.model.BizAlarmRecords">
         select
         a.id,
-        a.alarm_type,
-        a.alarm_content,
-        a.alarm_level,
+        a.alarm_type as alarmType,
+        a.alarm_content as alarmContent,
+        a.alarm_level as alarmLevel,
         a.`status`,
-        a.alarm_value,
-        a.alarm_time,
-        a.cancel_time,
-        b.device_no,
-        b.device_name,
+        a.alarm_value as alarmValue,
+        a.alarm_time as alarmTime,
+        a.cancel_time as cancelTime,
+        b.device_no as deviceNo,
+        b.device_name as deviceName,
         b.position
-        from biz_alarm_records a
-        INNER JOIN biz_device b
+        from ${enviromentDataBaseName}.biz_alarm_records a
+        INNER JOIN ${enviromentDataBaseName}.biz_device b
         on a.device_no = b.device_no
         <where>
             <if test="ew != null">

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
index 1728a47..5db7716 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
@@ -32,7 +32,7 @@
     /**
      * 获取列表
      */
-    @PostMapping(value = "/listByDevice")
+    @GetMapping(value = "/listByDevice")
     public Object listByDevice(AlarmRuleVO vo) {
         return bizAlarmRuleService.selectListByDevice(vo);
     }
@@ -45,7 +45,7 @@
         Page<BizAlarmRule> page = new PageFactory<BizAlarmRule>().defaultPage();
         EntityWrapper<BizAlarmRule> query = new EntityWrapper<>();
         page = bizAlarmRuleService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
@@ -75,17 +75,4 @@
         bizAlarmRuleService.updateById(bizAlarmRule);
         return ResponseData.success();
     }
-
-//    /**
-//     * 详情
-//     */
-//    @RequestMapping(value = "/detail/{bizAlarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("bizAlarmRuleId") String bizAlarmRuleId) {
-//        ResultData<BizAlarmRule> resultData = new ResultData<BizAlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(bizAlarmRuleService.selectById(bizAlarmRuleId));
-//        return resultData;
-//    }
-}
+}
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
index cedddf9..e160686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
@@ -1,9 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.system.model.BizAlarmRecords;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +20,10 @@
 
     /**
      * 告警记录分页检索
-     * @param page 分页参数
+     *
+     * @param page  分页参数
      * @param query 检索条件
      * @return 结果集
      */
-    List<BizAlarmRecords> selectRecordsPage(Page<BizAlarmRecords> page, EntityWrapper<BizAlarmRecords> query);
+    List<BizAlarmRecords> selectRecordsPage(@Param("page") Page<BizAlarmRecords> page, @Param("ew") EntityWrapper<BizAlarmRecords> query);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
index 1601caf..e8e3c04 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
@@ -24,18 +24,18 @@
             resultType="com.casic.missiles.modular.system.model.BizAlarmRecords">
         select
         a.id,
-        a.alarm_type,
-        a.alarm_content,
-        a.alarm_level,
+        a.alarm_type as alarmType,
+        a.alarm_content as alarmContent,
+        a.alarm_level as alarmLevel,
         a.`status`,
-        a.alarm_value,
-        a.alarm_time,
-        a.cancel_time,
-        b.device_no,
-        b.device_name,
+        a.alarm_value as alarmValue,
+        a.alarm_time as alarmTime,
+        a.cancel_time as cancelTime,
+        b.device_no as deviceNo,
+        b.device_name as deviceName,
         b.position
-        from biz_alarm_records a
-        INNER JOIN biz_device b
+        from ${enviromentDataBaseName}.biz_alarm_records a
+        INNER JOIN ${enviromentDataBaseName}.biz_device b
         on a.device_no = b.device_no
         <where>
             <if test="ew != null">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
index 1ec831e..c5e9aed 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
@@ -3,11 +3,15 @@
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -18,6 +22,7 @@
  * @author gwq123
  * @since 2021-07-26
  */
+@Data
 @TableName("casic_smartcity_environment.biz_alarm_records")
 public class BizAlarmRecords extends Model<BizAlarmRecords> {
 
@@ -68,78 +73,10 @@
     @TableField("cancel_time")
     private Date cancelTime;
 
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getDeviceNo() {
-        return deviceNo;
-    }
-
-    public void setDeviceNo(String deviceNo) {
-        this.deviceNo = deviceNo;
-    }
-
-    public String getAlarmType() {
-        return alarmType;
-    }
-
-    public void setAlarmType(String alarmType) {
-        this.alarmType = alarmType;
-    }
-
-    public Integer getAlarmLevel() {
-        return alarmLevel;
-    }
-
-    public void setAlarmLevel(Integer alarmLevel) {
-        this.alarmLevel = alarmLevel;
-    }
-
-    public String getAlarmContent() {
-        return alarmContent;
-    }
-
-    public void setAlarmContent(String alarmContent) {
-        this.alarmContent = alarmContent;
-    }
-
-    public Integer getAlarmValue() {
-        return alarmValue;
-    }
-
-    public void setAlarmValue(Integer alarmValue) {
-        this.alarmValue = alarmValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Date getAlarmTime() {
-        return alarmTime;
-    }
-
-    public void setAlarmTime(Date alarmTime) {
-        this.alarmTime = alarmTime;
-    }
-
-    public Date getCancelTime() {
-        return cancelTime;
-    }
-
-    public void setCancelTime(Date cancelTime) {
-        this.cancelTime = cancelTime;
-    }
+    @TableField(exist = false)
+    private String alarmTypeName;
+    @TableField(exist = false)
+    private String alarmLevelName;
 
     @Override
     protected Serializable pkVal() {
@@ -149,15 +86,15 @@
     @Override
     public String toString() {
         return "BizAlarmRecords{" +
-        "id=" + id +
-        ", deviceNo=" + deviceNo +
-        ", alarmType=" + alarmType +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", status=" + status +
-        ", alarmTime=" + alarmTime +
-        ", cancelTime=" + cancelTime +
-        "}";
+                "id=" + id +
+                ", deviceNo=" + deviceNo +
+                ", alarmType=" + alarmType +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", status=" + status +
+                ", alarmTime=" + alarmTime +
+                ", cancelTime=" + cancelTime +
+                "}";
     }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
index 2189b4b..b662774 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceController.java
@@ -116,7 +116,6 @@
         return ResponseData.success();
     }
 
-
     /**
      * 删除设备信息
      *
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
index 613bfdf..b66bb85 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java
@@ -43,7 +43,7 @@
     public Object list(String condition) {
         EntityWrapper<BizAlarmLevel> levelQuery = new EntityWrapper<>();
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectLevelList(levelQuery);
+        return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery));
     }
 
     /**
@@ -57,7 +57,7 @@
             levelQuery.eq("sensor", sensor);
         }
         levelQuery.orderBy("alarm_level");
-        return bizAlarmLevelService.selectList(levelQuery);
+        return ResponseData.success(bizAlarmLevelService.selectList(levelQuery));
     }
 
     /**
@@ -69,7 +69,7 @@
         Page<BizAlarmLevel> page = new PageFactory<BizAlarmLevel>().defaultPage();
         EntityWrapper<BizAlarmLevel> query = new EntityWrapper<>();
         page = bizAlarmLevelService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
index 2582005..e0aa067 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.controller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
@@ -49,9 +48,9 @@
     @ResponseBody
     public Object listPage(AlarmRecordVO recordVO) {
         Page<BizAlarmRecords> page = new PageFactory<BizAlarmRecords>().defaultPage();
-        EntityWrapper<BizAlarmRecords> query = new EntityWrapper<>();
-        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, query);
-        return super.packForBT(page);
+        List<BizAlarmRecords> records = bizAlarmRecordsService.selectRecordsPage(page, recordVO.convertQuery().apply(recordVO));
+        page.setRecords(records);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
index 1728a47..5db7716 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java
@@ -32,7 +32,7 @@
     /**
      * 获取列表
      */
-    @PostMapping(value = "/listByDevice")
+    @GetMapping(value = "/listByDevice")
     public Object listByDevice(AlarmRuleVO vo) {
         return bizAlarmRuleService.selectListByDevice(vo);
     }
@@ -45,7 +45,7 @@
         Page<BizAlarmRule> page = new PageFactory<BizAlarmRule>().defaultPage();
         EntityWrapper<BizAlarmRule> query = new EntityWrapper<>();
         page = bizAlarmRuleService.selectPage(page, query);
-        return super.packForBT(page);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
@@ -75,17 +75,4 @@
         bizAlarmRuleService.updateById(bizAlarmRule);
         return ResponseData.success();
     }
-
-//    /**
-//     * 详情
-//     */
-//    @RequestMapping(value = "/detail/{bizAlarmRuleId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("bizAlarmRuleId") String bizAlarmRuleId) {
-//        ResultData<BizAlarmRule> resultData = new ResultData<BizAlarmRule>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(bizAlarmRuleService.selectById(bizAlarmRuleId));
-//        return resultData;
-//    }
-}
+}
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
index cedddf9..e160686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java
@@ -1,9 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.system.model.BizAlarmRecords;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +20,10 @@
 
     /**
      * 告警记录分页检索
-     * @param page 分页参数
+     *
+     * @param page  分页参数
      * @param query 检索条件
      * @return 结果集
      */
-    List<BizAlarmRecords> selectRecordsPage(Page<BizAlarmRecords> page, EntityWrapper<BizAlarmRecords> query);
+    List<BizAlarmRecords> selectRecordsPage(@Param("page") Page<BizAlarmRecords> page, @Param("ew") EntityWrapper<BizAlarmRecords> query);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
index 1601caf..e8e3c04 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml
@@ -24,18 +24,18 @@
             resultType="com.casic.missiles.modular.system.model.BizAlarmRecords">
         select
         a.id,
-        a.alarm_type,
-        a.alarm_content,
-        a.alarm_level,
+        a.alarm_type as alarmType,
+        a.alarm_content as alarmContent,
+        a.alarm_level as alarmLevel,
         a.`status`,
-        a.alarm_value,
-        a.alarm_time,
-        a.cancel_time,
-        b.device_no,
-        b.device_name,
+        a.alarm_value as alarmValue,
+        a.alarm_time as alarmTime,
+        a.cancel_time as cancelTime,
+        b.device_no as deviceNo,
+        b.device_name as deviceName,
         b.position
-        from biz_alarm_records a
-        INNER JOIN biz_device b
+        from ${enviromentDataBaseName}.biz_alarm_records a
+        INNER JOIN ${enviromentDataBaseName}.biz_device b
         on a.device_no = b.device_no
         <where>
             <if test="ew != null">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
index 1ec831e..c5e9aed 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java
@@ -3,11 +3,15 @@
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -18,6 +22,7 @@
  * @author gwq123
  * @since 2021-07-26
  */
+@Data
 @TableName("casic_smartcity_environment.biz_alarm_records")
 public class BizAlarmRecords extends Model<BizAlarmRecords> {
 
@@ -68,78 +73,10 @@
     @TableField("cancel_time")
     private Date cancelTime;
 
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getDeviceNo() {
-        return deviceNo;
-    }
-
-    public void setDeviceNo(String deviceNo) {
-        this.deviceNo = deviceNo;
-    }
-
-    public String getAlarmType() {
-        return alarmType;
-    }
-
-    public void setAlarmType(String alarmType) {
-        this.alarmType = alarmType;
-    }
-
-    public Integer getAlarmLevel() {
-        return alarmLevel;
-    }
-
-    public void setAlarmLevel(Integer alarmLevel) {
-        this.alarmLevel = alarmLevel;
-    }
-
-    public String getAlarmContent() {
-        return alarmContent;
-    }
-
-    public void setAlarmContent(String alarmContent) {
-        this.alarmContent = alarmContent;
-    }
-
-    public Integer getAlarmValue() {
-        return alarmValue;
-    }
-
-    public void setAlarmValue(Integer alarmValue) {
-        this.alarmValue = alarmValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Date getAlarmTime() {
-        return alarmTime;
-    }
-
-    public void setAlarmTime(Date alarmTime) {
-        this.alarmTime = alarmTime;
-    }
-
-    public Date getCancelTime() {
-        return cancelTime;
-    }
-
-    public void setCancelTime(Date cancelTime) {
-        this.cancelTime = cancelTime;
-    }
+    @TableField(exist = false)
+    private String alarmTypeName;
+    @TableField(exist = false)
+    private String alarmLevelName;
 
     @Override
     protected Serializable pkVal() {
@@ -149,15 +86,15 @@
     @Override
     public String toString() {
         return "BizAlarmRecords{" +
-        "id=" + id +
-        ", deviceNo=" + deviceNo +
-        ", alarmType=" + alarmType +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", status=" + status +
-        ", alarmTime=" + alarmTime +
-        ", cancelTime=" + cancelTime +
-        "}";
+                "id=" + id +
+                ", deviceNo=" + deviceNo +
+                ", alarmType=" + alarmType +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", status=" + status +
+                ", alarmTime=" + alarmTime +
+                ", cancelTime=" + cancelTime +
+                "}";
     }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/vo/AlarmRecordVO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/vo/AlarmRecordVO.java
index 14fc3e7..db5da4e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/vo/AlarmRecordVO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/vo/AlarmRecordVO.java
@@ -2,8 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.casic.missiles.modular.system.model.BizAlarmRecords;
-import com.casic.missiles.modular.system.model.BizAlarmRule;
-import com.casic.missiles.modular.system.model.BizSensor;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 
@@ -64,17 +62,26 @@
         return (vo) -> {
             Supplier<EntityWrapper<BizAlarmRecords>> supplier = this.createEmptyQuery();
             EntityWrapper<BizAlarmRecords> query = supplier.get();
+            query.eq("b.del_flag", 0);
             if (StringUtils.isNotEmpty(alarmType)) {
                 query.eq("a.alarm_type", alarmType);
             }
+            //
+            if (StringUtils.isNotEmpty(status)) {
+                query.eq("a.status", status);
+            }
             if (StringUtils.isNotEmpty(alarmLevel)) {
                 query.eq("a.alarm_level", alarmLevel);
             }
+            if (StringUtils.isNotEmpty(startDate)) {
+                query.ge("a.alarm_time", startDate);
+            }
+            if (StringUtils.isNotEmpty(endDate)) {
+                query.le("a.alarm_time", endDate);
+            }
             if (StringUtils.isNotEmpty(keywords)) {
                 query.andNew().like("b.device_no", keywords).or().like("b.device_name", keywords);
             }
-
-
             return query;
         };
     }