|
|
@ -20,15 +20,16 @@ import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import me.zhengjie.annotation.AnonymousAccess;
|
|
|
|
|
|
|
|
import me.zhengjie.annotation.Log;
|
|
|
|
import me.zhengjie.annotation.Log;
|
|
|
|
import me.zhengjie.common.http.CommonResponse;
|
|
|
|
import me.zhengjie.common.http.CommonResponse;
|
|
|
|
import me.zhengjie.common.http.ResponseCode;
|
|
|
|
import me.zhengjie.common.http.ResponseCode;
|
|
|
|
|
|
|
|
import me.zhengjie.modules.upload.consts.SysConst;
|
|
|
|
import me.zhengjie.modules.upload.domain.UploadFile;
|
|
|
|
import me.zhengjie.modules.upload.domain.UploadFile;
|
|
|
|
import me.zhengjie.modules.upload.service.UploadFileService;
|
|
|
|
import me.zhengjie.modules.upload.service.UploadFileService;
|
|
|
|
import me.zhengjie.modules.upload.service.dto.UploadFileDto;
|
|
|
|
import me.zhengjie.modules.upload.service.dto.UploadFileDto;
|
|
|
|
import me.zhengjie.modules.upload.service.dto.UploadFileQueryCriteria;
|
|
|
|
import me.zhengjie.modules.upload.service.dto.UploadFileQueryCriteria;
|
|
|
|
import me.zhengjie.modules.upload.task.SaveToFileTask;
|
|
|
|
import me.zhengjie.modules.upload.task.SaveToFileTask;
|
|
|
|
|
|
|
|
import me.zhengjie.utils.SecurityUtils;
|
|
|
|
import me.zhengjie.utils.StringUtils;
|
|
|
|
import me.zhengjie.utils.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
@ -45,6 +46,7 @@ import java.util.List;
|
|
|
|
import java.util.Objects;
|
|
|
|
import java.util.Objects;
|
|
|
|
|
|
|
|
|
|
|
|
import static me.zhengjie.modules.upload.consts.UploadFileConst.FILE_PATH_SPLIT;
|
|
|
|
import static me.zhengjie.modules.upload.consts.UploadFileConst.FILE_PATH_SPLIT;
|
|
|
|
|
|
|
|
import static me.zhengjie.modules.upload.consts.UploadFileConst.WHITE_LIST;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* @website https://el-admin.vip
|
|
|
|
* @website https://el-admin.vip
|
|
|
@ -76,9 +78,28 @@ public class UploadFileController {
|
|
|
|
@ApiOperation("查询上传文件解析发送")
|
|
|
|
@ApiOperation("查询上传文件解析发送")
|
|
|
|
@PreAuthorize("@el.check('uploadFile:list')")
|
|
|
|
@PreAuthorize("@el.check('uploadFile:list')")
|
|
|
|
public ResponseEntity<Object> query(UploadFileQueryCriteria criteria, Pageable pageable){
|
|
|
|
public ResponseEntity<Object> query(UploadFileQueryCriteria criteria, Pageable pageable){
|
|
|
|
|
|
|
|
filterOfWriteList(criteria);
|
|
|
|
|
|
|
|
log.info("======= [ criteria is {} ] =======", criteria.toString());
|
|
|
|
return new ResponseEntity<>(uploadFileService.queryAll(criteria,pageable),HttpStatus.OK);
|
|
|
|
return new ResponseEntity<>(uploadFileService.queryAll(criteria,pageable),HttpStatus.OK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 加一个判断,除了白名单账户外,其他的人查询只能返回自己上传的列表
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param criteria 查询的参数
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
private void filterOfWriteList(UploadFileQueryCriteria criteria) {
|
|
|
|
|
|
|
|
if (!SysConst.sysDebug){
|
|
|
|
|
|
|
|
if (!CollectionUtil.contains(WHITE_LIST, SecurityUtils.getCurrentUsername())){
|
|
|
|
|
|
|
|
criteria.setOperation(SecurityUtils.getCurrentUsername());
|
|
|
|
|
|
|
|
log.info("======= [UploadFileServiceImpl|filterOfWriteList, userName is {} ] =======", SecurityUtils.getCurrentUsername());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping
|
|
|
|
@PostMapping
|
|
|
|
@Log("新增上传文件解析发送")
|
|
|
|
@Log("新增上传文件解析发送")
|
|
|
|
@ApiOperation("新增上传文件解析发送")
|
|
|
|
@ApiOperation("新增上传文件解析发送")
|
|
|
@ -111,7 +132,8 @@ public class UploadFileController {
|
|
|
|
@Log("上传并加密任务")
|
|
|
|
@Log("上传并加密任务")
|
|
|
|
@ApiOperation("上传并加密任务")
|
|
|
|
@ApiOperation("上传并加密任务")
|
|
|
|
@PostMapping(value = "/sendTask")
|
|
|
|
@PostMapping(value = "/sendTask")
|
|
|
|
@AnonymousAccess // fixme 需要测试完成后进行去除和使用上面的权限注解
|
|
|
|
@PreAuthorize("@el.check('uploadFile:list')")
|
|
|
|
|
|
|
|
// @AnonymousAccess // fixme 需要测试完成后进行去除和使用上面的权限注解
|
|
|
|
public ResponseEntity<Object> sendTask(@RequestParam(value = "files", required = false) MultipartFile[] files, @RequestParam(value = "taskName") String taskName ) {
|
|
|
|
public ResponseEntity<Object> sendTask(@RequestParam(value = "files", required = false) MultipartFile[] files, @RequestParam(value = "taskName") String taskName ) {
|
|
|
|
// 任务名称检验,为必填参数,且不能重复
|
|
|
|
// 任务名称检验,为必填参数,且不能重复
|
|
|
|
if (StringUtils.isNotBlank(taskName)){
|
|
|
|
if (StringUtils.isNotBlank(taskName)){
|
|
|
|