diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 6b5a8fd..e45613c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -77,6 +77,19 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDto> deviceList = deviceService.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(deviceDto -> {
+            deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+            deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+        });
+        return new SuccessResponseData(deviceList);
+    }
+
+    @RequestMapping(value = "/list-page")
+    @ResponseBody
+    public Object listPage(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
         Page<DeviceDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 6b5a8fd..e45613c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -77,6 +77,19 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDto> deviceList = deviceService.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(deviceDto -> {
+            deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+            deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+        });
+        return new SuccessResponseData(deviceList);
+    }
+
+    @RequestMapping(value = "/list-page")
+    @ResponseBody
+    public Object listPage(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
         Page<DeviceDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 244e9ff..e2104a4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,6 +20,8 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 6b5a8fd..e45613c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -77,6 +77,19 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDto> deviceList = deviceService.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(deviceDto -> {
+            deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+            deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+        });
+        return new SuccessResponseData(deviceList);
+    }
+
+    @RequestMapping(value = "/list-page")
+    @ResponseBody
+    public Object listPage(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
         Page<DeviceDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 244e9ff..e2104a4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,6 +20,8 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8de6875..0974260 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -109,6 +109,43 @@
         ORDER by a.DEVCODE
     </select>
 
+    <select id="getDeviceList" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        <include refid="view_sql"/>
+        FROM device_view
+        WHERE VALID = '1'
+        <if test="deviceType != null and deviceType !=''">
+            and deviceType = #{deviceType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="isOnline != null and isOnline !=''">
+            and onlineState = #{isOnline}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and installDate &gt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and installDate &lt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY INSTALLDATE DESC
+    </select>
+
     <select id="selectDataScopePage" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 6b5a8fd..e45613c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -77,6 +77,19 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDto> deviceList = deviceService.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(deviceDto -> {
+            deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+            deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+        });
+        return new SuccessResponseData(deviceList);
+    }
+
+    @RequestMapping(value = "/list-page")
+    @ResponseBody
+    public Object listPage(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
         Page<DeviceDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 244e9ff..e2104a4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,6 +20,8 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8de6875..0974260 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -109,6 +109,43 @@
         ORDER by a.DEVCODE
     </select>
 
+    <select id="getDeviceList" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        <include refid="view_sql"/>
+        FROM device_view
+        WHERE VALID = '1'
+        <if test="deviceType != null and deviceType !=''">
+            and deviceType = #{deviceType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="isOnline != null and isOnline !=''">
+            and onlineState = #{isOnline}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and installDate &gt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and installDate &lt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY INSTALLDATE DESC
+    </select>
+
     <select id="selectDataScopePage" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 1bef4a7..7f6232e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -21,18 +21,33 @@
  */
 public interface IDeviceService extends IService<Device> {
 
+
+    /**
+     * 不分页
+     *
+     * @param dataScope
+     * @param deviceType
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @param isOnline
+     * @return
+     */
+    List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
+
     /**
      * 根据条件分页查询设备列表
      *
      * @param dataScope  数据权限集合
-     * @param page       分页参数
      * @param deviceType 设备类型
      * @param deptid     组织ID
      * @param beginTime  设备安装开始时间
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid,
+                                        String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 6b5a8fd..e45613c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -77,6 +77,19 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDto> deviceList = deviceService.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(deviceDto -> {
+            deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+            deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+        });
+        return new SuccessResponseData(deviceList);
+    }
+
+    @RequestMapping(value = "/list-page")
+    @ResponseBody
+    public Object listPage(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) {
         Page<DeviceDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 244e9ff..e2104a4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,6 +20,8 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8de6875..0974260 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -109,6 +109,43 @@
         ORDER by a.DEVCODE
     </select>
 
+    <select id="getDeviceList" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        <include refid="view_sql"/>
+        FROM device_view
+        WHERE VALID = '1'
+        <if test="deviceType != null and deviceType !=''">
+            and deviceType = #{deviceType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="isOnline != null and isOnline !=''">
+            and onlineState = #{isOnline}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and installDate &gt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and installDate &lt;
+            <include refid="dateTime_toChar">
+                <property name="paramTime" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (DEVCODE like
+            <include refid="keywords_sql"/>
+            OR wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
+        ORDER BY INSTALLDATE DESC
+    </select>
+
     <select id="selectDataScopePage" fetchSize="3000" resultType="com.casic.missiles.modular.system.dto.DeviceDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 1bef4a7..7f6232e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -21,18 +21,33 @@
  */
 public interface IDeviceService extends IService<Device> {
 
+
+    /**
+     * 不分页
+     *
+     * @param dataScope
+     * @param deviceType
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @param isOnline
+     * @return
+     */
+    List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
+
     /**
      * 根据条件分页查询设备列表
      *
      * @param dataScope  数据权限集合
-     * @param page       分页参数
      * @param deviceType 设备类型
      * @param deptid     组织ID
      * @param beginTime  设备安装开始时间
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid,
+                                        String beginTime, String endTime, String keywords, String isOnline);
 
     /**
      * 根据闸井编号查询闸井ID
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 1a48093..77d3da6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -54,6 +54,23 @@
     @Autowired
     private Validator validator;
 
+
+    /**
+     * 不分页
+     *
+     * @param dataScope
+     * @param deviceType
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @param isOnline
+     * @return
+     */
+    public  List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline){
+        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+    }
+
     /**
      * 判断设备是否关联集中器
      *