diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
index 4c4d1fa84..d04fc2aa8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
@@ -72,9 +72,10 @@ public class ResourceController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryData")
     @ApiOperation("查询数据")
-    public HttpResult<List<ResourceData>> queryData() {
+    public HttpResult<List<ResourceData>> queryData(@RequestParam(value = "type", required = false) Integer type,
+                                                    @RequestParam(value = "state", required = false) Integer state) {
         String methodDescribe = getMethodDescribe("queryData");
-        List<ResourceData> result = iResourceAdministrationService.queryData();
+        List<ResourceData> result = iResourceAdministrationService.queryData(type,state);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java
index 2db3a62a0..fb2ec9e33 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java
@@ -19,7 +19,7 @@ public interface ResourceService extends IService<ResourceData> {
 
     Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type);
 
-    List<ResourceData> queryData();
+    List<ResourceData> queryData(Integer type,Integer state);
 
     void previewFile(String id, HttpServletRequest request, HttpServletResponse response) throws IOException;
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
index b73ce4e59..b303a7eda 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
@@ -1,11 +1,13 @@
 package com.njcn.device.pq.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.device.pq.mapper.ResourceMapper;
 import com.njcn.device.pq.pojo.po.ResourceData;
 import com.njcn.device.pq.service.ResourceService;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
+import com.njcn.system.pojo.po.Resinformation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -57,8 +59,18 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
     }
 
     @Override
-    public List<ResourceData> queryData() {
-        List<ResourceData> list = this.list();
+    public List<ResourceData> queryData(Integer type,Integer state) {
+        List<ResourceData> list = null;
+        if (null != type && null != state) {
+            LambdaQueryWrapper<ResourceData> wrapper = new LambdaQueryWrapper<>();
+            //type
+            wrapper.eq(ResourceData::getType, type);
+            //state
+            wrapper.eq(ResourceData::getState, state);
+            list = resourceMapper.selectList(wrapper);
+        } else {
+            list = this.list();
+        }
         for (ResourceData resourceData : list) {
             if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
                 resourceData.setPicUrl(fileStorageUtil.getFileUrl(resourceData.getPicUrl()));
@@ -214,7 +226,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
         //删除文件
         fileStorageUtil.deleteFile(resourceData.getResUrl());
         //存在图片删除图片
-        if (StringUtils.isNotBlank(resourceData.getPicUrl())){
+        if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
             fileStorageUtil.deleteFile(resourceData.getPicUrl());
         }
         //删除数据