From a5e17e09ce2426ceca8362248bb5e46605bd35d6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 20:26:18 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java          |    6 +++++-
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java |   12 ++++++------
 smartor/src/main/java/com/smartor/domain/SendTaskVO.java                        |    2 +-
 smartor/src/main/java/com/smartor/common/SendService.java                       |   12 ++++++++++--
 4 files changed, 22 insertions(+), 10 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 d5e72b6..3530a37 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
@@ -14,6 +14,7 @@
 import com.smartor.mapper.ServiceTaskMapper;
 import com.smartor.mapper.SvyTaskMapper;
 import com.smartor.mapper.SvyTaskSingleMapper;
+import com.smartor.service.IBaseSmsaccountService;
 import com.smartor.service.IIvrTaskTemplateService;
 import com.smartor.service.IServiceSubtaskRecordService;
 import com.smartor.service.ISvyTaskTemplateService;
@@ -66,6 +67,9 @@
 
     @Autowired
     private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
+    @Autowired
+    IBaseSmsaccountService baseSmsaccountService;
 
     // 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
     private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -211,7 +215,6 @@
                     RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                     String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
 
-
                     for (ServiceSubtask ivrTaskSingle : ivrTaskcalls) {
                         String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
@@ -219,6 +222,7 @@
                         sendMagParam.setUrl(req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid);
                         Boolean aBoolean = sendService.sendMsg(sendMagParam);
 
+
                         //浠诲姟鍙戦�佽褰�
                         ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                         serviceSubtaskRecord.setTaskid(ivrTaskSingle.getTaskid().toString());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 124b1cb..2358750 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -223,22 +223,22 @@
     }
 
     /**
-     * @param HtmlContentVO
+     * @param
      * @return
      */
-    @GetMapping("/common/htmlContent")
+    @PostMapping("/htmlContent")
     public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
         // 鑾峰彇鏂囦欢鐨勫師濮嬪悕绉�
         String fileName = htmlContentVO.getFileName();
         // 灏嗘枃浠朵繚瀛樺埌鎸囧畾鐩綍
-        File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + fileName);
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) {
+        File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
+        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
             writer.write(htmlContentVO.getContent());
-
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return AjaxResult.success();
+        String url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+        return AjaxResult.success(url);
     }
 
 
diff --git a/smartor/src/main/java/com/smartor/common/SendService.java b/smartor/src/main/java/com/smartor/common/SendService.java
index cf51509..4c6ad5c 100644
--- a/smartor/src/main/java/com/smartor/common/SendService.java
+++ b/smartor/src/main/java/com/smartor/common/SendService.java
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 鍙戦�佹湇鍔″伐鍏风被
@@ -43,9 +44,16 @@
             case ("3"):
 
             case ("4"):
+//                BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
+//                baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
+//                baseSmsRequest.setTemplateCode("SMS_461860582");
+//                SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
+
+                //涓嬮潰鐨勭煭淇″彂閫侊紝浠呮祴璇�
                 BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
-                baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
-                baseSmsRequest.setTemplateCode("SMS_461860582");
+                baseSmsRequest.setPhoneNumber("17607179857");
+                baseSmsRequest.setTemplateCode("SMS_279456451");
+                baseSmsRequest.setTemplateParam("{'code':'58965'}");
                 SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
                 if (sendSmsResponseBody.getCode().equals("OK")) {
                     return true;
diff --git a/smartor/src/main/java/com/smartor/domain/SendTaskVO.java b/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
index 5a85730..97ac3e8 100644
--- a/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SendTaskVO.java
@@ -31,7 +31,7 @@
      */
     @Excel(name = " 浠诲姟绫诲瀷锛�  1  闅忚   2 闂嵎    3 瀹ｆ暀 ")
     @ApiModelProperty(value = "浠诲姟绫诲瀷锛�  1  闅忚   2 闂嵎    3 瀹ｆ暀 ")
-    private Integer taskType;
+    private Integer taskType = 1;
 
 
 }

--
Gitblit v1.9.3