From d2a1694242139806dd97e77c2d940e0778dc51fa Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Tue, 30 May 2023 16:27:36 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/po/ResourceData.java | 3 ++ .../pq/controller/ResourceController.java | 38 ++++++++++--------- .../device/pq/service/ResourceService.java | 4 +- .../pq/service/impl/ResourceServiceImpl.java | 27 ++++++++----- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/ResourceData.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/ResourceData.java index 273057e06..93934235f 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/ResourceData.java +++ b/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; /** 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 ff8167e86..ae7598f15 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 @@ -55,12 +55,13 @@ public class ResourceController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/uploadFile") @ApiOperation("上传资源") - public HttpResult uploadFile(@ApiParam(value = "文件", required = true) @RequestPart("multipartFile") MultipartFile multipartFile, - @ApiParam(value = "文件", required = false) @RequestPart("picture") MultipartFile picture, + public HttpResult uploadFile(@ApiParam(value = "文件", required = true) MultipartFile multipartFile, + @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> queryData(@RequestParam(value = "type", required = false) Integer type, - @RequestParam(value = "state", required = false) Integer state) { + public HttpResult> queryData(@ApiParam(value = "资源类型", required = false) Integer type, + @ApiParam(value = "资源状态", required = false) Integer state, + @ApiParam(value = "搜索框数据", required = false) String searchValue) { String methodDescribe = getMethodDescribe("queryData"); - List result = iResourceAdministrationService.queryData(type,state); + List 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 { - if(outputStream != null){ + } finally { + 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 updateFile(@ApiParam(value = "id", required = true) String id, - @ApiParam(value = "文件", required = false) MultipartFile multipartFile, - @ApiParam(value = "图片", required = false) MultipartFile picture, + @ApiParam(value = "文件", required = false) MultipartFile multipartFile, + @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 deleteFile(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("deleteFile"); Boolean flag = iResourceAdministrationService.deleteFile(id); 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 fb2ec9e33..464c1eb3b 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 @@ -17,9 +17,9 @@ import java.util.List; */ public interface ResourceService extends IService { - Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type); + Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer state, Integer type); - List queryData(Integer type,Integer state); + List queryData(Integer type,Integer state,String searchValue); 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 d59cd7e0e..990052737 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 @@ -37,7 +37,7 @@ public class ResourceServiceImpl extends ServiceImpl queryData(Integer type,Integer state) { + public List queryData(Integer type, Integer state, String searchValue) { List list = null; - if (null != type && null != state) { + if (null != type || null != state || StringUtils.isNotBlank(searchValue)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //type - wrapper.eq(ResourceData::getType, type); - //state - wrapper.eq(ResourceData::getState, state); + if (null != type) { + //type + wrapper.eq(ResourceData::getType, type); + } + 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()));