From 00b90439157a92c857d0ef32ffa1887b3bef92f1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 18 七月 2021 20:27:37 +0800
Subject: [PATCH] add 增加 OSS 模块业务代码

---
 ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java         |   10 
 ruoyi-ui/src/api/system/oss.js                                               |   35 +++
 ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java               |   62 ++++++
 ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java |   36 ++-
 ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java            |    4 
 sql/oss.sql                                                                  |    2 
 ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java    |   27 ++
 ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java                    |   63 +++++++
 ruoyi-ui/src/views/system/oss/index.vue                                      |  286 +++++++++++++++++++++++++++++++
 9 files changed, 501 insertions(+), 24 deletions(-)

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java b/ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java
new file mode 100644
index 0000000..b96e790
--- /dev/null
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java
@@ -0,0 +1,62 @@
+package com.ruoyi.system.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * OSS浜戝瓨鍌ㄥ垎椤垫煡璇㈠璞� sys_oss
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("OSS浜戝瓨鍌ㄥ垎椤垫煡璇㈠璞�")
+public class SysOssQueryBo extends BaseEntity {
+
+	/**
+	 * 鍒嗛〉澶у皬
+	 */
+	@ApiModelProperty("鍒嗛〉澶у皬")
+	private Integer pageSize;
+	/**
+	 * 褰撳墠椤垫暟
+	 */
+	@ApiModelProperty("褰撳墠椤垫暟")
+	private Integer pageNum;
+	/**
+	 * 鎺掑簭鍒�
+	 */
+	@ApiModelProperty("鎺掑簭鍒�")
+	private String orderByColumn;
+	/**
+	 * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
+	 */
+	@ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+	private String isAsc;
+
+
+	/**
+	 * 鏂囦欢鍚�
+	 */
+	@ApiModelProperty("鏂囦欢鍚�")
+	private String fileName;
+	/**
+	 * 鏂囦欢鍚庣紑鍚�
+	 */
+	@ApiModelProperty("鏂囦欢鍚庣紑鍚�")
+	private String fileSuffix;
+	/**
+	 * URL鍦板潃
+	 */
+	@ApiModelProperty("URL鍦板潃")
+	private String url;
+	/**
+	 * 鏈嶅姟鍟�
+	 */
+	@ApiModelProperty("鏈嶅姟鍟�")
+	private String service;
+
+}
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
index a629626..9d1e917 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
@@ -8,11 +8,18 @@
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.system.bo.SysOssQueryBo;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
+import com.ruoyi.system.vo.SysOssVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,6 +33,8 @@
  *
  * @author Lion Li
  */
+@Validated
+@Api(value = "OSS浜戝瓨鍌ㄦ帶鍒跺櫒", tags = {"OSS浜戝瓨鍌ㄧ鐞�"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/oss")
@@ -34,22 +43,27 @@
 	private final ISysOssService iSysOssService;
 
 	/**
-	 * 鏌ヨ鏂囦欢涓婁紶鍒楄〃
+	 * 鏌ヨOSS浜戝瓨鍌ㄥ垪琛�
 	 */
+	@ApiOperation("鏌ヨOSS浜戝瓨鍌ㄥ垪琛�")
 	@PreAuthorize("@ss.hasPermi('system:oss:list')")
 	@GetMapping("/list")
-	public TableDataInfo<SysOss> list(SysOss sysOss) {
-		return iSysOssService.queryPageList(sysOss);
+	public TableDataInfo<SysOssVo> list(@Validated SysOssQueryBo bo) {
+		return iSysOssService.queryPageList(bo);
 	}
 
 	/**
-	 * 涓婁紶鍥剧墖
+	 * 涓婁紶OSS浜戝瓨鍌�
 	 */
+	@ApiOperation("涓婁紶OSS浜戝瓨鍌�")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "file", value = "鏂囦欢", dataType = "java.io.File", required = true),
+	})
 	@PreAuthorize("@ss.hasPermi('system:oss:upload')")
 	@Log(title = "OSS浜戝瓨鍌�", businessType = BusinessType.INSERT)
 	@RepeatSubmit
 	@PostMapping("/upload")
