短信模板调整，接口调整

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteSmsService.java

@@ -33,7 +33,7 @@ public interface RemoteSmsService {
      * @return
      */
     @PostMapping("/api/sms/sendSmsIot")
-    void sendSmsIot(@RequestParam("orgId") Long orgId,@RequestParam("alarmContent") String alarmContent,@RequestParam("alarmTime") String alarmTime);
+    void sendSmsIot(@RequestParam("orgId") Long orgId,@RequestParam("alarmType") String alarmType,@RequestParam("alarmContent") String alarmContent,@RequestParam("alarmTime") String alarmTime);
 
     /**
      * 发送待办数据
@@ -42,7 +42,7 @@ public interface RemoteSmsService {
      * @param time
      */
     @PostMapping("/api/sms/sendSmsTodo")
-    void sendSmsTodo(@RequestParam("orgId") Long orgId,@RequestParam("content")  String content,@RequestParam("time") Date time);
+    void sendSmsTodo(@RequestParam("orgId") Long orgId,@RequestParam("type") String type,@RequestParam("content")  String content,@RequestParam("time") Date time);
 
 
     /**

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteSmsFallbackFactory.java

@@ -33,12 +33,12 @@ public class RemoteSmsFallbackFactory implements FallbackFactory<RemoteSmsServic
             }
 
             @Override
-            public void sendSmsIot(Long orgId, String alarmContent, String alarmTime) {
+            public void sendSmsIot(Long orgId,String alarmType, String alarmContent, String alarmTime) {
                 log.error("短信服务未找到");
             }
 
             @Override
-            public void sendSmsTodo(Long orgId, String content, Date time) {
+            public void sendSmsTodo(Long orgId,String type,  String content, Date time) {
                 log.error("短信服务未找到");
             }
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/vo/SmsInfoVo.java

@@ -91,6 +91,12 @@ public class SmsInfoVo {
      * 帐户状态
      */
     private String acctStatus;
+
+    /**
+     * 交易返回信息
+     */
+    private String retMsg;
+
     /**
      * 渠道类型
      */

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDataServiceImpl.java

@@ -142,7 +142,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
                     //需要发送短信
                     LocalDateTime time = alarm.getTime();
                     String timeStr = time.format(formatter);
-                    remoteSmsService.sendSmsIot(iotSensor.getOrgId(), alarm.getContent(), timeStr);
+                    remoteSmsService.sendSmsIot(iotSensor.getOrgId(),alarm.getSourceTypeDes(), alarm.getContent(), timeStr);
                 }
             }
             if (ObjectUtil.notEqual(iotSensor.getState(), 1)) {

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/controller/SmsController.java

@@ -42,13 +42,13 @@ public class SmsController extends BaseController {
 
 
     @PostMapping("/sendSmsIot")
-    public void sendSmsIot(Long orgId,String alarmContent,String alarmTime){
-        smsService.sendSmsIot(orgId,alarmContent,alarmTime);
+    public void sendSmsIot(Long orgId,String alarmType,String alarmContent,String alarmTime){
+        smsService.sendSmsIot(orgId,alarmType,alarmContent,alarmTime);
     };
 
     @PostMapping("/sendSmsTodo")
-    public void sendSmsTodo(Long orgId, String content, Date time){
-        smsService.sendSmsTodo(orgId,content,time);
+    public void sendSmsTodo(Long orgId,String type, String content, Date time){
+        smsService.sendSmsTodo(orgId,type,content,time);
     }
 
     @PostMapping("/api/sms/sendReminderSms")

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

@@ -23,10 +23,11 @@ public interface ISmsService {
     /**
      * 发送动环短信iot
      * @param orgId
+     * @param alarmType
      * @param alarmContent
      * @return
      */
-    void sendSmsIot(Long orgId,String alarmContent,String alarmTime);
+    void sendSmsIot(Long orgId,String alarmType,String alarmContent,String alarmTime);
 
 
     /**
@@ -35,7 +36,7 @@ public interface ISmsService {
      * @param content 内容
      * @param time 待办时间
      */
-    void sendSmsTodo(Long orgId,String content, Date time);
+    void sendSmsTodo(Long orgId,String type,String content, Date time);
 
     List<ReminderScheduleMsgVo> sendReminderSms(List<ReminderScheduleMsgDto> msgDto);
 

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

@@ -109,7 +109,7 @@ public class SmsService implements ISmsService {
      * @return
      */
     @Override
-    public void sendSmsIot(Long orgId, String alarmContent,String alarmTime) {
+    public void sendSmsIot(Long orgId,String alarmType, String alarmContent,String alarmTime) {
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                 remoteRoleService.selectUserByRoleNameAndOrgId("网点负责人", orgId, 0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         SysOrg sysOrg = remoteOrgService.selectOrgById(orgId, SecurityConstants.INNER);
@@ -126,6 +126,7 @@ public class SmsService implements ISmsService {
                 smsInfoVo.setMobile(phone);
                 smsInfoVo.setOccurDate(date);
                 smsInfoVo.setOccurTime(time);
+                smsInfoVo.setRetMsg(alarmType);
                 smsInfoVo.setBak3(alarmContent);
                 CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo,systemCode,systemName,serviceCode,serviceScene);
                 CompositeData rspData = null;
@@ -142,7 +143,7 @@ public class SmsService implements ISmsService {
     }
 
     @Override
-    public void sendSmsTodo(Long orgId, String content, Date time) {
+    public void sendSmsTodo(Long orgId, String type,String content, Date time) {
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                 remoteRoleService.selectUserByRoleNameAndOrgId("网点负责人", orgId, 0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         SysOrg sysOrg = remoteOrgService.selectOrgById(orgId, SecurityConstants.INNER);
@@ -160,6 +161,7 @@ public class SmsService implements ISmsService {
                 smsInfoVo.setMobile(phone);
                 smsInfoVo.setOccurDate(day);
                 smsInfoVo.setOccurTime(sfm);
+                smsInfoVo.setRetMsg(type);
                 smsInfoVo.setBak3("任务【"+ content + "】未完成,将于"+date+"逾期。");
                 CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo,systemCode,systemName,serviceCode,serviceScene);
                 CompositeData rspData = null;
@@ -190,6 +192,7 @@ public class SmsService implements ISmsService {
             smsInfoVo.setMobile(dto.getPhone());
             smsInfoVo.setOccurDate(date);
             smsInfoVo.setOccurTime(time);
+            smsInfoVo.setRetMsg(dto.getType());
             smsInfoVo.setBak3(dto.getMsgContent());
             CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo,systemCode,systemName,serviceCode,serviceScene);
             CompositeData rspData = null;