From a7ca0f9df58733e6c8822fbf29962352d668871c Mon Sep 17 00:00:00 2001 From: whycxzp <perryhsu@163.com> Date: 星期三, 07 九月 2022 12:02:37 +0800 Subject: [PATCH] 软件上传 --- src/main/java/com/whyc/controller/SoftwareController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java index 6ff1a79..b9ea170 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; @@ -42,8 +44,8 @@ @ApiOperation("杞欢涓婁紶") @PostMapping("upload") public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr){ - - return null; + List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType()); + return service.upload(file1,file2,softwareList); } @ApiOperation(value = "鏌ヨ杞欢鍒楄〃鐨勪俊鎭�") -- Gitblit v1.9.1