-	public AjaxResult<Map<String, String>> upload(@RequestParam("file") MultipartFile file) {
+	public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
 		if (file.isEmpty()) {
 			throw new CustomException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
 		}
@@ -63,12 +77,13 @@
 	/**
 	 * 鍒犻櫎OSS浜戝瓨鍌�
 	 */
+	@ApiOperation("鍒犻櫎OSS浜戝瓨鍌�")
 	@PreAuthorize("@ss.hasPermi('system:oss:remove')")
 	@Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ossIds}")
 	public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
 								   @PathVariable Long[] ossIds) {
-		return toAjax(iSysOssService.deleteByIds(Arrays.asList(ossIds)) ? 1 : 0);
+		return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
 	}
 
 }
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java b/ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
index 2e28a09..8eee53b 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.system.domain.SysOss;
 
 /**
@@ -8,5 +8,5 @@
  *
  * @author Lion Li
  */
-public interface SysOssMapper extends BaseMapper<SysOss> {
+public interface SysOssMapper extends BaseMapperPlus<SysOss> {
 }
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java
index 8ebf566..cc61fa0 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java
@@ -1,8 +1,10 @@
 package com.ruoyi.system.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.bo.SysOssQueryBo;
 import com.ruoyi.system.domain.SysOss;
+import com.ruoyi.system.vo.SysOssVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
@@ -12,11 +14,11 @@
  *
  * @author Lion Li
  */
-public interface ISysOssService extends IService<SysOss> {
+public interface ISysOssService extends IServicePlus<SysOss> {
 
-	TableDataInfo<SysOss> queryPageList(SysOss sysOss);
+	TableDataInfo<SysOssVo> queryPageList(SysOssQueryBo sysOss);
 
 	SysOss upload(MultipartFile file);
 
-	Boolean deleteByIds(Collection<Long> ids);
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
index 1f9c764..eacd8a0 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
@@ -3,40 +3,51 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.oss.factory.OssFactory;
 import com.ruoyi.oss.service.ICloudStorageService;
+import com.ruoyi.system.bo.SysOssQueryBo;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.mapper.SysOssMapper;
 import com.ruoyi.system.service.ISysOssService;
-import lombok.extern.slf4j.Slf4j;
+import com.ruoyi.system.vo.SysOssVo;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鏂囦欢涓婁紶 鏈嶅姟灞傚疄鐜�
  *
  * @author Lion Li
  */
-@Slf4j
 @Service
-public class SysOssServiceImpl extends ServiceImpl<SysOssMapper, SysOss> implements ISysOssService {
+public class SysOssServiceImpl extends ServicePlusImpl<SysOssMapper, SysOss> implements ISysOssService {
 
 	@Override
-	public TableDataInfo<SysOss> queryPageList(SysOss sysOss) {
+	public TableDataInfo<SysOssVo> queryPageList(SysOssQueryBo bo) {
+		PagePlus<SysOss, SysOssVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), SysOssVo.class);
+		return PageUtils.buildDataInfo(result);
+	}
+
+	private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssQueryBo bo) {
+		Map<String, Object> params = bo.getParams();
 		LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
-		lqw.like(StrUtil.isNotBlank(sysOss.getFileName()), SysOss::getFileName, sysOss.getFileName());
-		lqw.like(StrUtil.isNotBlank(sysOss.getFileSuffix()), SysOss::getFileSuffix, sysOss.getFileSuffix());
-		lqw.like(StrUtil.isNotBlank(sysOss.getUrl()), SysOss::getUrl, sysOss.getUrl());
-		lqw.like(StrUtil.isNotBlank(sysOss.getService()), SysOss::getService, sysOss.getService());
-		return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
+		lqw.like(StrUtil.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());
+		lqw.eq(StrUtil.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix());
+		lqw.eq(StrUtil.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl());
+		lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+			SysOss::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"));
+		lqw.eq(StrUtil.isNotBlank(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy());
+		lqw.eq(StrUtil.isNotBlank(bo.getService()), SysOss::getService, bo.getService());
+		return lqw;
 	}
 
 	@Override
@@ -59,7 +70,10 @@
 	}
 
 	@Override
-	public Boolean deleteByIds(Collection<Long> ids) {
+	public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+		if(isValid){
+			// 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+		}
 		List<SysOss> list = listByIds(ids);
 		for (SysOss sysOss : list) {
 			ICloudStorageService storage = OssFactory.instance(sysOss.getService());
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java b/ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java
new file mode 100644
index 0000000..948b954
--- /dev/null
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * OSS浜戝瓨鍌ㄨ鍥惧璞� sys_oss
+ *
+ * @author Lion Li
+ */
+@Data
+@ApiModel("OSS浜戝瓨鍌ㄨ鍥惧璞�")
+public class SysOssVo {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 *  浜戝瓨鍌ㄤ富閿�
+	 */
+	@ApiModelProperty("浜戝瓨鍌ㄤ富閿�")
+	private Long ossId;
+
+	/**
+	 * 鏂囦欢鍚�
+	 */
+	@ApiModelProperty("鏂囦欢鍚�")
+	private String fileName;
+
+	/**
+	 * 鏂囦欢鍚庣紑鍚�
+	 */
+	@ApiModelProperty("鏂囦欢鍚庣紑鍚�")
+	private String fileSuffix;
+
+	/**
+	 * URL鍦板潃
+	 */
+	@ApiModelProperty("URL鍦板潃")
+	private String url;
+
+	/**
+	 * 鍒涘缓鏃堕棿
+	 */
+	@ApiModelProperty("鍒涘缓鏃堕棿")
+	private Date createTime;
+
+	/**
+	 * 涓婁紶浜�
+	 */
+	@ApiModelProperty("涓婁紶浜�")
+	private String createBy;
+
+	/**
+	 * 鏈嶅姟鍟�
+	 */
+	@ApiModelProperty("鏈嶅姟鍟�")
+	private String service;
+
+
+}
diff --git a/ruoyi-ui/src/api/system/oss.js b/ruoyi-ui/src/api/system/oss.js
new file mode 100644
index 0000000..e36ef16
--- /dev/null
+++ b/ruoyi-ui/src/api/system/oss.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 鏌ヨOSS浜戝瓨鍌ㄥ垪琛�
+export function listOss(query) {
+  return request({
+    url: '/system/oss/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 涓婁紶OSS浜戝瓨鍌�
+export function addOss(data) {
+  return request({
+    url: '/system/oss/upload',
+    method: 'post',
+    data: data
+  })
+}
+
+// 涓嬭浇OSS浜戝瓨鍌�
+export function downloadOss(ossId) {
+  return request({
+    url: '/system/oss/download/' + ossId,
+    method: 'get'
+  })
+}
+
+// 鍒犻櫎OSS浜戝瓨鍌�
+export function delOss(ossId) {
+  return request({
+    url: '/system/oss/' + ossId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
new file mode 100644
index 0000000..ce888f6
--- /dev/null
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="鏂囦欢鍚�" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="璇疯緭鍏ユ枃浠跺悕"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏂囦欢鍚庣紑" prop="fileSuffix">
+        <el-input
+          v-model="queryParams.fileSuffix"
+          placeholder="璇疯緭鍏ユ枃浠跺悗缂�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鍒涘缓鏃堕棿">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="涓婁紶浜�" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="璇疯緭鍏ヤ笂浼犱汉"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏈嶅姟鍟�" prop="service">
+        <el-input
+          v-model="queryParams.service"
+          placeholder="璇疯緭鍏ユ湇鍔″晢"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:oss:upload']"
+        >涓婁紶</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:oss:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="浜戝瓨鍌ㄤ富閿�" align="center" prop="ossId" v-if="false"/>
+      <el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" />
+      <el-table-column label="鏂囦欢鍚庣紑鍚�" align="center" prop="fileSuffix" />
+      <el-table-column label="URL鍦板潃" align="center" prop="url" />
+      <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="涓婁紶浜�" align="center" prop="createBy" />
+      <el-table-column label="鏈嶅姟鍟�" align="center" prop="service" />
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDownload(scope.row)"
+            v-hasPermi="['system:oss:download']"
+          >涓嬭浇</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:oss:remove']"
+          >鍒犻櫎</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀筄SS浜戝瓨鍌ㄥ璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="鏂囦欢鍚�">
+          <imageUpload v-model="form.file"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOss, delOss, addOss, downloadOss } from "@/api/system/oss";
+
+export default {
+  name: "Oss",
+  data() {
+    return {
+      // 鎸夐挳loading
+      buttonLoading: false,
+      // 閬僵灞�
+      loading: true,
+      // 瀵煎嚭閬僵灞�
+      exportLoading: false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // OSS浜戝瓨鍌ㄨ〃鏍兼暟鎹�
+      ossList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鍒涘缓鏃堕棿鏃堕棿鑼冨洿
+      daterangeCreateTime: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fileName: undefined,
+        fileSuffix: undefined,
+        url: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        service: undefined
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        file: [
+          { required: true, message: "鏂囦欢涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listOss(this.queryParams).then(response => {
+        this.ossList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        ossId: undefined,
+        file: undefined,
+        fileName: undefined,
+        fileSuffix: undefined,
+        url: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined,
+        service: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.ossId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "涓婁紶OSS浜戝瓨鍌�";
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          addOss(this.form).then(response => {
+            this.msgSuccess("涓婁紶鎴愬姛");
+            this.open = false;
+            this.getList();
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ossIds = row.ossId || this.ids;
+      this.$confirm('鏄惁纭鍒犻櫎OSS浜戝瓨鍌ㄧ紪鍙蜂负"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning"
+        }).then(() => {
+          this.loading = true;
+          return delOss(ossIds);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.msgSuccess("鍒犻櫎鎴愬姛");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/sql/oss.sql b/sql/oss.sql
index ecb8416..1b59348 100644
--- a/sql/oss.sql
+++ b/sql/oss.sql
@@ -17,7 +17,7 @@
 
 insert into sys_config values(10, 'OSS浜戝瓨鍌ㄦ湇鍔″晢',       'sys.oss.cloudStorageService',      'minio',          'Y', 'admin', sysdate(), '', null, 'OSS浜戝瓨鍌ㄦ湇鍔″晢(qiniu:涓冪墰浜�, aliyun:闃块噷浜�, qcloud:鑵捐浜�, minio: Minio)');
 
-insert into sys_menu values('118',  '鏂囦欢绠$悊', '1',   '10', 'oss',     'system/oss/index',      1, 0, 'C', '0', '0', 'system:oss:list',      'oss',       'admin', sysdate(), '', null, '鏂囦欢绠$悊鑿滃崟');
+insert into sys_menu values('118',  '鏂囦欢绠$悊', '1',   '10', 'oss',     'system/oss/index',      1, 0, 'C', '0', '0', 'system:oss:list',      'upload',       'admin', sysdate(), '', null, '鏂囦欢绠$悊鑿滃崟');
 
 insert into sys_menu values('1600', '鏂囦欢鏌ヨ', '118', '1', '#', '', 1, 0, 'F', '0', '0', 'system:oss:query',        '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1601', '鏂囦欢涓婁紶', '118', '2', '#', '', 1, 0, 'F', '0', '0', 'system:oss:upload',       '#', 'admin', sysdate(), '', null, '');

--
Gitblit v1.9.3