From 22c2dcfdcdd0e4eddbfe3429a75b69cf61a9d0ff Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 09 九月 2022 10:04:27 +0800
Subject: [PATCH] 产品设定可行性
---
src/main/java/com/whyc/controller/SoftwareController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index b9ea170..785aae7 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -43,15 +43,19 @@
@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 softwareStr) throws IOException {
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);
+ 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鏌ヨ杞欢鍒楄〃")
--
Gitblit v1.9.1