From 20afa13cf7cf0df875de2b1f9e8b56baf246d0f2 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 22 Apr 2025 13:49:27 +0800 Subject: [PATCH] 1 --- .../controller/UploadController.java | 130 ++++++++++++++++++ .../controller/VideoController.java | 69 ---------- .../hxjt/dataupload/mapper/FxfxdxMapper.java | 2 + .../dataupload/service/FxfxdxService.java | 2 + .../service/impl/FxfxdxServiceImpl.java | 5 + src/main/resources/application-dev.yml | 1 + src/main/resources/mapper/FxfxdxMapper.xml | 4 + 7 files changed, 144 insertions(+), 69 deletions(-) create mode 100644 src/main/java/com/hxjt/dataupload/controller/UploadController.java delete mode 100644 src/main/java/com/hxjt/dataupload/controller/VideoController.java diff --git a/src/main/java/com/hxjt/dataupload/controller/UploadController.java b/src/main/java/com/hxjt/dataupload/controller/UploadController.java new file mode 100644 index 0000000..2c6f8e0 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/controller/UploadController.java @@ -0,0 +1,130 @@ +package com.hxjt.dataupload.controller; + +import com.hxjt.dataupload.service.FxfxdxService; +import com.hxjt.dataupload.task.AsyncTask; +import com.hxjt.dataupload.utils.JsonData; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +/** + * liwenxuan + */ + +@RestController +@RequestMapping("dataupload/api/v1") +public class UploadController { + +@Autowired +private AsyncTask asyncTask; + +@Autowired +private FxfxdxService fxfxdxService; + + @RequestMapping("list") + public Object list(){ + + Map map = new HashMap<>(); + map.put("1","asdfdsa"); + map.put("2","S6543465"); + + return map; + + } + @GetMapping("async") + public JsonData testAsync(){ + long begin = System.currentTimeMillis(); + /*asyncTask.task1(); + asyncTask.task2(); + asyncTask.task3();*/ + Future task4 = asyncTask.task4(); + Future task5 = asyncTask.task5(); + for(;;){ + if(task4.isDone() && task5.isDone()){ + try { + String task4Result = task4.get(); + System.out.println(task4Result); + + String task5Result = task5.get(); + System.out.println(task5Result); + + + }catch (InterruptedException e){ + e.printStackTrace(); + }catch (ExecutionException e){ + e.printStackTrace(); + }finally { + break; + } + + } + } + + long end = System.currentTimeMillis(); + return JsonData.buildSuccess(end-begin); + } + + /*获取用户有权限的启用状态的表单列表树形结构*/ + @RequestMapping(value = "/getOTBILLIDById") + public JsonData getCustomerFormList(@RequestBody Map requestBody) { + //System.out.println(requestBody.get("id")); + if(!StringUtils.isBlank(requestBody.get("id"))){ + String result = fxfxdxService.getOTBILLIDById(requestBody.get("id")); + return JsonData.buildSuccess(result); + }else{ + return JsonData.buildError("请先输入id"); + } + } + + @PostMapping("/uploadPDF") + public ResponseEntity uploadPdf(@RequestParam("file") MultipartFile file) { + String uploadDir = "F://dataUpload/zypPdfs/"; + // 1. 验证文件类型和大小 + if (file.isEmpty()) { + return ResponseEntity.badRequest().body("文件不能为空"); + } + if (!file.getContentType().equals("application/pdf")) { + return ResponseEntity.badRequest().body("仅支持PDF格式"); + } + if (file.getSize() > 10 * 1024 * 1024) { // 限制10MB + return ResponseEntity.badRequest().body("文件大小超过限制"); + } + + try { + // 确保目录存在 + File targetDir = new File(uploadDir); + if (!targetDir.exists()) { + targetDir.mkdirs(); // 自动创建多级目录 + } + + // 生成唯一文件名（可选，避免重复覆盖） + String fileName = UUID.randomUUID() + "_" + file.getOriginalFilename(); + + // 构建目标文件的绝对路径 + File targetFile = new File(targetDir.getAbsolutePath() + File.separator + fileName); + + // 保存文件到磁盘 + file.transferTo(targetFile); + return ResponseEntity.ok("上传成功"); + } catch (IOException e) { + return ResponseEntity.internalServerError().body("文件存储失败：" + e.getMessage()); + } + } +} + diff --git a/src/main/java/com/hxjt/dataupload/controller/VideoController.java b/src/main/java/com/hxjt/dataupload/controller/VideoController.java deleted file mode 100644 index f24acfa..0000000 --- a/src/main/java/com/hxjt/dataupload/controller/VideoController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hxjt.dataupload.controller; - -import com.hxjt.dataupload.task.AsyncTask; -import com.hxjt.dataupload.utils.JsonData; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -/** - * liwenxuan - */ - -@RestController -@RequestMapping("/api/v1/video") -public class VideoController { - -@Autowired -private AsyncTask asyncTask; - - @RequestMapping("list") - public Object list(){ - - Map map = new HashMap<>(); - map.put("1","asdfdsa"); - map.put("2","S6543465"); - - return map; - - } - @GetMapping("async") - public JsonData testAsync(){ - long begin = System.currentTimeMillis(); - /*asyncTask.task1(); - asyncTask.task2(); - asyncTask.task3();*/ - Future task4 = asyncTask.task4(); - Future task5 = asyncTask.task5(); - for(;;){ - if(task4.isDone() && task5.isDone()){ - try { - String task4Result = task4.get(); - System.out.println(task4Result); - - String task5Result = task5.get(); - System.out.println(task5Result); - - - }catch (InterruptedException e){ - e.printStackTrace(); - }catch (ExecutionException e){ - e.printStackTrace(); - }finally { - break; - } - - } - } - - long end = System.currentTimeMillis(); - return JsonData.buildSuccess(end-begin); - } - - -} diff --git a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java index 648b02a..ff0c499 100644 --- a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java +++ b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java @@ -46,4 +46,6 @@ public interface FxfxdxMapper { List getOneDtzysPage(@Param("isSingleDay")String isSingleDay); List getOneDlzysPage(@Param("isSingleDay")String isSingleDay); + + String getOTBILLIDById(@Param("id")String id); } diff --git a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java index 907dc81..0d66caf 100644 --- a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java +++ b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java @@ -48,4 +48,6 @@ public interface FxfxdxService { List getOneDtzysPage(String isSingleDay); //断路作业 List getOneDlzysPage(String isSingleDay); + + String getOTBILLIDById(String id); } diff --git a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java index 1fd5dd9..6ad0534 100644 --- a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java +++ b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java @@ -104,4 +104,9 @@ public class FxfxdxServiceImpl implements FxfxdxService { public List getOneDlzysPage(String isSingleDay) { return fxfxdxMapper.getOneDlzysPage(isSingleDay); } + + @Override + public String getOTBILLIDById(String id) { + return fxfxdxMapper.getOTBILLIDById(id); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d8adcd1..225dcc2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -92,3 +92,4 @@ xxl: logpath: ./data/logs/xxl-job/executor #执行器日志保存天数 logretentiondays: 30 + diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 420ad04..7527f57 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -3,6 +3,10 @@ + +