From 1e7bea1cfadbbbc95b0c0697b13aa9050cf02dc7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 十月 2024 17:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java | 161 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 117 insertions(+), 44 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
index c99b884..14c12e1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MsgUtil.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.core.utils;
import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.constant.MsgConstants;
import com.ruoyi.common.core.utils.req.SubmitTempletReq;
import org.apache.commons.codec.binary.Base64;
@@ -15,23 +16,56 @@
/**
- * 更换手机号短信验证码
- * @param phone
- * @param code
- * @param templateId
+ * 更换手机号：【签名】验证码：XXX，用于更换手机号。请勿转发。
+ * @param phone 手机号
+ * @param code 验证码
* @return
*/
- public static String codeMsg(String apId,String phone,String code,String templateId){
+ public static String codeMsg(String phone,String code){
SubmitTempletReq submitReq = new SubmitTempletReq();
String[] paramss = {code};
- submitReq.setApId(apId);
+ submitReq.setApId(MsgConstants.CODE_AP_ID);
submitReq.setEcName(ecName);
submitReq.setSecretKey(secretKey);
submitReq.setParams(JSON.toJSONString(paramss));
submitReq.setMobiles(phone);
submitReq.setAddSerial("");
submitReq.setSign(sign);
- submitReq.setTemplateId(templateId);
+ submitReq.setTemplateId(MsgConstants.CODE_TEMPLATE_ID);
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append(submitReq.getEcName());
+ stringBuffer.append(submitReq.getApId());
+ stringBuffer.append(submitReq.getSecretKey());
+ stringBuffer.append(submitReq.getTemplateId());
+ stringBuffer.append(submitReq.getMobiles());
+ stringBuffer.append(submitReq.getParams());
+ stringBuffer.append(submitReq.getSign());
+ stringBuffer.append(submitReq.getAddSerial());
+ submitReq.setMac(MD5Util.getMD5(stringBuffer.toString()));
+ String reqText = JSON.toJSONString(submitReq);
+ //加密
+ String encode = Base64.encodeBase64String(reqText.getBytes());
+ System.err.println(encode);
+ return encode;
+ }
+
+ /**
+ * 更换手机号：【签名】验证码：XXX，用于更换手机号。请勿转发。
+ * @param phone 手机号
+ * @param code 验证码
+ * @return
+ */
+ public static String applyCodeMsg(String phone,String code){
+ SubmitTempletReq submitReq = new SubmitTempletReq();
+ String[] paramss = {code};
+ submitReq.setApId(MsgConstants.APPLY_AP_ID);
+ submitReq.setEcName(ecName);
+ submitReq.setSecretKey(secretKey);
+ submitReq.setParams(JSON.toJSONString(paramss));
+ submitReq.setMobiles(phone);
+ submitReq.setAddSerial("");
+ submitReq.setSign(sign);
+ submitReq.setTemplateId(MsgConstants.APPLY_TEMPLATE_ID);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(submitReq.getEcName());
stringBuffer.append(submitReq.getApId());
@@ -51,46 +85,14 @@
/**
- * 审批流程短信
- * @param phone
- * @param name
- * @param work
- * @param templateId
+ * 停车占位提醒：车辆已在3小时前完成充电，请及时取车，避免长时间占用充电资源。
+ * @param phone 手机号
* @return
*/
- public static String auditMsg(String apId,String phone,String name,String work,String templateId){
+ public static String stopMsg(String phone){
SubmitTempletReq submitReq = new SubmitTempletReq();
- // 判断工程名称长度
-// if(work.length()<=10){
-// String[] paramss = {name,work};
-// submitReq.setParams(JSON.toJSONString(paramss));
-// submitReq.setTemplateId("1ebcb36e532742ed8fd7b998a8222aab");
-// }else if (work.length()<=20){
-// String work1 = work.substring(0,10);
-// String work2 = work.substring(10);
-// String[] paramss = {name,work1,work2};
-// submitReq.setParams(JSON.toJSONString(paramss));
-// submitReq.setTemplateId("1c9e6cbddec649b1bdfa6830448df8ad");
-// }else if (work.length()<=30){
-// String work1 = work.substring(0,10);
-// String work2 = work.substring(10,20);
-// String work3 = work.substring(20);
-// String[] paramss = {name,work1,work2,work3};
-// submitReq.setParams(JSON.toJSONString(paramss));
-// submitReq.setTemplateId("91960e43e51446d0b3789129580f5bf8");
-// }else {
-// String work1 = work.substring(0, 10);
-// String work2 = work.substring(10, 20);
-// String work3 = work.substring(20, 30);
-// String work4 = work.substring(30);
-// String[] paramss = {name, work1, work2, work3, work4};
-// submitReq.setParams(JSON.toJSONString(paramss));
-// submitReq.setTemplateId("279dd31f0565494284ee62694ae3e326");
-// }
- String[] paramss = {name};
- submitReq.setParams(JSON.toJSONString(paramss));
- submitReq.setTemplateId("32b209c0096c48d7add8bafb290083dc");
- submitReq.setApId(apId);
+ submitReq.setTemplateId(MsgConstants.STOP_TEMPLATE_ID);
+ submitReq.setApId(MsgConstants.STOP_AP_ID);
submitReq.setEcName(ecName);
submitReq.setSecretKey(secretKey);
submitReq.setMobiles(phone);
@@ -114,6 +116,77 @@
}
/**
+ * 充电结束：车辆充电结束，请及时取车。
+ * @param phone 手机号
+ * @return
+ */
+ public static String chargeStopMsg(String phone){
+ SubmitTempletReq submitReq = new SubmitTempletReq();
+ submitReq.setTemplateId(MsgConstants.CHARGE_TEMPLATE_ID);
+ submitReq.setApId(MsgConstants.CHARGE_AP_ID);
+ submitReq.setEcName(ecName);
+ submitReq.setSecretKey(secretKey);
+ submitReq.setMobiles(phone);
+ submitReq.setAddSerial("");
+ submitReq.setSign(sign);
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append(submitReq.getEcName());
+ stringBuffer.append(submitReq.getApId());
+ stringBuffer.append(submitReq.getSecretKey());
+ stringBuffer.append(submitReq.getTemplateId());
+ stringBuffer.append(submitReq.getMobiles());
+ stringBuffer.append(submitReq.getParams());
+ stringBuffer.append(submitReq.getSign());
+ stringBuffer.append(submitReq.getAddSerial());
+ submitReq.setMac(MD5Util.getMD5(stringBuffer.toString()));
+ String reqText = JSON.toJSONString(submitReq);
+ //加密
+ String encode = Base64.encodeBase64String(reqText.getBytes());
+ System.err.println(encode);
+ return encode;
+ }
+
+ /** phone 单词可拼接5000个号码
+ * 桩故障（自动/手动）：检测到【电站1】【编号】号桩设备离线，请及时查看处理！
+ * @param phone 手机号
+ * @param site 站点名称
+ * @param chargeGun 桩编号
+ * @return
+ */
+ public static String faultMsg(String phone,String site,String chargeGun){
+ SubmitTempletReq submitReq = new SubmitTempletReq();
+ if(site.length()<=10){
+ String[] paramss = {site,chargeGun};
+ submitReq.setParams(JSON.toJSONString(paramss));
+ }else{
+ String work1 = site.substring(0,10);
+ String[] paramss = {work1,chargeGun};
+ submitReq.setParams(JSON.toJSONString(paramss));
+ }
+ submitReq.setTemplateId(MsgConstants.FAULT_TEMPLATE_ID);
+ submitReq.setApId(MsgConstants.FAULT_AP_ID);
+ submitReq.setEcName(ecName);
+ submitReq.setSecretKey(secretKey);
+ submitReq.setMobiles(phone);
+ submitReq.setAddSerial("");
+ submitReq.setSign(sign);
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append(submitReq.getEcName());
+ stringBuffer.append(submitReq.getApId());
+ stringBuffer.append(submitReq.getSecretKey());
+ stringBuffer.append(submitReq.getTemplateId());
+ stringBuffer.append(submitReq.getMobiles());
+ stringBuffer.append(submitReq.getParams());
+ stringBuffer.append(submitReq.getSign());
+ stringBuffer.append(submitReq.getAddSerial());
+ submitReq.setMac(MD5Util.getMD5(stringBuffer.toString()));
+ String reqText = JSON.toJSONString(submitReq);
+ //加密
+ String encode = Base64.encodeBase64String(reqText.getBytes());
+ System.err.println(encode);
+ return encode;
+ }
+ /**
* 生成验证码
* @return
*/
--
Gitblit v1.7.1