From f55c563e2a0b52e4569ce6b5f81632cac598f7fe Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 十月 2024 18:36:55 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 9312c1f..3b101e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -1,6 +1,5 @@
 package com.ruoyi.web.component;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
@@ -9,15 +8,15 @@
 import com.ruoyi.common.utils.RSAPublicKeyExample;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.web.task.PhoneTask;
 import com.smartor.common.SendService;
 import com.smartor.config.RobotPhoneUtils;
 import com.smartor.domain.*;
 import com.smartor.mapper.ServiceSubtaskMapper;
 import com.smartor.mapper.ServiceTaskMapper;
-import com.smartor.mapper.SvyTaskMapper;
-import com.smartor.mapper.SvyTaskSingleMapper;
-import com.smartor.service.*;
+import com.smartor.service.IBaseSmsaccountService;
+import com.smartor.service.IIvrTaskTemplateService;
+import com.smartor.service.IServiceSubtaskRecordService;
+import com.smartor.service.ISvyTaskTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,6 @@
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
@@ -258,6 +256,7 @@
                         //浠诲姟鍙戦�佽褰�
                         ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                         serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+                        serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
                         serviceSubtaskRecord.setUuid(uuid);
                         serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
                         serviceSubtaskRecord.setPreachform("3");
@@ -305,6 +304,8 @@
                             } else if (type == 3) {
                                 sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false");
                             }
+                            //鐭俊杩橀渶瑕佹ā鏉�
+                            sendMagParam.setContent("銆愭柊鍗庡尰闄€��+<a href="+sendMagParam.getUrl()+"閾炬帴娴嬭瘯</a>");
                             Boolean aBoolean = sendService.sendMsg(sendMagParam);
 
                             if (!aBoolean) {
@@ -348,6 +349,7 @@
                         //浠诲姟鍙戦�佽褰�
                         ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                         serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+                        serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
                         serviceSubtaskRecord.setUuid(uuid);
                         serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
                         serviceSubtaskRecord.setPreachform("5");

--
Gitblit v1.9.3