Merge branch 'bgy' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/sendrecord/ShortMessageController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.wisdomarbitrate.sendrecord;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
+import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
 import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper;
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,12 +37,12 @@ public class ShortMessageController {
      */
     @Anonymous
     @PostMapping("/reSendShortMessage")
-    public AjaxResult reSendShortMessage(@RequestBody SmsSendRecord smsSendRecord) {
-        if (smsSendRecord != null) {
-            AjaxResult result = shortMessageService.reSendShortMessage(smsSendRecord);
+    public AjaxResult reSendShortMessage(@RequestBody ReSendMessageVO reSendMessageVO) {
+        if (reSendMessageVO != null) {
+            AjaxResult result = shortMessageService.reSendShortMessage(reSendMessageVO);
             return result;
         }
-        return AjaxResult.error("发送失败");
+        return AjaxResult.error("参数缺失");
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/shortmessage/ReSendMessageVO.java

@@ -0,0 +1,28 @@
+package com.ruoyi.wisdomarbitrate.domain.vo.shortmessage;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReSendMessageVO {
+    /**
+     * 短信模版Id
+     */
+    private String templateId;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 短信模版参数值
+     */
+    private List<String> paramValues;
+
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/ShortMessageService.java

@@ -3,6 +3,7 @@ package com.ruoyi.wisdomarbitrate.service.shortmessage;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.MeetingInfoVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
 
 public interface ShortMessageService {
     /**
@@ -13,9 +14,9 @@ public interface ShortMessageService {
     /**
      * 重新发送短信
      *
-     * @param smsSendRecord
+     * @param reSendMessageVO
      */
-    AjaxResult reSendShortMessage(SmsSendRecord smsSendRecord);
+    AjaxResult reSendShortMessage(ReSendMessageVO reSendMessageVO);
 
     /**
      * 根据信息生成加密信息记录

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
 import com.ruoyi.system.mapper.shortmessage.MsSmsSendHistoryRecordMapper;
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.MeetingInfoVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -50,20 +51,27 @@ public class ShortMessageServiceImpl implements ShortMessageService {
     /**
      * 重新发送短信
      *
-     * @param smsSendRecord
+     * @param reSendMessageVO
      */
     @Override
-    public AjaxResult reSendShortMessage(SmsSendRecord smsSendRecord) {
-        SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
-        //TODO 模版id待替换
-        request.setTemplateId("1955047");
-        request.setPhone(smsSendRecord.getPhone());
-        request.setTemplateParamSet(new String[]{smsSendRecord.getSendContent()});
-        JSONObject resultObj = SmsUtils.sendSms(request);
-        if (resultObj.get("status") != null && !resultObj.get("status").equals(SMSStatusEnum.FAIL.getCode())) {
-            return AjaxResult.success("短信发送成功");
+    public AjaxResult reSendShortMessage(ReSendMessageVO reSendMessageVO) {
+        if (reSendMessageVO != null && reSendMessageVO.getTemplateId() != null && reSendMessageVO.getPhone() != null && reSendMessageVO.getParamValues() != null && reSendMessageVO.getParamValues().size() > 0) {
+            SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
+            request.setTemplateId(reSendMessageVO.getTemplateId());
+            request.setPhone(reSendMessageVO.getPhone());
+            String[] messageContent = reSendMessageVO.getParamValues().toArray(new String[0]);
+            System.out.println(reSendMessageVO.getTemplateId());
+            System.out.println(reSendMessageVO.getPhone());
+            System.out.println(messageContent);
+            request.setTemplateParamSet(messageContent);
+            JSONObject resultObj = SmsUtils.sendSms(request);
+            if (resultObj.get("status") != null && !resultObj.get("status").equals(SMSStatusEnum.FAIL.getCode())) {
+                return AjaxResult.success("重新发送成功");
+            } else {
+                return AjaxResult.warn("重新发送失败");
+            }
         } else {
-            return AjaxResult.warn("短信发送失败");
+            return AjaxResult.warn("参数缺失");
         }
     }