短信内容增加请求原文内容记录

project_data/sql/0.1.0/soc/soc.sql

@@ -247,6 +247,7 @@ create table sms_send_record
     content_data       varchar(225) not null comment '短信内容',
     result             varchar(225) null comment '发送结果',
     result_description varchar(125) null comment '发送结果描述',
+    req_detail        varchar(225) null comment '短信发送请求详情',
     resp_detail        varchar(225) null comment '短信发送返回详情'
 )
     comment '短信发送记录';

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/sms/domain/SmsSendRecord.java

@@ -79,6 +79,10 @@ public class SmsSendRecord implements Serializable {
     @TableField("result_description")
     private String resultDescription;
 
+    @ApiModelProperty(value = "请求内容")
+    @TableField("req_detail")
+    private String reqDetail;
+
     @ApiModelProperty(value = "返回结果详情")
     @TableField("resp_detail")
     private String respDetail;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/sms/vo/SmsSendRecordPageVo.java

@@ -43,6 +43,9 @@ public class SmsSendRecordPageVo {
     @ApiModelProperty(value = "发送结果描述")
     private String resultDescription;
 
+    @ApiModelProperty(value = "请求内容")
+    private String reqDetail;
+
 
 
 

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/ISmsSendRecordService.java

@@ -1,6 +1,7 @@
 package com.xunmei.sms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dc.eai.data.CompositeData;
 import com.xunmei.common.core.domain.reminder.dto.ReminderScheduleMsgDto;
 import com.xunmei.common.core.domain.sms.domain.SmsSendRecord;
 import com.xunmei.common.core.domain.sms.dto.SmsSendRecordPageDto;
@@ -24,8 +25,8 @@ public interface ISmsSendRecordService extends IService<SmsSendRecord> {
 
     void batchSave(Collection<SmsSendRecord> list);
 
-    SmsSendRecord saveSmsRecord(SysOrg sysOrg, SysUser sysUser, AjaxResult result, SmsInfoVo smsInfoVo);
-    SmsSendRecord saveSmsRecord(ReminderScheduleMsgDto msgDto, AjaxResult result, SmsInfoVo smsInfoVo);
+    SmsSendRecord saveSmsRecord(SysOrg sysOrg, SysUser sysUser, AjaxResult result, SmsInfoVo smsInfoVo, CompositeData smsCompositeData);
+    SmsSendRecord saveSmsRecord(ReminderScheduleMsgDto msgDto, AjaxResult result, SmsInfoVo smsInfoVo,CompositeData smsCompositeData);
 
     TableDataInfo<?> pageData(SmsSendRecordPageDto req);
 }

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/SmsService.java

@@ -96,7 +96,7 @@ public class SmsService implements ISmsService {
             logger.debug("【发送短信】返回数据：" + JSONObject.toJSON(rspData));
 //            return getResult(rspData);
             AjaxResult result = getResult(rspData);
-            recordService.saveSmsRecord(new SysOrg(), new SysUser(), result, data);
+            recordService.saveSmsRecord(new SysOrg(), new SysUser(), result, data,smsCompositeData);
             return result;
         } catch (Exception ex) {
             logger.error("【发送短信】发送时内部异常：数据：" + JSONObject.toJSON(data), ex);
@@ -137,7 +137,7 @@ public class SmsService implements ISmsService {
     private void deal(SysOrg sysOrg, SysUser sysUser, SmsInfoVo smsInfoVo) {
         if (ObjectUtil.isEmpty(sysUser.getPhone())) {
             AjaxResult result = AjaxResult.error("用户" + sysUser.getName() + "手机号为空");
-            recordService.saveSmsRecord(sysOrg, sysUser, result, smsInfoVo);
+            recordService.saveSmsRecord(sysOrg, sysUser, result, smsInfoVo,null);
             return;
         }
         CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo, systemCode, systemName, serviceCode, serviceScene);
@@ -148,7 +148,7 @@ public class SmsService implements ISmsService {
             logger.error("短信发送时发生异常 :", e);
         }
         AjaxResult result = getResult(rspData);
-        recordService.saveSmsRecord(sysOrg, sysUser, result, smsInfoVo);
+        recordService.saveSmsRecord(sysOrg, sysUser, result, smsInfoVo,smsCompositeData);
     }
 
     @Override
@@ -207,11 +207,12 @@ public class SmsService implements ISmsService {
             smsInfoVo.setRetMsg(dto.getType());
             smsInfoVo.setBak3(dto.getMsgContent());
             AjaxResult result;
+            CompositeData smsCompositeData=null;
             if (ObjectUtil.isEmpty(dto.getPhone())) {
                 result = AjaxResult.error("用户" + dto.getRecipientName() + "手机号为空");
             } else {
                 CompositeData rspData = null;
-                CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo, systemCode, systemName, serviceCode, serviceScene);
+                smsCompositeData = SmsUtil.createSmsBody(smsInfoVo, systemCode, systemName, serviceCode, serviceScene);
                 try {
                     rspData = ESBClient.request(smsCompositeData);
                 } catch (Exception e) {
@@ -227,7 +228,7 @@ public class SmsService implements ISmsService {
                 msgVo.setScheduleId(dto.getScheduleId());
                 returnData.add(msgVo);
             }
-            recordService.saveSmsRecord(dto, result, smsInfoVo);
+            recordService.saveSmsRecord(dto, result, smsInfoVo,smsCompositeData);
         }
         return returnData;
     }

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/impl/SmsSendRecordServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dc.eai.data.CompositeData;
 import com.xunmei.common.core.constant.HttpStatus;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.reminder.dto.ReminderScheduleMsgDto;
@@ -21,6 +22,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.vo.SmsInfoVo;
+import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -76,10 +78,10 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
         }
         for (SmsSendRecord smsSendRecord : list) {
             int insert = baseMapper.insert(smsSendRecord);
-            if (insert==0){
+            if (insert == 0) {
                 log.error("短信发送记录保存失败");
-            }else {
-                log.info("短信发送记录保存成功:{}",JSON.toJSONString(smsSendRecord));
+            } else {
+                log.info("短信发送记录保存成功:{}", JSON.toJSONString(smsSendRecord));
             }
 
         }
@@ -87,7 +89,7 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
     }
 
     @Override
-    public SmsSendRecord saveSmsRecord(SysOrg sysOrg, SysUser sysUser, AjaxResult result, SmsInfoVo smsInfoVo) {
+    public SmsSendRecord saveSmsRecord(SysOrg sysOrg, SysUser sysUser, AjaxResult result, SmsInfoVo smsInfoVo, CompositeData smsCompositeData) {
         SmsSendRecord record = new SmsSendRecord();
         record.setId(IdWorker.getId());
         record.setTime(LocalDateTime.now());
@@ -102,18 +104,19 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
         record.setTypeText(smsInfoVo.getRetMsg());
         record.setResult(result.get(AjaxResult.CODE_TAG).equals(String.valueOf(HttpStatus.SUCCESS)) ? "0" : "1");
         record.setResultDescription(result.get(AjaxResult.MSG_TAG).toString());
+        record.setReqDetail(smsCompositeData == null ? StringUtil.EMPTY_STRING : JSON.toJSONString(smsCompositeData));
         record.setRespDetail(JSON.toJSONString(result));
         int insert = baseMapper.insert(record);
-        if (insert==0){
+        if (insert == 0) {
             log.error("短信发送记录保存失败");
-        }else {
-            log.info("短信发送记录保存成功:{}",JSON.toJSONString(record));
+        } else {
+            log.info("短信发送记录保存成功:{}", JSON.toJSONString(record));
         }
         return record;
     }
 
     @Override
-    public SmsSendRecord saveSmsRecord(ReminderScheduleMsgDto msgDto, AjaxResult result, SmsInfoVo smsInfoVo) {
+    public SmsSendRecord saveSmsRecord(ReminderScheduleMsgDto msgDto, AjaxResult result, SmsInfoVo smsInfoVo, CompositeData smsCompositeData) {
         SmsSendRecord record = new SmsSendRecord();
         record.setId(IdWorker.getId());
         record.setTime(LocalDateTime.now());
@@ -128,12 +131,13 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
         record.setTypeText(smsInfoVo.getRetMsg());
         record.setResult(result.get(AjaxResult.CODE_TAG).equals(String.valueOf(HttpStatus.SUCCESS)) ? "0" : "1");
         record.setResultDescription(result.get(AjaxResult.MSG_TAG).toString());
+        record.setReqDetail(JSON.toJSONString(smsCompositeData));
         record.setRespDetail(JSON.toJSONString(result));
         int insert = baseMapper.insert(record);
-        if (insert==0){
+        if (insert == 0) {
             log.error("短信发送记录保存失败");
-        }else {
-            log.info("短信发送记录保存成功:{}",JSON.toJSONString(record));
+        } else {
+            log.info("短信发送记录保存成功:{}", JSON.toJSONString(record));
         }
         return record;
     }