zbj//1.代码调整

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/ResourceData.java

@@ -3,6 +3,7 @@ package com.njcn.device.pq.pojo.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -47,12 +48,14 @@ public class ResourceData {
      * 数据上传时间
      */
     @TableField(value = "upload_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime uploadTime;
 
     /**
      * 数据修改时间
      */
     @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java

@@ -55,12 +55,13 @@ public class ResourceController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/uploadFile")
     @ApiOperation("上传资源")
-    public HttpResult<Boolean> uploadFile(@ApiParam(value = "文件", required = true) @RequestPart("multipartFile") MultipartFile multipartFile,
+    public HttpResult<Boolean> uploadFile(@ApiParam(value = "文件", required = true) MultipartFile multipartFile,
-                                          @ApiParam(value = "文件", required = false) @RequestPart("picture") MultipartFile picture,
+                                          @ApiParam(value = "文件", required = false)  MultipartFile picture,
                                           @ApiParam(value = "资源名称", required = true) String name,
+                                          @ApiParam(value = "资源状态", required = true) Integer state,
                                           @ApiParam(value = "资源类型", required = true) Integer type) {
         String methodDescribe = getMethodDescribe("uploadFile");
-        Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, picture, name, type);
+        Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, picture, name, state, type);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
@@ -72,10 +73,11 @@ public class ResourceController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryData")
     @ApiOperation("查询数据")
-    public HttpResult<List<ResourceData>> queryData(@RequestParam(value = "type", required = false) Integer type,
+    public HttpResult<List<ResourceData>> queryData(@ApiParam(value = "资源类型", required = false) Integer type,
-                                                    @RequestParam(value = "state", required = false) Integer state) {
+                                                    @ApiParam(value = "资源状态", required = false) Integer state,
+                                                    @ApiParam(value = "搜索框数据", required = false) String searchValue) {
         String methodDescribe = getMethodDescribe("queryData");
-        List<ResourceData> result = iResourceAdministrationService.queryData(type,state);
+        List<ResourceData> result = iResourceAdministrationService.queryData(type, state, searchValue);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -86,7 +88,7 @@ public class ResourceController extends BaseController {
     @ApiImplicitParam(name = "id", value = "id", required = true)
     public void play1(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) {
         ResourceData resourceData = resourceMapper.selectById(id);
-        fileStorageUtil.downloadStream(response,resourceData.getResUrl());
+        fileStorageUtil.downloadStream(response, resourceData.getResUrl());
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -102,13 +104,13 @@ public class ResourceController extends BaseController {
             //获取请求头中Range的值
             String rangeString = request.getHeader(HttpHeaders.RANGE);
             //打开文件
-            File file = File.createTempFile(IdWorker.getIdStr(),".mp4");
+            File file = File.createTempFile(IdWorker.getIdStr(), ".mp4");
             ResourceData resourceData = resourceMapper.selectById(id);
             InputStream ins = fileStorageUtil.getFileStream(resourceData.getResUrl());
             long l = System.currentTimeMillis();
-            FileUtil.writeFromStream(ins,file);
+            FileUtil.writeFromStream(ins, file);
             long ll = System.currentTimeMillis();
-            System.out.println("流转文件耗时："+(ll-l)+"=============================");
+            System.out.println("流转文件耗时：" + (ll - l) + "=============================");
             if (file.exists()) {
                 //使用RandomAccessFile读取文件
                 targetFile = new RandomAccessFile(file, "r");
@@ -185,15 +187,15 @@ public class ResourceController extends BaseController {
         } catch (Exception e) {
             log.error("文件传输错误", e);
             throw new RuntimeException("文件传输错误");
-        }finally {
+        } finally {
-            if(outputStream != null){
+            if (outputStream != null) {
                 try {
                     outputStream.close();
                 } catch (IOException e) {
                     log.error("流释放错误", e);
                 }
             }
-            if(targetFile != null){
+            if (targetFile != null) {
                 try {
                     targetFile.close();
                 } catch (IOException e) {
@@ -210,23 +212,23 @@ public class ResourceController extends BaseController {
     @PostMapping("/updateFile")
     @ApiOperation("修改资源")
     public HttpResult<Boolean> updateFile(@ApiParam(value = "id", required = true) String id,
-                                          @ApiParam(value = "文件", required = false)  MultipartFile multipartFile,
+                                          @ApiParam(value = "文件", required = false) MultipartFile multipartFile,
-                                          @ApiParam(value = "图片", required = false)  MultipartFile picture,
+                                          @ApiParam(value = "图片", required = false) MultipartFile picture,
                                           @ApiParam(value = "资源名称", required = false) String name,
                                           @ApiParam(value = "资源状态", required = false) Integer state,
                                           @ApiParam(value = "资源类型", required = false) Integer type) {
         String methodDescribe = getMethodDescribe("updateFile");
-        Boolean flag = iResourceAdministrationService.updateFile(id, multipartFile, picture, name,state, type);
+        Boolean flag = iResourceAdministrationService.updateFile(id, multipartFile, picture, name, state, type);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
-   /**
+    /**
      * 删除资源
      */
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/deleteFile")
     @ApiOperation("删除资源")
-    @ApiImplicitParam(name = "id",value = "id",required = true)
+    @ApiImplicitParam(name = "id", value = "id", required = true)
     public HttpResult<Boolean> deleteFile(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("deleteFile");
         Boolean flag = iResourceAdministrationService.deleteFile(id);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java

@@ -17,9 +17,9 @@ import java.util.List;
  */
 public interface ResourceService extends IService<ResourceData> {
 
-    Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type);
+    Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer state, Integer type);
 
-    List<ResourceData> queryData(Integer type,Integer state);
+    List<ResourceData> queryData(Integer type,Integer state,String searchValue);
 
     void previewFile(String id, HttpServletRequest request, HttpServletResponse response) throws IOException;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java

@@ -37,7 +37,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
     //private final GeneralInfo generalInfo;
 
     @Override
-    public Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type) {
+    public Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name,Integer state, Integer type) {
         String resUrl = "";
         String picUrl = "";
         //通过封装好的文件工具类来传入文件和文件夹名称来获取文件路径
@@ -52,26 +52,35 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
         resourceData.setResUrl(resUrl);
         resourceData.setPicUrl(picUrl);
         resourceData.setUploadTime(LocalDateTime.now());
-        resourceData.setState(1);
+        resourceData.setState(state);
         resourceData.setType(type);
         resourceData.setFileName(multipartFile.getOriginalFilename());
         return this.save(resourceData);
     }
 
     @Override
-    public List<ResourceData> queryData(Integer type,Integer state) {
+    public List<ResourceData> queryData(Integer type, Integer state, String searchValue) {
         List<ResourceData> list = null;
-        if (null != type && null != state) {
+        if (null != type || null != state || StringUtils.isNotBlank(searchValue)) {
             LambdaQueryWrapper<ResourceData> wrapper = new LambdaQueryWrapper<>();
-            //type
+            if (null != type) {
-            wrapper.eq(ResourceData::getType, type);
+                //type
-            //state
+                wrapper.eq(ResourceData::getType, type);
-            wrapper.eq(ResourceData::getState, state);
+            }
+            if (null != state) {
+                //state
+                wrapper.eq(ResourceData::getState, state);
+            }
+            if (StringUtils.isNotBlank(searchValue)) {
+                //name
+                wrapper.like(ResourceData::getResourceName, searchValue);
+            }
             list = resourceMapper.selectList(wrapper);
         } else {
             list = this.list();
         }
-        for (ResourceData resourceData : list) {
+        for (
+                ResourceData resourceData : list) {
             resourceData.setResUrl(fileStorageUtil.getFileUrl(resourceData.getResUrl()));
             if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
                 resourceData.setPicUrl(fileStorageUtil.getFileUrl(resourceData.getPicUrl()));