From e0129794236e45f062f24bd13ca0042849d24372 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 四月 2023 11:54:47 +0800
Subject: [PATCH] 修改录音回调
---
driver/guns-admin/src/main/resources/logback-spring.xml | 2 +-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml | 1 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 24 +++++++++++++++++++++---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java | 5 +++++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java | 2 +-
5 files changed, 29 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 8458ebb..4a08e12 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,6 +1,8 @@
package com.supersavedriving.driver.modular.system.api;
+import com.alibaba.fastjson.JSON;
import com.supersavedriving.driver.modular.system.model.Driver;
+import com.supersavedriving.driver.modular.system.model.Order;
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.*;
@@ -21,6 +23,9 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
@@ -440,9 +445,10 @@
*/
@ResponseBody
@PostMapping("/base/order/cloudRecordingCallback")
- public void cloudRecordingCallback(HttpServletRequest request){
+ public void cloudRecordingCallback(HttpServletRequest request, HttpServletResponse response){
CloudRecordingCallback cloudRecordingCallback = RongYunUtil.cloudRecordingCallback(request);
- System.err.println("-------------------云端录制状态回调！-------------------");
+// System.err.println("-------------------云端录制状态回调！-------------------");
+// System.err.println(JSON.toJSONString(cloudRecordingCallback));
if(null == cloudRecordingCallback){
System.err.println("云端录制状态回调解析出错！");
return;
@@ -450,8 +456,20 @@
Integer type = cloudRecordingCallback.getType();
if(4 == type){//文件上传
String fileUrl = cloudRecordingCallback.getOutput().getFileUrl();
- System.err.println("文件上传完毕：" + fileUrl);
+ String roomId = cloudRecordingCallback.getRoomId();
+ Order order = orderService.selectById(roomId);
+ order.setRouteRecord(fileUrl);
+ orderService.updateById(order);
}
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.print("OK");
+ out.flush();
+ out.close();
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
index 1f80e47..c54cda9 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
@@ -59,6 +59,7 @@
<result column="oldState" property="oldState"/>
<result column="status" property="status" />
<result column="createTime" property="createTime" />
+ <result column="routeRecord" property="routeRecord"/>
</resultMap>
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
index b73e060..989b5a3 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
@@ -297,4 +297,9 @@
*/
@TableField("createTime")
private Date createTime;
+ /**
+ * 行程录音地址
+ */
+ @TableField("routeRecord")
+ private String routeRecord;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java
index 3d24196..dcc7dca 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java
@@ -98,7 +98,7 @@
"6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
public static void main(String args[]) {
-
+
System.out.println("MD5后再加密：" + KL(MD5("123456")));
System.out.println(MD5("123456"));
// System.out.println("加密：" + KL(MD5("123456")));
diff --git a/driver/guns-admin/src/main/resources/logback-spring.xml b/driver/guns-admin/src/main/resources/logback-spring.xml
index c5caefd..4a0d41a 100644
--- a/driver/guns-admin/src/main/resources/logback-spring.xml
+++ b/driver/guns-admin/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/usr/local/server/app/logs"/>
+ <property name="log.path" value="/usr/local/server/app/logs/driver"/>
<!--<property name="log.path" value="d:/logs/driver"/>-->
<!--0. 日志格式和颜色渲染 -->
--
Gitblit v1.7.1