From ba4df2d373ffd0a1a3536af9a5c44c7af6ef7e48 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 16 九月 2022 11:53:50 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/controller/SoftwareController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index b9ea170..462c62f 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -35,23 +35,34 @@
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){
+ 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,softwareList);
+ 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);
}
@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) 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(fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
}
@ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
@@ -66,4 +77,9 @@
service.downLoadSoftware(req,resp,id);
}
+ @ApiOperation(value = "鏍规嵁杞欢id淇敼杞欢閿佸畾鐘舵��")
+ @GetMapping("updateSoftwareLock")
+ public Response updateSoftwareLock(@RequestParam String fileUrl,@RequestParam int lockFlag,@RequestParam String localReason){
+ return service.updateSoftwareLock(fileUrl,lockFlag,localReason);
+ }
}
--
Gitblit v1.9.1