Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/FileController.java

@@ -263,6 +263,8 @@ public class FileController {
 
         userFileService.save(userFile);
         fileDealComp.uploadESByUserFileId(userFile.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"创建文件夹",SUCCESS,userFile.getUserFileId(),"downLoad",userFile.getFileName());
+
         return RestResult.success();
     }
 
@@ -289,6 +291,7 @@ public class FileController {
 
         userFileService.save(userFile);
         fileDealComp.uploadESByUserFileId(userFile.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"创建文件夹",SUCCESS,userFile.getUserFileId(),"downLoad",userFile.getFileName());
         return RestResult.success();
     }
 
@@ -467,6 +470,9 @@ public class FileController {
             }
         }
         fileDealComp.uploadESByUserFileId(renameFileDto.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"文件重命名",SUCCESS,userFile.getUserFileId(),"renamefile",userFile.getFileName());
+
+
         return RestResult.success();
     }
 
@@ -506,6 +512,7 @@ public class FileController {
             }
         }
         fileDealComp.uploadESByUserFileId(renameFileDto.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"文件重命名",SUCCESS,userFile.getUserFileId(),"renamefile",userFile.getFileName());
         return RestResult.success();
     }
 
@@ -557,7 +564,7 @@ public class FileController {
     @RequestMapping(value = "/batchdeletefile", method = RequestMethod.POST)
     @MyLog(operation = "批量删除文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> deleteImageByIds(@RequestBody BatchDeleteFileDTO batchDeleteFileDto) {
+    public RestResult<String> deleteImageByIds(HttpServletRequest httpServletRequest,@RequestBody BatchDeleteFileDTO batchDeleteFileDto) {
         String userFileIds = batchDeleteFileDto.getUserFileIds();
         String[] userFileIdList = userFileIds.split(",");
         userFileService.update(new UpdateWrapper<UserFile>().lambda().set(UserFile::getDeleteFlag, 1).in(UserFile::getUserFileId, Arrays.asList(userFileIdList)));
@@ -565,8 +572,10 @@ public class FileController {
             executor.execute(()->{
                     userFileService.deleteUserFile(userFileId, StpLoginUserUtil.getLoginUser().getId());
             });
-
+            UserFile userFile = userFileService.getById(userFileId);
             fileDealComp.deleteESByUserFileId(userFileId);
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"批量删除文件",SUCCESS,userFileId,"batchdeletefile",userFile.getFileName());
+
         }
 
         return RestResult.success().message("批量删除文件成功");
@@ -578,7 +587,7 @@ public class FileController {
     @RequestMapping(value = "/batchdeleteCommonfile", method = RequestMethod.POST)
     @MyLog(operation = "批量删除文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> batchdeleteCommonfile(@RequestBody BatchDeleteFileDTO batchDeleteFileDto) {
+    public RestResult<String> batchdeleteCommonfile(HttpServletRequest httpServletRequest,@RequestBody BatchDeleteFileDTO batchDeleteFileDto) {
         String userFileIds = commonUserId;
         String[] userFileIdList = userFileIds.split(",");
         userFileService.update(new UpdateWrapper<UserFile>().lambda().set(UserFile::getDeleteFlag, 1).in(UserFile::getUserFileId, Arrays.asList(userFileIdList)));
@@ -586,6 +595,8 @@ public class FileController {
             executor.execute(()->{
                 userFileService.deleteUserFile(userFileId, commonUserId);
             });
+            UserFile userFile = userFileService.getById(userFileId);
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"批量删除文件",SUCCESS,userFileId,"batchdeleteCommonfile",userFile.getFileName());
 
             fileDealComp.deleteESByUserFileId(userFileId);
         }
@@ -603,12 +614,14 @@ public class FileController {
     @RequestMapping(value = "/deletefile", method = RequestMethod.POST)
     @MyLog(operation = "删除文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult deleteFile(@RequestBody DeleteFileDTO deleteFileDto) {
+    public RestResult deleteFile(HttpServletRequest httpServletRequest,@RequestBody DeleteFileDTO deleteFileDto) {
 
 //        JwtUser sessionUserBean =  SessionUtil.getSession();
         String userId = StpLoginUserUtil.getLoginUser().getId();
         userFileService.deleteUserFile(deleteFileDto.getUserFileId(), userId);
+        UserFile userFile = userFileService.getById(deleteFileDto.getUserFileId());
         fileDealComp.deleteESByUserFileId(deleteFileDto.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"删除文件",SUCCESS,deleteFileDto.getUserFileId(),"deletefile",userFile.getFileName());
 
         return RestResult.success();
 
@@ -619,10 +632,12 @@ public class FileController {
     @RequestMapping(value = "/deleteCommonfile", method = RequestMethod.POST)
     @MyLog(operation = "删除文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult deleteCommonFile(@RequestBody DeleteFileDTO deleteFileDto) {
+    public RestResult deleteCommonFile(HttpServletRequest httpServletRequest,@RequestBody DeleteFileDTO deleteFileDto) {
         String userId =commonUserId;
         userFileService.deleteUserFile(deleteFileDto.getUserFileId(), userId);
         fileDealComp.deleteESByUserFileId(deleteFileDto.getUserFileId());
+        UserFile userFile = userFileService.getById(deleteFileDto.getUserFileId());
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"删除文件",SUCCESS,deleteFileDto.getUserFileId(),"deleteCommonfile",userFile.getFileName());
 
         return RestResult.success();
 
@@ -635,10 +650,12 @@ public class FileController {
     @RequestMapping(value = "/unzipfile", method = RequestMethod.POST)
     @MyLog(operation = "解压文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> unzipFile(@RequestBody UnzipFileDTO unzipFileDto) {
+    public RestResult<String> unzipFile(HttpServletRequest httpServletRequest,@RequestBody UnzipFileDTO unzipFileDto) {
 
         try {
             fileService.unzipFile(unzipFileDto.getUserFileId(), unzipFileDto.getUnzipMode(), unzipFileDto.getFilePath());
+            UserFile userFile = userFileService.getById(unzipFileDto.getUserFileId());
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"解压文件",SUCCESS,unzipFileDto.getUserFileId(),"unzipfile",userFile.getFileName());
         } catch (QiwenException e) {
             return RestResult.fail().message(e.getMessage());
         }
@@ -653,10 +670,12 @@ public class FileController {
     @RequestMapping(value = "/unzipCommonFile", method = RequestMethod.POST)
     @MyLog(operation = "解压文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> unzipCommonFile(@RequestBody UnzipFileDTO unzipFileDto) {
+    public RestResult<String> unzipCommonFile(HttpServletRequest httpServletRequest,@RequestBody UnzipFileDTO unzipFileDto) {
 
         try {
             fileService.unzipFile(unzipFileDto.getUserFileId(), unzipFileDto.getUnzipMode(), unzipFileDto.getFilePath());
+            UserFile userFile = userFileService.getById(unzipFileDto.getUserFileId());
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"解压文件",SUCCESS,unzipFileDto.getUserFileId(),"unzipCommonFile",userFile.getFileName());
         } catch (QiwenException e) {
             return RestResult.fail().message(e.getMessage());
         }
@@ -669,7 +688,7 @@ public class FileController {
     @RequestMapping(value = "/copyfile", method = RequestMethod.POST)
     @MyLog(operation = "文件复制", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> copyFile(@RequestBody CopyFileDTO copyFileDTO) {
+    public RestResult<String> copyFile(HttpServletRequest httpServletRequest,@RequestBody CopyFileDTO copyFileDTO) {
         String userId = StpLoginUserUtil.getLoginUser().getId();
         String filePath = copyFileDTO.getFilePath();
         String userFileIds = copyFileDTO.getUserFileIds();
@@ -687,6 +706,8 @@ public class FileController {
 
             userFileService.userFileCopy(userId, userFileId, filePath);
             fileDealComp.deleteRepeatSubDirFile(filePath, userId);
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"文件复制",SUCCESS,userFileId,"copyfile",userFile.getFileName());
+
         }
 
         return RestResult.success();
@@ -698,7 +719,7 @@ public class FileController {
     @RequestMapping(value = "/copyCommonfile", method = RequestMethod.POST)
     @MyLog(operation = "文件复制", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> copyCommonfile(@RequestBody CopyFileDTO copyFileDTO) {
+    public RestResult<String> copyCommonfile(HttpServletRequest httpServletRequest,@RequestBody CopyFileDTO copyFileDTO) {
         String userId = commonUserId;
         String filePath = copyFileDTO.getFilePath();
         String userFileIds = copyFileDTO.getUserFileIds();
@@ -713,6 +734,7 @@ public class FileController {
                     return RestResult.fail().message("原路径与目标路径冲突，不能复制");
                 }
             }
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), commonUserId,CURRENT_MODULE,"文件复制",SUCCESS,userFileId,"copyCommonfile",userFile.getFileName());
 
             userFileService.userFileCopy(userId, userFileId, filePath);
             fileDealComp.deleteRepeatSubDirFile(filePath, userId);
@@ -731,7 +753,7 @@ public class FileController {
     @RequestMapping(value = "/movefile", method = RequestMethod.POST)
     @MyLog(operation = "文件移动", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> moveFile(@RequestBody MoveFileDTO moveFileDto) {
+    public RestResult<String> moveFile(HttpServletRequest httpServletRequest,@RequestBody MoveFileDTO moveFileDto) {
 
 //        JwtUser sessionUserBean =  SessionUtil.getSession();
         String userId = StpLoginUserUtil.getLoginUser().getId();
@@ -748,6 +770,7 @@ public class FileController {
         }
 
         userFileService.updateFilepathByUserFileId(moveFileDto.getUserFileId(), newfilePath, userId);
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), commonUserId,CURRENT_MODULE,"文件复制",SUCCESS,userFile.getUserFileId(),"movefile",userFile.getFileName());
 
         fileDealComp.deleteRepeatSubDirFile(newfilePath, userId);
         return RestResult.success();
@@ -760,7 +783,7 @@ public class FileController {
     @RequestMapping(value = "/moveCommonFile", method = RequestMethod.POST)
     @MyLog(operation = "文件移动", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> moveCommonFile(@RequestBody MoveFileDTO moveFileDto) {
+    public RestResult<String> moveCommonFile(HttpServletRequest httpServletRequest,@RequestBody MoveFileDTO moveFileDto) {
 
 //        JwtUser sessionUserBean =  SessionUtil.getSession();
         String userId =commonUserId;
@@ -779,6 +802,7 @@ public class FileController {
         userFileService.updateFilepathByUserFileId(moveFileDto.getUserFileId(), newfilePath, userId);
 
         fileDealComp.deleteRepeatSubDirFile(newfilePath, userId);
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), commonUserId,CURRENT_MODULE,"文件移动",SUCCESS,userFile.getUserFileId(),"moveCommonFile",userFile.getFileName());
         return RestResult.success();
 
     }
@@ -792,7 +816,7 @@ public class FileController {
     @RequestMapping(value = "/batchmovefile", method = RequestMethod.POST)
     @MyLog(operation = "批量移动文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> batchMoveFile(@RequestBody BatchMoveFileDTO batchMoveFileDto) {
+    public RestResult<String> batchMoveFile(HttpServletRequest httpServletRequest,@RequestBody BatchMoveFileDTO batchMoveFileDto) {
 
 //        JwtUser sessionUserBean =  SessionUtil.getSession();
         String userId = StpLoginUserUtil.getLoginUser().getId();
@@ -811,6 +835,8 @@ public class FileController {
                 }
             }
             userFileService.updateFilepathByUserFileId(userFile.getUserFileId(), newfilePath, userId);
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), commonUserId,CURRENT_MODULE,"文件移动",SUCCESS,userFile.getUserFileId(),"batchmovefile",userFile.getFileName());
+
         }
 
         return RestResult.success().data("批量移动文件成功");
@@ -824,7 +850,7 @@ public class FileController {
     @RequestMapping(value = "/batchmoveCommonFile", method = RequestMethod.POST)
     @MyLog(operation = "批量移动文件", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<String> batchmoveCommonFile(@RequestBody BatchMoveFileDTO batchMoveFileDto) {
+    public RestResult<String> batchmoveCommonFile(HttpServletRequest httpServletRequest,@RequestBody BatchMoveFileDTO batchMoveFileDto) {
 
         String userId =commonUserId;
 
@@ -842,6 +868,8 @@ public class FileController {
                 }
             }
             userFileService.updateFilepathByUserFileId(userFile.getUserFileId(), newfilePath, userId);
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), commonUserId,CURRENT_MODULE,"批量移动文件",SUCCESS,userFile.getUserFileId(),"batchmoveCommonFile",userFile.getFileName());
+
         }
 
         return RestResult.success().data("批量移动文件成功");

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/FiletransferController.java

@@ -177,7 +177,7 @@ public class FiletransferController {
         }
 
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
-
+        operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS,userFile.getUserFileId(),"downLoad",fileName);
         filetransferService.downloadFile(httpServletResponse, downloadFileDTO);
 
     }
@@ -223,6 +223,7 @@ public class FiletransferController {
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
 
         filetransferService.downloadFile(httpServletResponse, downloadFileDTO);
+        operationLogUtil.getOperationLogObj(httpServletRequest, commonUserId, RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS,userFile.getUserFileId(),"downLoad",fileName);
 
     }
 
@@ -247,15 +248,15 @@ public class FiletransferController {
 //                }
 //            }
 //        }
-        boolean authResult = fileDealComp.checkAuthDownloadAndPreview(batchDownloadFileDTO.getShareBatchNum(),
-                batchDownloadFileDTO.getExtractionCode(),
-                token,
-                batchDownloadFileDTO.getUserFileIds(), null);
-        if (!authResult) {
-            log.error("没有权限下载！！！");
-
-            return;
-        }
+//        boolean authResult = fileDealComp.checkAuthDownloadAndPreview(batchDownloadFileDTO.getShareBatchNum(),
+//                batchDownloadFileDTO.getExtractionCode(),
+//                token,
+//                batchDownloadFileDTO.getUserFileIds(), null);
+//        if (!authResult) {
+//            log.error("没有权限下载！！！");
+//
+//            return;
+//        }
 
         String files = batchDownloadFileDTO.getUserFileIds();
         String[] userFileIdStrs = files.split(",");
@@ -271,6 +272,7 @@ public class FiletransferController {
                 userFileIds.add(userFile.getUserFileId());
                 userFileIds.addAll(userFileIds1);
             }
+            operationLogUtil.getOperationLogObj(httpServletRequest, StpLoginUserUtil.getLoginUser().getId(), RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS,userFileId,"downLoad",userFile.getFileName());
 
         }
         UserFile userFile = userFileService.getById(userFileIdStrs[0]);
@@ -278,7 +280,6 @@ public class FiletransferController {
         Date date = new Date();
         String fileName = String.valueOf(date.getTime());
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName + ".zip");// 设置文件名
-
     }
 
 
@@ -297,14 +298,14 @@ public class FiletransferController {
 //                }
 //            }
 //        }
-        boolean authResult = fileDealComp.checkAuthDownloadAndPreview(batchDownloadFileDTO.getShareBatchNum(),
-                batchDownloadFileDTO.getExtractionCode(),
-                token,
-                batchDownloadFileDTO.getUserFileIds(), null);
-        if (!authResult) {
-            log.error("没有权限下载！！！");
-            return;
-        }
+//        boolean authResult = fileDealComp.checkAuthDownloadAndPreview(batchDownloadFileDTO.getShareBatchNum(),
+//                batchDownloadFileDTO.getExtractionCode(),
+//                token,
+//                batchDownloadFileDTO.getUserFileIds(), null);
+//        if (!authResult) {
+//            log.error("没有权限下载！！！");
+//            return;
+//        }
 
         String files = batchDownloadFileDTO.getUserFileIds();
         String[] userFileIdStrs = files.split(",");
@@ -320,6 +321,7 @@ public class FiletransferController {
                 userFileIds.add(userFile.getUserFileId());
                 userFileIds.addAll(userFileIds1);
             }
+            operationLogUtil.getOperationLogObj(httpServletRequest, commonUserId, RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS,userFileId,"downLoad",userFile.getFileName());
 
         }
         UserFile userFile = userFileService.getById(userFileIdStrs[0]);
@@ -416,11 +418,11 @@ public class FiletransferController {
                     downloadFile.getOssClient().shutdown();
                 }
             }
-            operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview");
+            operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview",fileName);
 
         } else {
             filetransferService.previewFile(httpServletResponse, previewDTO);
-            operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview");
+            operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview",fileName);
         }
 
     }
@@ -519,11 +521,11 @@ public class FiletransferController {
                     downloadFile.getOssClient().shutdown();
                 }
             }
-            operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview");
+            operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview",fileName);
 
         } else {
             filetransferService.previewFile(httpServletResponse, previewDTO);
-            operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview");
+            operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS,previewDTO.getUserFileId(),"preview",fileName);
         }
 
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/OperationLogBeanController.java

@@ -3,16 +3,16 @@ package vip.xiaonuo.disk.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.disk.service.IOperationLogService;
+import vip.xiaonuo.disk.util.PageQuery;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.operationLog.OperationLogBeanVo;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 @Tag(name = "operationLog", description = "日志操作接口")
 @RestController
@@ -30,4 +30,21 @@ public class OperationLogBeanController {
         return CommonResult.data(list);
     }
 
+
+
+    @Operation(summary = "获取全部资源日志", description = "获取全部资源日志", tags = {"file"})
+    @RequestMapping(value = "/getAllList", method = RequestMethod.GET)
+    @ResponseBody
+    public TableDataInfo<Map<String,Object>> getAllList(@RequestParam(value = "type", required = false) String type,
+                                                              @RequestParam(value = "startDate", required = false) String startDate,
+                                                              @RequestParam(value = "endDate", required = false) String endDate,
+                                                              @RequestParam(value = "userName", required = false) String userName, PageQuery pageQuery
+    ){
+        return iOperationLogService.getAllList(type,startDate,endDate,userName,pageQuery);
+    }
+
+
+
+
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/OperationLogBean.java

@@ -88,4 +88,7 @@ public class OperationLogBean {
 
     private String type;
 
+    @TableField("FILE_NAME")
+    private String fileName;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/OperationLogMapper.java

@@ -2,13 +2,17 @@ package vip.xiaonuo.disk.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.OperationLogBean;
 import vip.xiaonuo.disk.vo.operationLog.OperationLogBeanVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface OperationLogMapper extends BaseMapper<OperationLogBean> {
 
     List<OperationLogBeanVo> selectOperationLog(@Param("type") String  type, @Param("userId") String userId);
+
+    Page<Map<String, Object>> getAllList(@Param("type")String type, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userName") String userName,  @Param("page")  Page<Object> build);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/OperationLogMapper.xml

@@ -20,4 +20,34 @@
           order by a.time desc
          limit 10
      </select>
+
+    <select id="getAllList" resultType="map">
+        SELECT
+            a.user_file_id AS userFileId,
+            b.file_name AS fileName,
+            a.time timedate,
+            a.type typeNum,
+            a.user_id userId,
+            su.name
+        FROM
+            operationlog a
+        LEFT JOIN userfile b ON
+        a.USER_FILE_ID = b.USER_FILE_ID
+        LEFT JOIN sys_user su ON
+        a.user_id = su.ID
+        <where>
+            <if test="type != null and type != ''">
+                AND a.type = #{type}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND a.time >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND a.time &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+
+
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/IOperationLogService.java

@@ -3,9 +3,12 @@ package vip.xiaonuo.disk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.disk.domain.OperationLogBean;
+import vip.xiaonuo.disk.util.PageQuery;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.operationLog.OperationLogBeanVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IOperationLogService  extends IService<OperationLogBean> {
 
@@ -13,4 +16,6 @@ public interface IOperationLogService  extends IService<OperationLogBean> {
     List<OperationLogBeanVo> selectOperationLog(String type);
 
     void insertOperationLog(OperationLogBean operationlogBean);
+
+    TableDataInfo<Map<String,Object>> getAllList(String type, String startDate, String endDate, String userName, PageQuery pageQuery);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/OperationLogService.java

@@ -1,16 +1,20 @@
 package vip.xiaonuo.disk.service.impl;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.disk.domain.OperationLogBean;
 import vip.xiaonuo.disk.mapper.OperationLogMapper;
+import vip.xiaonuo.disk.util.PageQuery;
+import vip.xiaonuo.disk.util.TableDataInfo;
 import vip.xiaonuo.disk.vo.operationLog.OperationLogBeanVo;
 import  vip.xiaonuo.disk.service.IOperationLogService;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -34,5 +38,11 @@ public class OperationLogService  extends ServiceImpl<OperationLogMapper, Operat
 
     }
 
+    @Override
+    public TableDataInfo<Map<String,Object>> getAllList(String type, String startDate, String endDate, String userName, PageQuery pageQuery) {
+        Page<Map<String,Object>> result = operationLogMapper.getAllList(type,startDate,endDate,userName,pageQuery.build());
+        return TableDataInfo.build(result);
+    }
+
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/OperationLogUtil.java

@@ -25,7 +25,8 @@ public class OperationLogUtil {
      * @param detail    详细信息
      * @return 操作日志参数
      */
-    public  void getOperationLogObj(HttpServletRequest request, String userId, String isSuccess, String source, String operation, String detail,String userFileId,String type) {
+    public  void getOperationLogObj(HttpServletRequest request, String userId, String isSuccess, String source, String operation, String detail,String userFileId,String type,String fileName
+    ) {
         //用户需要登录才能进行的操作，需要记录操作日志
         OperationLogBean operationLogBean = new OperationLogBean();
         operationLogBean.setUserId(userId);
@@ -39,6 +40,7 @@ public class OperationLogUtil {
         operationLogBean.setRequestURI(request.getRequestURI());
         operationLogBean.setRequestMethod(request.getMethod());
         operationLogBean.setUserFileId(userFileId);
+        operationLogBean.setFileName(fileName);
         operationLogBean.setType(type);
         iOperationLogService.insertOperationLog(operationLogBean);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/TableDataInfo.java

@@ -28,7 +28,7 @@ public class TableDataInfo<T> implements Serializable {
     /**
      * 列表数据
      */
-    private List<T> rows;
+    private List<T> data;
 
     /**
      * 消息状态码
@@ -47,7 +47,7 @@ public class TableDataInfo<T> implements Serializable {
      * @param total 总记录数
      */
     public TableDataInfo(List<T> list, long total) {
-        this.rows = list;
+        this.data = list;
         this.total = total;
     }
 
@@ -55,7 +55,7 @@ public class TableDataInfo<T> implements Serializable {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(200);
         rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecords());
+        rspData.setData(page.getRecords());
         rspData.setTotal(page.getTotal());
         return rspData;
     }
@@ -64,7 +64,7 @@ public class TableDataInfo<T> implements Serializable {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(200);
         rspData.setMsg("查询成功");
-        rspData.setRows(list);
+        rspData.setData(list);
         rspData.setTotal(list.size());
         return rspData;
     }