From 18c42627a82fa8f473fe12bc24f72d86eba81607 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 16 Feb 2022 10:13:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/documentManage/library/index.vue | 63 ++++++++++++------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 8d40cb001..5e1468168 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -42,6 +42,8 @@ import tableData from '@/components/tableDate/index' import addForm from './modules/addForm' import frameAssembly from '@/components/frameAssembly/index' + import { getAction, postAction, deleteAction } from '@/api/manage' + import eventBUs from '../../../common/event' export default { name: 'docLibrary', @@ -69,47 +71,48 @@ { text: '删除', ClickEvent: 'deleteTable' - }, + } ], selectedRowKeys: [], loading: false, - url:{ - tableHeader:'document/bussDocumentLibraryEO/getHeader', //表格头部字段 - seachList:'document/bussDocumentLibraryEO/queryCondition', //搜索字段 - tableList:'document/bussDocumentLibraryEO/queryPageInfo', //表格数据 - getAddForm:'document/bussDocumentLibraryEO/getAddForm', // 表单的字段 - addInfo:'document/bussDocumentLibraryEO/addInfo', //新增 - updateInfo:'document/bussDocumentLibraryEO/updateInfo', //编辑 - getDocumentInfo:'document/bussDocumentLibraryEO/getDocumentInfoById', //查看 - }, + url: { + tableHeader: 'document/bussDocumentLibraryEO/getHeader', //表格头部字段 + seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 + tableList: 'document/bussDocumentLibraryEO/queryPageInfo', //表格数据 + getAddForm: 'document/bussDocumentLibraryEO/getAddForm', // 表单的字段 + addInfo: 'document/bussDocumentLibraryEO/addInfo', //新增 + updateInfo: 'document/bussDocumentLibraryEO/updateInfo', //编辑 + getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById', //查看 + deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch' //删除 + } } }, methods: { onSelectChange() { }, - handleExport(){ + handleExport() { }, - handleFileExport(){ + handleFileExport() { }, - handleAdd(){ + handleAdd() { this.$refs.addFormRef.add() }, - handleModule(){ + handleModule() { }, - handleDel(){ + handleDel() { }, handleCompare() { - this.$nextTick(()=>{ + this.$nextTick(() => { this.$refs.frameAssemblyRef.visible = true }) // this.$refs.addFormRef.add() }, - handleFileImport(){ + handleFileImport() { }, //编辑按钮 @@ -117,16 +120,30 @@ this.$refs.addFormRef.edit(val) }, //删除按钮 - deleteTable(val){ - console.log(val) + deleteTable(val) { + let _this = this + this.$confirm({ + content: '确认删除？', + onOk() { + deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { + if (res.success) { + _this.$message.success(res.message) + eventBUs.$emit('searchReset') + } else { + this.$message.warning(res.message) + } + }) + } + }) + }, //收藏按钮 - Collection(val){ - console.log('val111',val) + Collection(val) { + console.log('val111', val) }, //订阅按钮 - subscribe(val){ - console.log('val222',val) + subscribe(val) { + console.log('val222', val) } } } From 56c6c4c56ecae91a67f3ad04048788ce0e8cff2e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 16 Feb 2022 15:00:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=B7=B2=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?,=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oss/service/IOSSFileService.java | 3 +++ .../oss/service/impl/OSSFileServiceImpl.java | 11 ++++++++++- .../system/controller/CommonController.java | 19 +++++++++++++++++++ .../IBussDocumentLibraryEOService.java | 5 +++++ .../BussDocumentLibraryEOServiceImpl.java | 18 +++++++++--------- 5 files changed, 46 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java index a02a08bb5..071b1c843 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java @@ -19,6 +19,9 @@ public interface IOSSFileService extends IService { */ public OSSFile uploadLocal(MultipartFile mf, String bizPath); + + public List getFileInfos(String connectId); + boolean delete(OSSFile ossFile); /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index cfcfff460..8aa5db91c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.oss.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; @@ -108,7 +109,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl //存入文件表 oSSFile.setFileName(orgName); oSSFile.setId(UuidUtils.getUUID()); - oSSFile.setUrl(file.getPath()); + oSSFile.setUrl(savePath); oSSFile.setCreateBy(loginUser.getUsername()); oSSFile.setCreateTime(new Date()); this.save(oSSFile); @@ -119,6 +120,14 @@ public class OSSFileServiceImpl extends ServiceImpl impl return oSSFile; } + @Override + public List getFileInfos(String connectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(OSSFile::getConnectId,connectId); + List list = this.list(wrapper); + return list; + } + @Override public boolean delete(OSSFile ossFile) { try { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 9e03347c6..180a75f1c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -7,6 +7,8 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.util.*; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; @@ -30,6 +32,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLDecoder; +import java.util.List; + /** *

* 用户表 前端控制器 @@ -38,6 +42,7 @@ import java.net.URLDecoder; * @Author scott * @since 2018-12-20 */ +@Api(tags="文件通用") @Slf4j @RestController @RequestMapping("/sys/common") @@ -129,6 +134,7 @@ public class CommonController { * @param response * @return */ + @ApiOperation(value="文件上传统一方法", notes="文件上传统一方法") @PostMapping(value = "/upload") public Result upload(HttpServletRequest request, HttpServletResponse response) { Result result = new Result<>(); @@ -154,6 +160,19 @@ public class CommonController { return result; } + /** + * 查看已上传的文件 + * @param connectId + * @return + */ + @ApiOperation(value="查看已上传的文件", notes="查看已上传的文件") + @GetMapping(value = "/getFileInfos") + public Result getFileInfos(String connectId) { + List fileInfos = ossFileService.getFileInfos(connectId); + return Result.OK(fileInfos); + } + + /** * 预览图片&下载文件 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 967311d7f..2b8c5b94f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -86,6 +86,11 @@ public interface IBussDocumentLibraryEOService extends IService map); + /** + * 分页 + * @param parameter + * @return + */ IPage getInfoPage(Map parameter); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 08f4aff02..0ecffe576 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -270,7 +270,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); for (String fileId : value.toString().split(",")) { @@ -280,8 +280,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { - - - //需要查询的字段 List fieldList = onlCgformFieldService.getFieldList("1"); if (fieldList.size() != 0) { @@ -464,14 +464,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl