初始化数据完善

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java

@@ -131,7 +131,7 @@ public class SysOssController extends BaseController {
      *
      * @param md5 OSS对象md5
      */
-    @SaCheckPermission("system:oss:identifier")
+    //@SaCheckPermission("system:oss:identifier")
     @GetMapping("/identifier")
     public R<SysOssUploadVo> identifier(@NotEmpty(message = "MD5不能为空") String md5) {
         SysOssVo oss = ossService.getByMd5(md5);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogPerson.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -25,7 +26,7 @@ public class SysCatalogPerson extends TenantEntity {
     /**
      * 目录id
      */
-    @TableId(value = "catalog_id")
+    @TableId(value = "catalog_id",type = IdType.AUTO)
     private Long catalogId;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -137,39 +137,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         // 根据套餐创建角色
         Long roleId = createTenantRole(tenantId, bo.getPackageId());
 
-        //创建默认资源目录
+
-        SysCatalogPerson catalogPerson = new SysCatalogPerson();
-        catalogPerson.setTenantId(tenantId);
-        catalogPerson.setCatalogName("我的空间");
-        catalogPerson.setParentId(Constants.TOP_PARENT_ID);
-        catalogPerson.setAncestors(Constants.TOP_PARENT_ID.toString());
-        catalogPersonMapper.insert(catalogPerson);
-        SysCatalogTextbook catalogTextbook = new SysCatalogTextbook();
-        catalogTextbook.setTenantId(tenantId);
-        catalogTextbook.setCatalogName("同步教材");
-        catalogTextbook.setParentId(Constants.TOP_PARENT_ID);
-        catalogTextbook.setAncestors(Constants.TOP_PARENT_ID.toString());
-        catalogTextbook.setType(1);
-        catalogTextbookMapper.insert(catalogTextbook);
-        SysCatalogResource catalogResource = new SysCatalogResource();
-        catalogResource.setTenantId(tenantId);
-        catalogResource.setCatalogName("专题资源");
-        catalogResource.setParentId(Constants.TOP_PARENT_ID);
-        catalogResource.setAncestors(Constants.TOP_PARENT_ID.toString());
-        catalogResource.setType(1);
-        catalogResourceMapper.insert(catalogResource);
-        //创建资源空间大小
-        long volume = 1024L * 1024L * 1024L * 1024L;
-        SysOssVolume personVolume = new SysOssVolume();
-        personVolume.setTenantId(tenantId);
-        personVolume.setType(2);
-        personVolume.setTotalVolume(volume);
-        ossVolumeMapper.insert(personVolume);
-        SysOssVolume schoolVolume = new SysOssVolume();
-        schoolVolume.setTenantId(tenantId);
-        schoolVolume.setType(1);
-        schoolVolume.setTotalVolume(volume);
-        ossVolumeMapper.insert(schoolVolume);
         // 创建部门: 公司名是部门名称
         SysDept dept = new SysDept();
         dept.setTenantId(tenantId);
@@ -205,6 +173,50 @@ public class SysTenantServiceImpl implements ISysTenantService {
         userRole.setRoleId(roleId);
         userRoleMapper.insert(userRole);
 
+        //创建默认资源目录
+        SysCatalogPerson catalogPerson = new SysCatalogPerson();
+        catalogPerson.setTenantId(tenantId);
+        catalogPerson.setCatalogName("我的空间");
+        catalogPerson.setParentId(Constants.TOP_PARENT_ID);
+        catalogPerson.setAncestors(Constants.TOP_PARENT_ID.toString());
+        catalogPerson.setCreateBy(user.getUserId());
+        catalogPerson.setCreateDept(deptId);
+        catalogPersonMapper.insert(catalogPerson);
+        SysCatalogTextbook catalogTextbook = new SysCatalogTextbook();
+        catalogTextbook.setTenantId(tenantId);
+        catalogTextbook.setCatalogName("同步教材");
+        catalogTextbook.setParentId(Constants.TOP_PARENT_ID);
+        catalogTextbook.setAncestors(Constants.TOP_PARENT_ID.toString());
+        catalogTextbook.setType(1);
+        catalogTextbook.setCreateBy(user.getUserId());
+        catalogTextbook.setCreateDept(deptId);
+        catalogTextbookMapper.insert(catalogTextbook);
+        SysCatalogResource catalogResource = new SysCatalogResource();
+        catalogResource.setTenantId(tenantId);
+        catalogResource.setCatalogName("专题资源");
+        catalogResource.setParentId(Constants.TOP_PARENT_ID);
+        catalogResource.setAncestors(Constants.TOP_PARENT_ID.toString());
+        catalogResource.setType(1);
+        catalogResource.setCreateBy(user.getUserId());
+        catalogResource.setCreateDept(deptId);
+        catalogResourceMapper.insert(catalogResource);
+        //创建资源空间大小
+        long volume = 1024L * 1024L * 1024L * 1024L;
+        SysOssVolume personVolume = new SysOssVolume();
+        personVolume.setTenantId(tenantId);
+        personVolume.setType(2);
+        personVolume.setTotalVolume(volume);
+        personVolume.setCreateBy(user.getUserId());
+        personVolume.setCreateDept(deptId);
+        ossVolumeMapper.insert(personVolume);
+        SysOssVolume schoolVolume = new SysOssVolume();
+        schoolVolume.setTenantId(tenantId);
+        schoolVolume.setType(1);
+        schoolVolume.setTotalVolume(volume);
+        schoolVolume.setCreateBy(user.getUserId());
+        schoolVolume.setCreateDept(deptId);
+        ossVolumeMapper.insert(schoolVolume);
+
         String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
         List<SysDictType> dictTypeList = dictTypeMapper.selectList(
             new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getTenantId, defaultTenantId));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.exception.ServiceException;
@@ -26,10 +27,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.*;
-import org.dromara.system.domain.SysUser;
-import org.dromara.system.domain.SysUserPost;
-import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.SysPostVo;
 import org.dromara.system.domain.vo.SysRoleVo;
@@ -62,6 +60,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     private final SysUserRoleMapper userRoleMapper;
     private final SysUserPostMapper userPostMapper;
 
+    private final SysCatalogPersonMapper catalogPersonMapper;
+
     @Override
     public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
         Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
@@ -313,6 +313,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         insertUserPost(user, false);
         // 新增用户与角色管理
         insertUserRole(user, false);
+        //新增我的空间
+        insertPersonFile(user);
         return rows;
     }
 
@@ -647,4 +649,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return StreamUtils.toList(userRoles, SysUserRole::getUserId);
     }
 
+    private void insertPersonFile(SysUserBo user) {
+        SysCatalogPerson catalogPerson = new SysCatalogPerson();
+        catalogPerson.setCatalogName("我的空间");
+        catalogPerson.setParentId(Constants.TOP_PARENT_ID);
+        catalogPerson.setAncestors(Constants.TOP_PARENT_ID.toString());
+        catalogPerson.setCreateBy(user.getUserId());
+        catalogPerson.setCreateDept(user.getDeptId());
+        catalogPersonMapper.insert(catalogPerson);
+    }
+
 }