From d0e4a1a2192982a93d51a0372191ae14455341ba Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 23 二月 2023 11:56:49 +0800
Subject: [PATCH] ECR
---
src/main/java/com/whyc/controller/SoftwareController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index 32133c5..462c62f 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -42,9 +42,16 @@
@ApiOperation("杞欢涓婁紶")
@PostMapping("upload")
- public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
+ 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 = "鏌ヨ杞欢鍒楄〃鐨勪俊鎭�")
@@ -53,8 +60,9 @@
@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,pageCurr,pageSize);
+ return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
}
@ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
@@ -69,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