diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/sms/rest/TbTemplateController.java b/eladmin-system/src/main/java/me/zhengjie/modules/sms/rest/TbTemplateController.java index d07699b..e1d0ddd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/sms/rest/TbTemplateController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/sms/rest/TbTemplateController.java @@ -96,12 +96,12 @@ public class TbTemplateController { return new ResponseEntity<>(HttpStatus.OK); } - /* *//** + /** * 接收大数据传过来的短信内容 * * @param sendVo 发送任务对应的VO映射 * @return 返回建立任务完成的状态 - *//* + */ @Log("接收短信内容和url") @ApiOperation("接收短信内容和url") // @PreAuthorize("@el.check('taskRecord:list')") @@ -126,5 +126,5 @@ public class TbTemplateController { return new ResponseEntity<>(CommonResponse.createBySuccess(), HttpStatus.OK); } return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_WORD_INPUT), HttpStatus.OK); - }*/ + } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java index 5f686bd..195c8c4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java @@ -16,45 +16,42 @@ package me.zhengjie.modules.uploadnew.rest; import cn.hutool.core.collection.CollectionUtil; -import io.swagger.models.auth.In; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.AnonymousAccess; import me.zhengjie.annotation.Log; import me.zhengjie.common.http.CommonResponse; import me.zhengjie.common.http.ResponseCode; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.security.security.TokenFilter; -import me.zhengjie.modules.upload.service.dto.UploadFileDto; -import me.zhengjie.modules.upload.service.dto.UploadFileQueryCriteria; import me.zhengjie.modules.uploadnew.domain.TbUploadFileNew; import me.zhengjie.modules.uploadnew.service.TbUploadFileNewService; import me.zhengjie.modules.uploadnew.service.dto.TbUploadFileNewDto; import me.zhengjie.modules.uploadnew.service.dto.TbUploadFileNewQueryCriteria; import me.zhengjie.modules.uploadnew.task.SaveToFileNewTask; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -//import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; import org.springframework.web.multipart.MultipartFile; -import org.apache.commons.lang3.StringUtils; -import java.io.IOException; -import java.util.List; -import java.util.Objects; import javax.servlet.ServletRequest; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Objects; import static me.zhengjie.modules.upload.consts.UploadFileConst.FILE_PATH_SPLIT; +//import org.springframework.util.StringUtils; + /** * @website https://el-admin.vip * @author weizhongxi @@ -127,10 +124,19 @@ public class TbUploadFileNewController { @AnonymousAccess @PostMapping("/fileUpload") // @ResponseBody - public ResponseEntity fileUpload(@RequestParam("file") MultipartFile file, @RequestParam(value = "taskName") String taskName, @RequestParam(value = "isEcryptionNew") String isEcryptionNew, ServletRequest servletRequest) { + public ResponseEntity fileUpload(@RequestParam("file") MultipartFile file, + @RequestParam(value = "taskName") String taskName, + @RequestParam(value = "isEcryptionNew") String isEcryptionNew, + ServletRequest servletRequest) { // 记录日志 log.info("TbUploadFileNewController:fileUpload | taskName="+taskName+"===== isEcryptionNew="+isEcryptionNew); + // 校验上传是否有文件 + if (file== null ){ + return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_FILE_INPUT), HttpStatus.OK); + } + // FIXME: 2021/4/23 0023 Integer isEcryption = Integer.parseInt(isEcryptionNew); + // FIXME: 2021/4/23 0023 String name=file.getOriginalFilename(); String keyName = ""; @@ -142,23 +148,23 @@ public class TbUploadFileNewController { //获取cookie的名字 String cookieName = cookie.getName(); token=cookie.getValue(); - System.out.println(cookieName); - System.out.println(cookieName+" : "+ cookie.getValue() ); } } + + // FIXME: 2021/4/23 0023 === keyName = token+"==="+name; Object keyValue = redisTemplate.opsForValue().get(keyName); //防止用户多次提交 if (keyValue != null){ return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.TASK_STAETING), HttpStatus.OK); } - redisTemplate.opsForValue().set(keyName, "value11"); + redisTemplate.opsForValue().set(keyName, "value11"); int lastIndexOf = name.lastIndexOf("."); - String nameStr = name.substring(lastIndexOf); // 校验文件格式 + String nameStr = name.substring(lastIndexOf); if (!((nameStr.equals(".xlsx")||nameStr.equals(".xls")) || nameStr.equals(".txt") ||nameStr.equals(".csv"))){ return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_FILE_FORMAT), HttpStatus.OK); } @@ -179,10 +185,7 @@ public class TbUploadFileNewController { return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.EMPTY_ARGUMENT), HttpStatus.OK); } - // 校验上传是否有文件 - if (file== null ){ - return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_FILE_INPUT), HttpStatus.OK); - } + // 生成本地文件 TbUploadFileNewDto tbUploadFileNewDto = tbUploadFileNewService.encryptDataAndSaveToFileNew(file, taskName, isEcryption); @@ -199,22 +202,5 @@ public class TbUploadFileNewController { return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK); } - @PostMapping("/aa") - @Log("查询文件上传接口") - @ApiOperation("查询文件上传接口") - @AnonymousAccess - public ResponseEntity aa(){ - redisTemplate.opsForValue().set("key111", "value11"); - Object key111 = redisTemplate.opsForValue().get("key111"); - System.out.println("key111 = " + key111.toString()); - - redisTemplate.delete("key111"); - - Object aaaa = redisTemplate.opsForValue().get("key111"); - System.out.println("aaaa = " + aaaa); - - return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK); - } - }