From a7ca0f9df58733e6c8822fbf29962352d668871c Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 07 九月 2022 12:02:37 +0800
Subject: [PATCH] 软件上传

---
 src/main/java/com/whyc/controller/SoftwareController.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index d8fb87c..b9ea170 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -1,17 +1,21 @@
 package com.whyc.controller;
 
+import com.google.gson.reflect.TypeToken;
 import com.whyc.dto.Response;
 import com.whyc.pojo.Software;
 import com.whyc.service.SoftwareService;
+import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.List;
 
 @Api(tags = "杞欢绠$悊-鏂扮増")
@@ -22,9 +26,9 @@
     @Autowired
     private SoftwareService service;
 
-    @ApiModelProperty("excel瑙f瀽")
+    @ApiOperation("excel瑙f瀽")
     @PostMapping("excelParse")
-    public Response excelParse(@RequestParam MultipartFile multipartFile) throws IOException, InvalidFormatException {
+    public Response excelParse(@RequestParam MultipartFile multipartFile) throws IOException, InvalidFormatException, ParseException {
         Response<Object> response = new Response<>();
         String name=multipartFile.getOriginalFilename();
         assert name != null;
@@ -37,11 +41,29 @@
         return response;
     }
 
+    @ApiOperation("杞欢涓婁紶")
+    @PostMapping("upload")
+    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr){
+        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
+        return service.upload(file1,file2,softwareList);
+    }
+
     @ApiOperation(value = "鏌ヨ杞欢鍒楄〃鐨勪俊鎭�")
     @GetMapping("getAllSoftware")
     public Response getAllSoftware(@RequestParam(required = false) String fileName,@RequestParam int pageCurr,@RequestParam int pageSize ){
         return service.getAllSoftware(fileName,pageCurr,pageSize);
     }
 
+    @ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
+    @GetMapping("getSoftBySubCode")
+    public Response getSoftBySubCode(@RequestParam String subCode ){
+        return service.getSoftBySubCode(subCode);
+    }
+
+    @ApiOperation(value = "鏍规嵁杞欢id瀹炵幇杞欢涓嬭浇")
+    @GetMapping("downLoadSoftware")
+    public void downLoadSoftware(HttpServletRequest req, HttpServletResponse resp, @RequestParam int id){
+        service.downLoadSoftware(req,resp,id);
+    }
 
 }

--
Gitblit v1.9.1