From 5575818556096be1dadaf5ff356b5db4c832aaa2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 19:27:09 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
index abb42e4..76f20e3 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
@@ -1,13 +1,17 @@
package com.xcong.excoin.common.system.controller;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.common.system.bean.SysExceptionDetailEntity;
import com.xcong.excoin.common.system.dto.Base64UploadDto;
+import com.xcong.excoin.common.system.dto.Base64UploadFilesDto;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.common.system.vo.Base64UploadFilesVo;
import com.xcong.excoin.configurations.properties.AliOssProperties;
-import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
+import com.xcong.excoin.modules.platform.dao.SysExceptionDetailDao;
import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.OssUtils;
import com.xcong.excoin.utils.RedisUtils;
@@ -20,12 +24,16 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -111,21 +119,52 @@
return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
}
+ @ApiOperation(value = "多文件上次接口", notes = "多文件上次接口")
+ @PostMapping(value = "/uploadFilesBase64")
+ public Result uploadFilesBase64(@RequestBody @Validated Base64UploadFilesDto uploadDtos) {
+ Base64UploadFilesVo base64UploadFilesVo = new Base64UploadFilesVo();
+ ArrayList<String> urls = new ArrayList<>();
+ if(CollUtil.isNotEmpty(uploadDtos.getBase64Str())){
+ for(String uploadDto : uploadDtos.getBase64Str()){
+ String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+ boolean flag = OssUtils.uploadFileWithBase64(uploadDto, imageName);
+ if (flag) {
+ String url = aliOssProperties.getBucketName() + "/" + imageName;
+ urls.add(url);
+ }else{
+ return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
+ }
+ }
+ base64UploadFilesVo.setUrls(urls);
+ }
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"), base64UploadFilesVo);
+ }
+//
+// @Autowired
+// private TrxUsdtUpdateService trxUsdtUpdateService;
+//
+// @ApiOperation(value = "trc20测试")
+// @Transactional(rollbackFor = Exception.class)
+// @GetMapping(value = "/getTrc20Test")
+// public Result getTrc20Test() {
+// long start = System.currentTimeMillis();
+// System.out.println(start);
+// long getnowblock = trxUsdtUpdateService.getnowblock();
+// System.out.println(System.currentTimeMillis());
+// Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
+// TrxUsdtUpdateService.getblockbynum(BigInteger.valueOf(Long.parseLong(trc20BlockNum.toString())));
+// long end = System.currentTimeMillis();
+// System.out.println(end);
+// BigDecimal.ONE.divide(BigDecimal.ZERO);
+// return Result.ok(end - start);
+// }
+
@Autowired
- private TrxUsdtUpdateService trxUsdtUpdateService;
+ private SysExceptionDetailDao sysExceptionDetailDao;
- @ApiOperation(value = "trc20测试")
- @GetMapping(value = "/getTrc20Test")
- public Result getTrc20Test() {
- long start = System.currentTimeMillis();
- System.out.println(start);
- long getnowblock = trxUsdtUpdateService.getnowblock();
- System.out.println(System.currentTimeMillis());
- Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
- TrxUsdtUpdateService.getblockbynum(BigInteger.valueOf(Long.parseLong(trc20BlockNum.toString())));
- long end = System.currentTimeMillis();
- System.out.println(end);
-
- return Result.ok(end - start);
+ @GetMapping(value = "/getExceptionMsg")
+ public Result getExceptionMsg(@RequestParam(value = "id") Long id) {
+ SysExceptionDetailEntity sysExceptionDetailEntity = sysExceptionDetailDao.selectById(id);
+ return Result.ok(sysExceptionDetailEntity);
}
}
--
Gitblit v1.9.1