diff --git a/gatedge/.idea/.gitignore b/gatedge/.idea/.gitignore index 0679f73..cee50bd 100644 --- a/gatedge/.idea/.gitignore +++ b/gatedge/.idea/.gitignore @@ -3,4 +3,3 @@ /workspace.xml # 依赖于环境的 Maven 主目录路径 /mavenHomeManager.xml -../gatedge/target/ diff --git a/gatedge/src/main/java/com/gatedge/jindie/controller/SealedQuotationController.java b/gatedge/src/main/java/com/gatedge/jindie/controller/SealedQuotationController.java index 3632c9f..203c73e 100644 --- a/gatedge/src/main/java/com/gatedge/jindie/controller/SealedQuotationController.java +++ b/gatedge/src/main/java/com/gatedge/jindie/controller/SealedQuotationController.java @@ -35,7 +35,7 @@ public class SealedQuotationController { private SealedQuotationService sealedQuotationService; private ResponseBodyMessage responseBodyMessage; - //记录单据编号,用于上传到单据附件管理 + // 记录单据编号,用于上传到单据附件管理 private String UploadFbillNo; @GetMapping("login") @@ -45,23 +45,23 @@ public class SealedQuotationController { } @PostMapping("queryData") - public ListResult queryData(@RequestBody Map map) { + public ListResult queryData(@RequestBody Map map) { String FBILLNO = map.get("FBILLNO"); UploadFbillNo = map.get("UploadFbillNo"); List data = null; if (sealedQuotationService.loginChack(map)) { - data= sealedQuotationService.queryData(FBILLNO); + data = sealedQuotationService.queryData(FBILLNO); } return ResultBuilder.buildEntitySuccess(data); } @PostMapping("queryDataItem") - public ListResult queryDataItem(@RequestBody Map map) { + public ListResult queryDataItem(@RequestBody Map map) { String FBILLNO = map.get("FBILLNO"); UploadFbillNo = map.get("UploadFbillNo"); List data = null; if (sealedQuotationService.loginChack(map)) { - data= sealedQuotationService.queryDataItem(FBILLNO); + data = sealedQuotationService.queryDataItem(FBILLNO); } return ResultBuilder.buildEntitySuccess(data); } @@ -74,17 +74,17 @@ public class SealedQuotationController { @PostMapping("/upload") public ResponseBodyMessage upload(@RequestParam("file") MultipartFile file) throws IOException { - if (!file.isEmpty()) { - //获取上传文件文件名 - String fileName = file.getOriginalFilename(); - //获取上传文件的Base64 - BASE64Encoder base64Encoder =new BASE64Encoder(); - String fileBase64 = base64Encoder.encode(file.getBytes()); - String FIDrestful = sealedQuotationService.InterId(UploadFbillNo); - responseBodyMessage = sealedQuotationService.uploadFile(FIDrestful,fileName,fileBase64,UploadFbillNo); - System.out.println("解析JSON数据:"+ responseBodyMessage.getMessage()); - return responseBodyMessage; + if (file.isEmpty()) { + return new ResponseBodyMessage(0, "未选择文件,附近上传失败"); } - return new ResponseBodyMessage(0,"未选择文件,附近上传失败"); + // 获取上传文件文件名 + String fileName = file.getOriginalFilename(); + // 获取上传文件的Base64 + BASE64Encoder base64Encoder = new BASE64Encoder(); + String fileBase64 = base64Encoder.encode(file.getBytes()); + String FIDrestful = sealedQuotationService.InterId(UploadFbillNo); + responseBodyMessage = sealedQuotationService.uploadFile(FIDrestful, fileName, fileBase64, UploadFbillNo); + System.out.println("解析JSON数据:" + responseBodyMessage.getMessage()); + return responseBodyMessage; } }