代码修正

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/po/Netdisk.java

@@ -2,7 +2,6 @@ package com.fjhx.oa.entity.netdisk.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +10,7 @@ import lombok.Setter;
  * 网盘
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-07
  */
 @Getter
@@ -34,4 +33,14 @@ public class Netdisk extends BasePo {
      */
     private String name;
 
+    /**
+     * 文件大小
+     */
+    private String fileSize;
+
+    /**
+     * 文件类型
+     */
+    private String fileType;
+
 }

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/vo/NetdiskVo.java

@@ -7,11 +7,16 @@ import lombok.Setter;
 /**
  * 网盘列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-07
  */
 @Getter
 @Setter
 public class NetdiskVo extends Netdisk {
 
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
 }

hx-oa/src/main/java/com/fjhx/oa/service/netdisk/impl/NetdiskServiceImpl.java

@@ -19,6 +19,7 @@ import com.fjhx.oa.mapper.netdisk.NetdiskMapper;
 import com.fjhx.oa.service.netdisk.NetdiskService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,7 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
         }
         wrapper.like(Netdisk::getName, dto.getKeyword());
         Page<NetdiskVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        UserUtil.assignmentNickName(page.getRecords(), Netdisk::getCreateUser, NetdiskVo::setCreateUserName);
         return page;
     }
 
@@ -69,7 +71,7 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
     @Override
     public void add(NetdiskDto netdiskDto) {
         //如果父文件夹id为空就赋值初始值-1
-        if(ObjectUtil.isEmpty(netdiskDto.getParentFolderId())){
+        if (ObjectUtil.isEmpty(netdiskDto.getParentFolderId())) {
             netdiskDto.setParentFolderId(-1l);
         }
         if (netdiskDto.getType() == 1) {
@@ -89,6 +91,12 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
                 netdisk.setType(netdiskDto.getType());
                 netdisk.setParentFolderId(netdiskDto.getParentFolderId());
                 netdisk.setName(obsFile.getFileName());
+                String fileType = "";
+                if (obsFile.getFileName().indexOf(".") > 0) {
+                    fileType = obsFile.getFileName().substring(obsFile.getFileName().lastIndexOf(".") + 1);
+                }
+                netdisk.setFileType(fileType);
+                netdisk.setFileSize(obsFile.getFileSize());
                 netdiskList.add(netdisk);
                 //更新文件信息
                 FileInfo fileInfo = new FileInfo();
@@ -114,7 +122,7 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
         if (ObjectUtil.isNotEmpty(fileInfo)) {
             fileInfo.setFileName(netdiskDto.getName());
             fileInfoService.updateById(fileInfo);
-        }else{
+        } else {
             throw new ServiceException("文件信息不存在");
         }
         DynamicDataSourceContextHolder.poll();
@@ -126,7 +134,7 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
         this.removeBatchByIds(ids);
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         List<FileInfo> list = fileInfoService.list(q -> q.in(FileInfo::getBusinessId, ids));
-        if(ObjectUtil.isNotEmpty(list)) {
+        if (ObjectUtil.isNotEmpty(list)) {
             List<Long> fids = list.stream().map(FileInfo::getId).collect(Collectors.toList());
             fileInfoService.removeBatchByIds(fids);
         }

hx-oa/src/main/resources/mapper/netdisk/NetdiskMapper.xml

@@ -7,6 +7,8 @@
             n.type,
             n.parent_folder_id,
             n.name,
+            n.file_size,
+            n.file_type,
             n.create_user,
             n.create_time,
             n.update_user,