From b76e445294f1ac2420eda9b25d3d131d58876c88 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Tue, 28 Apr 2020 16:15:51 +0800
Subject: [PATCH] p

---
 .../com/gszc/controller/UploadController.java | 32 +++++++++++--------
 .../gszc/service/impl/CustomServiceImpl.java  |  4 +--
 src/main/java/com/gszc/util/OssUtil.java      |  3 +-
 src/main/resources/application-dev.yml        |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/gszc/controller/UploadController.java b/src/main/java/com/gszc/controller/UploadController.java
index 61d2141..2d3e916 100644
--- a/src/main/java/com/gszc/controller/UploadController.java
+++ b/src/main/java/com/gszc/controller/UploadController.java
@@ -4,15 +4,15 @@ import com.gszc.build.Result;
 import com.gszc.build.ResultBuilder;
 import com.gszc.service.CountService;
 import com.gszc.util.OssUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 
 @Api(value = "工商注册 API", tags = {"上传图片api"})
@@ -23,18 +23,22 @@ public class UploadController {
     @Autowired
     OssUtil ossUtil;
 
-    @PostMapping("/VATCount")
-    @ApiOperation(value = "增值税计算器", notes = "增值税计算器")
+    @PostMapping("/image")
+    @ApiOperation(value = "上传图片", notes = "上传图片")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "companyType", value = "公司类型（1-有限公司 2-个独、合伙企业）", dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "invoiceType", value = "开票类型（1-普通发票 2-专用发票）", dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "specialInvoiceType", value = "专票类型（1-服务业 2-商业），不是专票不用填写", dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "money", value = "开票金额", dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"),
     })
-    public Result VATCount(String imageName,String invoiceType,String specialInvoiceType,double money) {
-
-//        ossUtil.putObjectForImage();
-        return ResultBuilder.withPayload("").build();
+    public Result uploadImage(@ApiParam(name = "file", value = "文件") MultipartFile file) {
+
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResultBuilder.error("图片读取失败").build();
+        }
+        String url = ossUtil.putObjectForImage(file.getOriginalFilename(),inputStream,true);
+        return ResultBuilder.withPayload(url).build();
     }
 
 
diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index 198306a..87b0f01 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -226,11 +226,11 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         BigDecimal monthMoney = new BigDecimal("0");
         for(Invoice invoice:yearInvoiceList){
             BigDecimal money = invoice.getMoney();
-            yearMoney.add(money);
+            yearMoney = yearMoney.add(money);
         }
         for(Invoice invoice:monthInvoiceList){
             BigDecimal money = invoice.getMoney();
-            monthMoney.add(money);
+            monthMoney = monthMoney.add(money);
         }
         jsonObject.put("yearMoney",yearMoney);
         jsonObject.put("monthMoney",monthMoney);
diff --git a/src/main/java/com/gszc/util/OssUtil.java b/src/main/java/com/gszc/util/OssUtil.java
index 864b0cf..b713ca9 100644
--- a/src/main/java/com/gszc/util/OssUtil.java
+++ b/src/main/java/com/gszc/util/OssUtil.java
@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
+import com.aliyun.oss.model.PutObjectResult;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -54,7 +55,7 @@ public class OssUtil {
         try {
             initClient();
             ObjectMetadata meta = new ObjectMetadata();
-            client.putObject(bucketName, fileKey, content, meta);
+            PutObjectResult putObjectResult = client.putObject(bucketName, fileKey, content, meta);
             return true;
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ceddaf1..e48e87f 100755
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -45,4 +45,4 @@ oss:
   accessKeyId: LTAI4GJjFopvFkWL534CqhFr
   accessKeySecret: ppLxYAPUkx1Fl4CgUvjLcaOOzlCQjk
   bucketName: gszc
-  endpoint: oss-accelerate.aliyuncs.com
\ No newline at end of file
+  endpoint: oss-cn-shanghai.aliyuncs.com
\ No newline at end of file