From 66db1d15cf5d4b51a346a42b66f0505bd7f31ce0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 03 一月 2024 15:23:47 +0800
Subject: [PATCH] 解压
---
src/main/java/com/whyc/controller/SoftwareController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index cfa34a0..c466f95 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -1,8 +1,10 @@
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.ApiOperation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -10,6 +12,8 @@
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;
@@ -31,23 +35,43 @@
if(!name.substring(name.length()-4).equals(".xls") && !name.substring(name.length()-5).equals(".xlsx")){
response.set(1,false,"鏂囦欢瑙ｆ瀽閿欒:涓婁紶鏍煎紡闈瀍xcel鏍煎紡");
}else{
- List<Software> list = service.excelParse(multipartFile.getInputStream());
- response.setII(1,true,list,"鏂囦欢瑙ｆ瀽鎴愬姛");
+ response = service.excelParse(multipartFile.getInputStream());
}
return response;
}
@ApiOperation("杞欢涓婁紶")
@PostMapping("upload")
- public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr){
-
- return null;
+ public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String fontUpdateTime,@RequestParam String softwareStr) throws IOException {
+ List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
+ return service.upload(file1,file2,fontUpdateTime,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);
+ }
+
+ /**
+ *lockFlag :
+ * 鍏ㄩ儴 11
+ * 鍙敤 0
+ * 涓嶅彲鐢� 12
+ * 寰呮祴璇� -1
+ */
@ApiOperation(value = "鏌ヨ杞欢鍒楄〃鐨勪俊鎭�")
@GetMapping("getAllSoftware")
- public Response getAllSoftware(@RequestParam(required = false) String fileName,@RequestParam int pageCurr,@RequestParam int pageSize ){
- return service.getAllSoftware(fileName,pageCurr,pageSize);
+ public Response getAllSoftware(
+ @RequestParam(required = false) Integer lockFlag,
+ @RequestParam(required = false) String fileName,
+ @RequestParam(required = false) String applyMaterialCode,
+ @RequestParam(required = false) String applyModel,
+ @RequestParam(required = false) String owner,
+ @RequestParam(required = false) String boardNumber,
+ @RequestParam int pageCurr,@RequestParam int pageSize ){
+ return service.getAllSoftware(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
}
@ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
@@ -56,5 +80,21 @@
return service.getSoftBySubCode(subCode);
}
+ @ApiOperation(value = "鏍规嵁杞欢id瀹炵幇杞欢涓嬭浇")
+ @GetMapping("downLoadSoftware")
+ public void downLoadSoftware(HttpServletRequest req, HttpServletResponse resp, @RequestParam int id){
+ service.downLoadSoftware(req,resp,id);
+ }
+ @ApiOperation(value = "鏍规嵁杞欢id淇敼杞欢閿佸畾鐘舵��")
+ @GetMapping("updateSoftwareLock")
+ public Response updateSoftwareLock(@RequestParam String fileUrl,@RequestParam int lockFlag,@RequestParam int lockFlagNow,@RequestParam String localReason){
+ return service.updateSoftwareLock(fileUrl,lockFlagNow,lockFlag,localReason);
+ }
+
+ @ApiOperation(value = "鏍规嵁杞欢杞欢鍚嶅疄鐜拌蒋浠跺垹闄�")
+ @GetMapping("deleteSoftware")
+ public Response deleteSoftware( @RequestParam String fileName,@RequestParam String version){
+ return service.deleteSoftware(fileName,version);
+ }
}
--
Gitblit v1.9.1