From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/util/SmsUtil.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/util/SmsUtil.java b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
index 483471c..3ded30f 100644
--- a/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
@@ -23,6 +23,7 @@
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
@@ -376,7 +377,44 @@
         String url =
                 "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
         Random rd = new Random();
-        String content="您有新的导办工单,请"+name+"尽快处理。";
+        String content="您在"+ LocalDateTime.now() +"新的导办工单,请"+name+"尽快处理。";
+        url=url+content;
+        OkHttpClient client = new OkHttpClient();
+        Response response;
+        //解密数据
+        String rsa = null;
+        Request request = new Request.Builder()
+                .url(url)
+                .get()
+                .addHeader("Content-Type", "application/x-www-form-urlencoded")
+                .build();
+        try {
+            response = client.newCall(request).execute();
+            rsa   = response.message();
+            if (!rsa.equals("OK")){
+                return ResultData.success("短信发送失败");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResultData.success("短信发送失败");
+        }
+        return ResultData.success("短信发送成功");
+    }
+
+
+    /**
+     * 发送工单提交短信(电信平台)
+     *
+     * @param tel
+     *            电话
+     * @param name
+     *            工单名
+     */
+    public ResultData<Object> sendSmsOvertimeRemind(String tel,String name) {
+        String url =
+                "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+        Random rd = new Random();
+        String content="您的待处理导办工单已超时,请 "+name+"尽快处理。";
         url=url+content;
         OkHttpClient client = new OkHttpClient();
         Response response;

--
Gitblit v1.7.1