From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 9e24715..8458ebb 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -1,7 +1,9 @@
package com.supersavedriving.driver.modular.system.api;
+import com.supersavedriving.driver.modular.system.model.Driver;
+import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
+import com.supersavedriving.driver.modular.system.util.rongyun.model.CloudRecordingCallback;
import com.supersavedriving.driver.modular.system.warpper.*;
-import com.supersavedriving.driver.core.common.annotion.ServiceLog;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.service.IDriverService;
import com.supersavedriving.driver.modular.system.service.IOrderService;
@@ -18,7 +20,9 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
/**
* 订单控制器
@@ -35,6 +39,9 @@
@Autowired
private IDriverService driverService;
+ @Autowired
+ private RongYunUtil rongYunUtil;
+
@@ -45,14 +52,14 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<Long> queryDriverServerOrder(){
+ public ResponseWarpper<Map<String, Object>> queryDriverServerOrder(){
try {
Integer uid = driverService.getUserByRequest();
if(null == uid){
return ResponseWarpper.tokenErr();
}
- Long id = orderService.queryDriverServerOrder(uid);
- return ResponseWarpper.success(id);
+ Map<String, Object> map = orderService.queryDriverServerOrder(uid);
+ return ResponseWarpper.success(map);
}catch (Exception e){
e.printStackTrace();
return new ResponseWarpper(500, e.getMessage());
@@ -68,7 +75,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper driverAddOrder(AddOrderWarpper addOrderWarpper){
+ public ResponseWarpper<Integer> driverAddOrder(AddOrderWarpper addOrderWarpper){
try {
Integer uid = driverService.getUserByRequest();
if(null == uid){
@@ -425,4 +432,70 @@
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+ /**
+ * 服务录音回调
+ * @param request
+ */
+ @ResponseBody
+ @PostMapping("/base/order/cloudRecordingCallback")
+ public void cloudRecordingCallback(HttpServletRequest request){
+ CloudRecordingCallback cloudRecordingCallback = RongYunUtil.cloudRecordingCallback(request);
+ System.err.println("-------------------云端录制状态回调！-------------------");
+ if(null == cloudRecordingCallback){
+ System.err.println("云端录制状态回调解析出错！");
+ return;
+ }
+ Integer type = cloudRecordingCallback.getType();
+ if(4 == type){//文件上传
+ String fileUrl = cloudRecordingCallback.getOutput().getFileUrl();
+ System.err.println("文件上传完毕：" + fileUrl);
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/order/openOrderQRCode")
+// @ServiceLog(name = "打开下单二维码操作", url = "/api/order/openOrderQRCode")
+ @ApiOperation(value = "打开下单二维码操作", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper openOrderQRCode(){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.openOrderQRCode(uid);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/order/closeOrderQRCode")
+// @ServiceLog(name = "关闭下单二维码操作", url = "/api/order/closeOrderQRCode")
+ @ApiOperation(value = "关闭下单二维码操作", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper closeOrderQRCode(){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.closeOrderQRCode(uid);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1