|
@@ -66,9 +66,10 @@ public class RealTimeController extends BaseController {
|
|
String filePath = RuoYiConfig.getUploadPath();
|
|
String filePath = RuoYiConfig.getUploadPath();
|
|
|
|
|
|
String fileName = FileUploadUtils.upload(filePath, file);
|
|
String fileName = FileUploadUtils.upload(filePath, file);
|
|
|
|
+ System.out.println(fileName);
|
|
|
|
|
|
String replace = fileName.replace("/profile/upload", filePath);
|
|
String replace = fileName.replace("/profile/upload", filePath);
|
|
-
|
|
+ System.out.println("本地文件路径" + replace);
|
|
HashMap<String, Object> map = new HashMap<>(16);
|
|
HashMap<String, Object> map = new HashMap<>(16);
|
|
|
|
|
|
|
|
|
|
@@ -87,7 +88,7 @@ public class RealTimeController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- map.put("callbackUrl", "https://zxyyq.qs163.cn/prod-api/real/time/getResult/");
|
|
+ map.put("callbackUrl", "https://zxyyq.qs163.cn/prod-api/real/time/getResult");
|
|
String paramString = HttpUtil.parseMapToPathParam(map);
|
|
String paramString = HttpUtil.parseMapToPathParam(map);
|
|
System.out.println("upload paramString:" + paramString);
|
|
System.out.println("upload paramString:" + paramString);
|
|
|
|
|
|
@@ -130,8 +131,8 @@ public class RealTimeController extends BaseController {
|
|
* @throws InterruptedException
|
|
* @throws InterruptedException
|
|
* @throws IOException
|
|
* @throws IOException
|
|
*/
|
|
*/
|
|
- @GetMapping(value = "/getResult/{orderId}/{status}")
|
|
+ @GetMapping(value = "/getResult")
|
|
- private void getResult(@PathVariable("orderId") String orderId, @PathVariable("status") String status) throws SignatureException, InterruptedException, IOException {
|
|
+ private void getResult(String orderId, String status) throws SignatureException, InterruptedException, IOException {
|
|
if ("1".equals(status)) {
|
|
if ("1".equals(status)) {
|
|
HashMap<String, Object> map = new HashMap<>(16);
|
|
HashMap<String, Object> map = new HashMap<>(16);
|
|
map.put("orderId", orderId);
|
|
map.put("orderId", orderId);
|
|
@@ -147,7 +148,7 @@ public class RealTimeController extends BaseController {
|
|
String response = HttpUtil.iflyrecGet(url);
|
|
String response = HttpUtil.iflyrecGet(url);
|
|
JsonParse jsonParse = gson.fromJson(response, JsonParse.class);
|
|
JsonParse jsonParse = gson.fromJson(response, JsonParse.class);
|
|
if (jsonParse.content.orderInfo.status == 4 || jsonParse.content.orderInfo.status == -1) {
|
|
if (jsonParse.content.orderInfo.status == 4 || jsonParse.content.orderInfo.status == -1) {
|
|
- System.out.println("订单完成:" + response);
|
|
+
|
|
|
|
|
|
|
|
|
|
* {
|
|
* {
|
|
@@ -189,6 +190,7 @@ public class RealTimeController extends BaseController {
|
|
|
|
|
|
Object recordId = redisCache.getCacheObject("xf:" + orderId);
|
|
Object recordId = redisCache.getCacheObject("xf:" + orderId);
|
|
if (ObjectUtil.isNotEmpty(recordId)) {
|
|
if (ObjectUtil.isNotEmpty(recordId)) {
|
|
|
|
+ redisCache.deleteObject("xf:" + orderId);
|
|
MeetingRecords meetingRecords = new MeetingRecords();
|
|
MeetingRecords meetingRecords = new MeetingRecords();
|
|
meetingRecords.setRecordId(Long.parseLong(recordId.toString()));
|
|
meetingRecords.setRecordId(Long.parseLong(recordId.toString()));
|
|
meetingRecords.setRecordContent(resultText.toString());
|
|
meetingRecords.setRecordContent(resultText.toString());
|