diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
new file mode 100644
index 0000000..8a66283
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 点位选择Dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WellSelectDto {
+    private String name;//点位编号
+    private Long value;//值 点位id
+    private String position;// 点位地址
+
+    public WellSelectDto(String name, Long value) {
+        this.name = name;
+        this.value = value;
+    }
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
new file mode 100644
index 0000000..8a66283
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 点位选择Dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WellSelectDto {
+    private String name;//点位编号
+    private Long value;//值 点位id
+    private String position;// 点位地址
+
+    public WellSelectDto(String name, Long value) {
+        this.name = name;
+        this.value = value;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 9c9b641..076900a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,8 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则表 服务类
@@ -27,4 +33,6 @@
      */
     Float getAlarmThresh(String devCode);
 
+    List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
new file mode 100644
index 0000000..8a66283
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 点位选择Dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WellSelectDto {
+    private String name;//点位编号
+    private Long value;//值 点位id
+    private String position;// 点位地址
+
+    public WellSelectDto(String name, Long value) {
+        this.name = name;
+        this.value = value;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 9c9b641..076900a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,8 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则表 服务类
@@ -27,4 +33,6 @@
      */
     Float getAlarmThresh(String devCode);
 
+    List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index efbbac5..7d84ed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -30,7 +31,7 @@
 
     WellRelationDto getWellRelationDto(String devCode);
 
-    List<DeviceSelectDto>   selectList(DataScope dataScope);
+    List<WellSelectDto>   selectList(DataScope dataScope);
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
new file mode 100644
index 0000000..8a66283
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 点位选择Dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WellSelectDto {
+    private String name;//点位编号
+    private Long value;//值 点位id
+    private String position;// 点位地址
+
+    public WellSelectDto(String name, Long value) {
+        this.name = name;
+        this.value = value;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 9c9b641..076900a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,8 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则表 服务类
@@ -27,4 +33,6 @@
      */
     Float getAlarmThresh(String devCode);
 
+    List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index efbbac5..7d84ed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -30,7 +31,7 @@
 
     WellRelationDto getWellRelationDto(String devCode);
 
-    List<DeviceSelectDto>   selectList(DataScope dataScope);
+    List<WellSelectDto>   selectList(DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index f3aa861..45d732c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,7 +1,13 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 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.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -59,4 +65,9 @@
         }
         return null;
     }
+
+    @Override
+    public List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords) {
+        return this.baseMapper.selectAlarmRule(dataScope, page, keywords);
+    }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 74e9dd4..267b94b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -5,11 +5,15 @@
 import cn.hutool.core.util.ObjectUtil;
 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.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.ReturnDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
@@ -24,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -46,13 +51,21 @@
     @Autowired
     private IAlarmRuleService alarmRuleService;
 
+    @Resource
+    private AbstractPermissionContext permissionService;
+
     @ApiOperation("分页查询列表")
     @PostMapping("/list")
-    public ReturnDTO<List<AlarmRule>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
-        Page<AlarmRule> page = PageFactory.defaultPage();
-        QueryWrapper<AlarmRule>  queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
-        return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+    public ReturnDTO<List<AlarmRuleDto>> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+        Page<AlarmRuleDto> page = PageFactory.defaultPage();
+
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+
+        List<AlarmRuleDto> list = alarmRuleService.selectAlarmRule(dataScope, page, alarmRuleRequest.getKeywords());
+        page.setRecords(list);
+
+        return ReturnUtil.success(super.packForBT(page));
     }
 
     @ApiOperation("新增告警规则")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index db262e1..1bb82db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -16,10 +16,7 @@
 import com.casic.missiles.model.response.ErrorResponseData;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.dto.BatchExportDataDto;
-import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.dto.ReturnDTO;
-import com.casic.missiles.modular.system.dto.WellInfoRequest;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -229,7 +226,7 @@
             dataScope.setDeptIds(responsibleDeptIds);
         }
 
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
+        List<WellSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
index 3b23a4d..b43cf81 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
@@ -1,7 +1,13 @@
 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.dto.AlarmRuleDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@
  */
 public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
 
+    List<AlarmRuleDto> selectAlarmRule(@Param("scope") DataScope dataScope,
+                                       @Param("page") Page<AlarmRuleDto> page,
+                                       @Param("keywords") String keywords);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index cdd8b06..53bbca0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,8 +44,8 @@
             "\tbd.DEVCODE = #{devCode}")
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
-    @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
+    @Select("SELECT id as value,  bi.WELL_CODE as name, bi.position as position from bus_well_info bi where bi.VALID=1 order by 1 desc")
+    List<WellSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e86cd25..30e0aa5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -15,4 +15,51 @@
         <result column="TS" property="ts"/>
     </resultMap>
 
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' ||#{keywords}||'%'
+    </sql>
+
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="keywords_sql" databaseId="pgsql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+        DATE_FORMAT(${paramDate},'%Y-%m-%d')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+        TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="view_sql">
+        ID, DEVCODE, HIGHVALUE, LOWVALUE, OVERTIME, SALTATION, GRADE, OPERATOR, DEVICENAME, DEVICETYPE, DEVICETYPENAME, WATCHTYPE, MODELID, MODELNAME, DEPTID, DEPTNAME,WELLCODE,POSITION, VALID,
+        <include refid="date_toChar">
+            <property name="paramDate" value="INSTALLDATE"/>
+        </include>
+        AS "INSTALLDATE"
+    </sql>
+
+    <select id="selectAlarmRule" resultType="com.casic.missiles.modular.system.dto.AlarmRuleDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT <include refid="view_sql"/>
+            FROM alarm_rule_view
+        WHERE VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
new file mode 100644
index 0000000..1d973f9
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRuleDto.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.modular.system.dto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+/**
+ * 报警规则返回字段
+ */
+@Data
+public class AlarmRuleDto extends Model<AlarmRuleDto> {
+
+    private Long id;//主键
+
+    private String wellCode;
+    private String devCode;
+    private String deviceName;
+    private Long deviceType;//设备类型
+    private String deviceTypeName;//设备类型名称
+    private String watchType;
+    private String modelName;
+    private String deptId;
+    private String deptName;
+    private String position;
+
+    private Double highValue; // 报警上限
+    private Double lowValue; // 报警下限
+    private Double overTime; // 超时时间
+    private Double saltation; // 突变阈值
+    private String grade; // 报警等级
+    private String operator; // 操作人
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
new file mode 100644
index 0000000..8a66283
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/WellSelectDto.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 点位选择Dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WellSelectDto {
+    private String name;//点位编号
+    private Long value;//值 点位id
+    private String position;// 点位地址
+
+    public WellSelectDto(String name, Long value) {
+        this.name = name;
+        this.value = value;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
index 9c9b641..076900a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java
@@ -1,8 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则表 服务类
@@ -27,4 +33,6 @@
      */
     Float getAlarmThresh(String devCode);
 
+    List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index efbbac5..7d84ed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -30,7 +31,7 @@
 
     WellRelationDto getWellRelationDto(String devCode);
 
-    List<DeviceSelectDto>   selectList(DataScope dataScope);
+    List<WellSelectDto>   selectList(DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index f3aa861..45d732c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -1,7 +1,13 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 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.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.AlarmRuleDto;
+import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.AlarmRule;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.service.IAlarmRuleService;
@@ -59,4 +65,9 @@
         }
         return null;
     }
+
+    @Override
+    public List<AlarmRuleDto> selectAlarmRule(DataScope dataScope, Page<AlarmRuleDto> page, String keywords) {
+        return this.baseMapper.selectAlarmRule(dataScope, page, keywords);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 921d225..545e293 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -14,6 +14,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
 import com.casic.missiles.modular.system.dto.WellRelationDto;
+import com.casic.missiles.modular.system.dto.WellSelectDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import com.casic.missiles.modular.system.model.Dept;
@@ -204,7 +205,7 @@
     }
 
     @Override
-    public List<DeviceSelectDto> selectList(DataScope dataScope) {
+    public List<WellSelectDto> selectList(DataScope dataScope) {
         return this.baseMapper.selectList(dataScope);
     }
 }