From c5538e9c8f0f3a2a6c5f5b8caad3eef25ee0b8f3 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 13 九月 2022 11:30:06 +0800
Subject: [PATCH] 产品可用变成不可用版本设置为-1

---
 src/main/java/com/whyc/controller/SoftwareController.java |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index d8fb87c..8665a83 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,26 +26,54 @@
     @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;
         if(!name.substring(name.length()-4).equals(".xls") && !name.substring(name.length()-5).equals(".xlsx")){
             response.set(1,false,"鏂囦欢瑙f瀽閿欒:涓婁紶鏍煎紡闈瀍xcel鏍煎紡");
         }else{
-            List<Software> list = service.excelParse(multipartFile.getInputStream());
-            response.setII(1,true,list,"鏂囦欢瑙f瀽鎴愬姛");
+            response =  service.excelParse(multipartFile.getInputStream());
         }
         return response;
     }
 
-    @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("杞欢涓婁紶")
+    @PostMapping("upload")
+    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
+        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
+        return service.upload(file1,file2,softwareList);
     }
 
+    @ApiOperation("鏇存柊杞欢鐗堟湰瀵瑰簲鐨勯�傜敤鏈哄瀷")
+    @PutMapping("applyModel")
+    public Response updateApplyModel(@RequestParam MultipartFile multipartFile,@RequestParam String softwareStr) throws IOException {
+        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
+        return service.updateApplyModel(multipartFile,softwareList);
+    }
+
+    @ApiOperation(value = "鏌ヨ杞欢鍒楄〃鐨勪俊鎭�")
+    @GetMapping("getAllSoftware")
+    public Response getAllSoftware(@RequestParam(required = false) String fileName,
+                                   @RequestParam(required = false) String applyMaterialCode,
+                                   @RequestParam(required = false) String applyModel,
+                                   @RequestParam(required = false) String owner,
+                                   @RequestParam int pageCurr,@RequestParam int pageSize ){
+        return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,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