From d28d43e9ababfa4c2a91e405702c1fffe18c46cd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 18:04:15 +0800
Subject: [PATCH] 修改杨家坪社区问题
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index f76bf1c..67034b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -1,23 +1,23 @@
package com.panzhihua.applets.api;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import cn.hutool.core.util.StrUtil;
-import com.jcraft.jsch.SftpException;
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.applets.unionpay.*;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.MimeTypeUtils;
+import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
+import com.panzhihua.common.model.vos.community.Base64File;
+import com.panzhihua.common.utlis.*;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -27,7 +27,6 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import com.alibaba.fastjson.JSON;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.common.constants.Constants;
@@ -37,15 +36,13 @@
import com.panzhihua.common.model.vos.community.WeatherVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
-import com.panzhihua.common.utlis.HttpUtils;
-import com.panzhihua.common.utlis.SFTPUtil;
-
import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+import static com.panzhihua.common.utlis.PayUtil.makeUUID;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -171,6 +168,23 @@
}
}
+ @ApiOperation(value = "文件流上传接口")
+ @PostMapping(value = "/uploadImagesInputStream")
+ public R uploadImagesInputStream(@RequestBody Base64File file, HttpServletRequest request) {
+ if(StringUtils.isEmpty(file.getFile())){
+ return R.fail("文件不能为Null");
+ }
+ try {
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ InputStream is = minioUtil.base64StrToInputStream(file.getFile().replace("data:image/png;base64,","").replace("data:image/jpg;base64,","").replace("data:image/jpeg;base64,",""));
+ String imageUrl = minioUtil.uploadInputStream(is, name);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
@ApiOperation(value = "新上传照片压缩接口")
@PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
@@ -184,9 +198,7 @@
File file1=new File(uuid+"_compress.jpg");
String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
//上传完压缩图后把原图清理，防止文件服务器资源爆满
- if (StrUtil.isNotBlank(fileName)){
- minioUtil.removeMinio(fileName);
- }
+ minioUtil.removeMinio(fileName);
return R.ok(imageUrl);
} catch (Exception e) {
log.error("上传照片失败【{}】", e.getMessage());
@@ -218,16 +230,93 @@
String result = HttpUtils.sendGet(url, param);
return R.ok(JSON.parseObject(result));
}
+
+ @ApiOperation(value = "获取安全知识培训跳转url")
+ @GetMapping(value = "getSafety")
+ public R getSafety()
+ {
+ return R.ok("https://pzh.axhpx.com/Wechat/");
+ }
+
+
@ApiOperation("uu洗车下单接口")
@GetMapping("/uuPay")
public R uuPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
return R.ok(map);
}
+
@ApiOperation("无水洗车下单接口")
@GetMapping("/wsPay")
public R wsPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
Map map=umfPayUtil.pay2(orderid, DateUtils.getCurrentDateString(),openid,amount);
return R.ok(map);
}
+
+
+
+
+
+ @ApiOperation("uu洗车银联下单接口")
+ @GetMapping("/uuUnionpayPay")
+ public R uuUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
+ return R.ok(map);
+ }
+
+ @ApiOperation("无水洗车银联下单接口")
+ @GetMapping("/wsUnionpayPay")
+ public R wsUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
+ return R.ok(map);
+ }
+
+ @ApiOperation("uu洗车银联退款接口")
+ @GetMapping("/uuUnionpayRefund")
+ public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
+ String map= Refund.sendOrder(refundAmount,refundOrderId);
+ return R.ok(map);
+ }
+
+ @ApiOperation("无水洗车银联退款接口")
+ @GetMapping("/wsUnionpayRefund")
+ public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
+ String map= Refund.sendOrder(refundAmount,refundOrderId);
+ return R.ok(map);
+ }
+
+
+ @ApiOperation("银联支付查询接口")
+ @GetMapping("/unionpayQuery")
+ public R unionpayRefundPay(@RequestParam("merOrderId")String merOrderId){
+ String map= Query.query(merOrderId);
+ return R.ok(map);
+ }
+
+ @ApiOperation("银联退款查询接口")
+ @GetMapping("/unionpayRefundQuery")
+ public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
+ String map= RefundQuery.refundQuery(merOrderId);
+ return R.ok(map);
+ }
+
+
+
+
+
+
+
}
--
Gitblit v1.7.1