styles: 代码格式化

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java

@@ -120,7 +120,13 @@ public class SchisandraAuthPermissionController {
             return Result.fail("删除权限信息失败");
         }
     }
-
+    /**
+     * @description: 查询用户菜单权限
+     * @param: [userId]
+     * @return: com.schisandra.auth.common.entity.Result<java.lang.Object>
+     * @author: landaiqing
+     * @date: 2024/7/8 下午4:09
+     */
     @GetMapping("selectUserPermission")
     public Result<Object> selectUserPermission(@RequestParam("userId") Long userId) {
         if (userId == null) {

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java

@@ -32,7 +32,7 @@ public class SchisandraAuthPermissionDTO implements Serializable {
     /**
      * 权限路径
      */
-    private String menuUrl;
+    private String path;
     /**
      * 权限状态
      */
@@ -49,25 +49,6 @@ public class SchisandraAuthPermissionDTO implements Serializable {
      * 权限标识
      */
     private String permissionKey;
-    /**
-     * 创建人
-     */
-    private String createdBy;
-    /**
-     * 创建时间
-     */
-    private Date createdTime;
-    /**
-     * 更新人
-     */
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 是否删除
-     */
     private Integer isDeleted;
 
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java

@@ -26,7 +26,7 @@ SchisandraAuthPermissionBO implements Serializable {
 
     private Integer type;
 
-    private String menuUrl;
+    private String path;
 
     private Integer status;
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java

@@ -52,11 +52,11 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth
     public Result<Object> selectUserPermissionTree(Long userId) {
         SchisandraAuthUserRole schisandraAuthRole = schisandraAuthUserRoleService.queryById(userId);
         if (schisandraAuthRole == null||schisandraAuthRole.getRoleId()==null) {
-            return Result.ok("用户没有角色");
+            return Result.fail("用户没有角色");
         }
         List<SchisandraAuthRolePermission> schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRole.getRoleId());
         if (schisandraAuthRolePermissions.size()==0){
-            return Result.ok("当前角色用户没有权限");
+            return Result.fail("当前角色用户没有权限");
         }
         List<SchisandraAuthPermissionBO> schisandraAuthPermissions =new ArrayList<>();
         List<SchisandraAuthPermissionBO> schisandraAuthPermissionParents = new ArrayList<>();

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthPermission.java

@@ -29,7 +29,7 @@ public class SchisandraAuthPermission implements Serializable {
 
     private Integer type;
 
-    private String menuUrl;
+    private String path;
 
     private Integer status;
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml

@@ -7,7 +7,7 @@
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
-        <result property="menuUrl" column="menu_url" jdbcType="VARCHAR"/>
+        <result property="path" column="path" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
         <result property="show" column="show" jdbcType="INTEGER"/>
         <result property="icon" column="icon" jdbcType="VARCHAR"/>

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java

@@ -2,21 +2,16 @@ package com.schisandra.oss.application.controller;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-
 import com.google.common.base.Preconditions;
-
 import com.schisandra.oss.application.convert.SchisandraOssAliDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssAliDTO;
 import com.schisandra.oss.application.oss.core.ali.AliOssClient;
 import com.schisandra.oss.application.oss.core.ali.AliOssConfiguration;
-
 import com.schisandra.oss.application.oss.model.OssInfo;
 import com.schisandra.oss.common.entity.Result;
 import com.schisandra.oss.domain.bo.SchisandraOssAliBO;
 import com.schisandra.oss.domain.redis.RedisUtil;
 import com.schisandra.oss.domain.service.SchisandraOssAliDomainService;
-
-import com.schisandra.oss.infra.basic.dao.SchisandraOssAliDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -54,6 +49,7 @@ public class SchisandraOssAliController {
 
     /**
      * 返回ali表所有数据
+     *
      * @return
      */
     @GetMapping("returnAll")
@@ -62,7 +58,6 @@ public class SchisandraOssAliController {
     }
 
 
-
     @GetMapping("init")
     public void init(@RequestParam String userId) {
         if (log.isInfoEnabled()) {
@@ -98,7 +93,6 @@ public class SchisandraOssAliController {
     }
 
 
-
     /**
      * 修改
      */
@@ -156,9 +150,9 @@ public class SchisandraOssAliController {
     }
 
 
-
     /**
      * 查找bucket
+     *
      * @param userId
      */
     @PostMapping("seleteBucket")
@@ -186,6 +180,7 @@ public class SchisandraOssAliController {
 
     /**
      * 删除bucket
+     *
      * @param userId
      * @param bucket
      * @return
@@ -232,7 +227,6 @@ public class SchisandraOssAliController {
     }
 
 
-
     /**
      * @description: 下载文件
      * @param: [schisandraOssMinioDTO]
@@ -252,6 +246,7 @@ public class SchisandraOssAliController {
         response.setCharacterEncoding("UTF-8");
         bean.downLoad(output, filePath);
     }
+
     /**
      * @description: 删除文件
      * @param: [schisandraOssAliDTO]

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java

@@ -3,21 +3,16 @@ package com.schisandra.oss.application.controller;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.amazonaws.util.IOUtils;
 import com.google.common.base.Preconditions;
-import com.google.gson.Gson;
 import com.schisandra.oss.application.convert.SchisandraOssMinioDTOConverter;
-import com.schisandra.oss.application.dto.SchisandraOssAliDTO;
 import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
 import com.schisandra.oss.application.oss.core.minio.MinioOssClient;
 import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration;
-import com.schisandra.oss.application.oss.model.OssInfo;
 import com.schisandra.oss.common.entity.Result;
 import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
 import com.schisandra.oss.domain.redis.RedisUtil;
 import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
 import io.minio.errors.*;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,8 +26,7 @@ import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.HashMap;
 import java.util.List;
 
@@ -60,6 +54,7 @@ public class SchisandraOssMinioController {
 
     /**
      * 返回minio表所有数据
+     *
      * @return
      */
     @GetMapping("returnAll")
@@ -89,6 +84,7 @@ public class SchisandraOssMinioController {
             log.error("用户: {}-> minio 初始化完成！", userId);
         }
     }
+
     /**
      * @description: 获取文件目录信息
      * @param: [target, userId, dirName]
@@ -205,6 +201,7 @@ public class SchisandraOssMinioController {
         }
         return Result.ok();
     }
+
     /**
      * @description: 拷贝文件
      * @param: [userId, bucket, oldFilePath, newFilePath]
@@ -228,6 +225,7 @@ public class SchisandraOssMinioController {
         }
         return Result.ok();
     }
+
     /**
      * @description: 预览文件
      * @param: [userId, bucket, filePath]
@@ -249,6 +247,7 @@ public class SchisandraOssMinioController {
         }
 
     }
+
     /**
      * @description: 分享文件
      * @param: [userId, bucket, filePath]
@@ -283,6 +282,7 @@ public class SchisandraOssMinioController {
         MinioOssClient bean = SpringUtil.getBean(userId);
         return Result.ok(bean.selectAllBucket());
     }
+
     /**
      * @description: 创建bucket
      * @param: [userId, bucket]
@@ -400,11 +400,6 @@ public class SchisandraOssMinioController {
     }
 
 
-
-
-
-
-
     private void parameterCheck(SchisandraOssMinioDTO schisandraOssMinioDTO) {
         Preconditions.checkNotNull(schisandraOssMinioDTO.getId(), "不能为空");
         Preconditions.checkNotNull(schisandraOssMinioDTO.getUserId(), "不能为空");

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.google.common.base.Preconditions;
 import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssQiniuDTO;
-import com.schisandra.oss.application.dto.SchisandraOssUpDTO;
 import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssClient;
 import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssConfiguration;
 import com.schisandra.oss.application.oss.model.OssInfo;
@@ -16,6 +15,7 @@ import com.schisandra.oss.domain.service.SchisandraOssQiniuDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -48,6 +48,7 @@ public class SchisandraOssQiniuController {
 
     /**
      * 返回七牛表所有数据
+     *
      * @return
      */
     @GetMapping("returnAll")
@@ -219,6 +220,7 @@ public class SchisandraOssQiniuController {
 
     /**
      * 创建桶createbucket
+     *
      * @param userId
      * @param bucket
      * @return
@@ -259,7 +261,6 @@ public class SchisandraOssQiniuController {
     }
 
 
-
     /**
      * 新增七牛云对象存储配置表
      */

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java

@@ -5,10 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.google.common.base.Preconditions;
 import com.schisandra.oss.application.convert.SchisandraOssSftpDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssSftpDTO;
-import com.schisandra.oss.application.dto.SchisandraOssUpDTO;
-import com.schisandra.oss.application.oss.core.ali.AliOssClient;
-import com.schisandra.oss.application.oss.core.ftp.FtpOssClient;
-import com.schisandra.oss.application.oss.core.ftp.FtpOssConfiguration;
 import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssClient;
 import com.schisandra.oss.application.oss.core.sftp.SftpOssClient;
 import com.schisandra.oss.application.oss.core.sftp.SftpOssConfiguration;
@@ -55,6 +51,7 @@ public class SchisandraOssSftpController {
 
     /**
      * 返回up表所有数据
+     *
      * @return
      */
     @GetMapping("returnAll")

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java

@@ -1,12 +1,10 @@
 package com.schisandra.oss.application.controller;
 
-import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Preconditions;
 import com.schisandra.oss.application.convert.SchisandraOssUpDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssUpDTO;
-import com.schisandra.oss.application.oss.core.up.UpOssConfiguration;
 import com.schisandra.oss.application.oss.core.up.UpOssClient;
 import com.schisandra.oss.application.oss.core.up.UpOssConfiguration;
 import com.schisandra.oss.application.oss.model.OssInfo;
@@ -15,18 +13,14 @@ import com.schisandra.oss.domain.bo.SchisandraOssUpBO;
 import com.schisandra.oss.domain.service.SchisandraOssUpDomainService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.List;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.List;
 
 /**
  * 又拍云对象存储配置表 controller
@@ -43,8 +37,10 @@ public class SchisandraOssUpController {
     private SchisandraOssUpDomainService schisandraOssUpDomainService;
     @Resource
     private UpOssConfiguration upOssConfiguration;
+
     /**
      * 返回up表所有数据
+     *
      * @return
      */
     @GetMapping("returnAll")

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java

@@ -1,8 +1,7 @@
 package com.schisandra.oss.domain.service.impl;
 
-import com.schisandra.oss.common.enums.IsDeletedFlagEnum;
-import com.schisandra.oss.domain.convert.SchisandraFileHeatmapBOConverter;
 import com.schisandra.oss.domain.bo.SchisandraFileHeatmapBO;
+import com.schisandra.oss.domain.convert.SchisandraFileHeatmapBOConverter;
 import com.schisandra.oss.domain.service.SchisandraFileHeatmapDomainService;
 import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap;
 import com.schisandra.oss.infra.basic.service.SchisandraFileHeatmapService;

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java

@@ -8,7 +8,6 @@ import com.schisandra.oss.domain.service.SchisandraOssAliDomainService;
 import com.schisandra.oss.infra.basic.entity.SchisandraOssAli;
 import com.schisandra.oss.infra.basic.service.SchisandraOssAliService;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java

@@ -60,11 +60,6 @@ public class SchisandraOssTencent implements Serializable {
      */
     @Column("app_id")
     private String appId;
-    /**
-     * 地域
-     */
-    @Column("app_id")
-    private String appId;
 
     @Column("region")
     private String region;