新增告警模块，告警相关（告警信息，短信相关）代码从 sm 模块抽离

zhongrj

2023-06-02 ebf10ccf6217dfeebad750b4f4bb9ef4d9af68b0

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
@@ -1,20 +1,20 @@
package cn.gistack.sm.sms.service.impl;
package cn.gistack.alerts.sms.service.impl;

import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
import cn.gistack.sm.alarmRule.service.AlarmRecordDetailService;
import cn.gistack.sm.sms.entity.SmsRecord;
import cn.gistack.sm.sms.entity.SmsResult;
import cn.gistack.sm.sms.entity.SmsTemplate;
import cn.gistack.sm.sms.service.ISmsRecordService;
import cn.gistack.sm.sms.service.ISmsResultService;
import cn.gistack.sm.sms.service.SmsService;
import cn.gistack.sm.sms.util.SmsUtils;
import cn.gistack.sm.sms.vo.SmsRequestTemplate;
import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.entity.SmsTemplate;
import cn.gistack.alerts.sms.service.ISmsRecordService;
import cn.gistack.alerts.sms.service.ISmsResultService;
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.util.SmsUtils;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -56,7 +56,7 @@
            ComResult<SMSSendDataResult> result = SmsUtils.sendMsg(request);
            if(null != smsResult) {
               // 保存记录
               saveSmsRecord(request, result.getCode(), result.getMsg(), smsResult.getId());
               saveSendRecord(request, result.getCode(), result.getMsg(), smsResult.getId());
            }
            list.add(result);
         }
@@ -114,7 +114,7 @@
            // 设置内容
            request.setMessageContent(format);
            // 保存记录
            smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
            smsRecord = saveSendRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
            if (null != smsRecord){
               alarmRecordDetail.setAlarmContent(format);
               alarmRecordDetail.setSendRecordId(smsRecord.getId());
@@ -159,7 +159,7 @@
      SmsRecord smsRecord = new SmsRecord();
      if (null != smsResult){
         // 保存记录
         smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
         smsRecord = saveSendRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
      }
      Map<String, Object> map = new HashMap<>(2);
      map.put("smsRecord",smsRecord);
@@ -168,34 +168,14 @@
      return map;
   }

   /**
    * 保存发送短信记录信息
    * @param request
    * @param code 响应code
    * @param msg 响应消息
    * @param resultId
    */
   private SmsRecord saveSmsRecord(SMSSendRequest request,Integer code,String msg, Long resultId) {
      // 在保存明细
      SmsRecord smsRecord = new SmsRecord();
      smsRecord.setTel(request.getUserNumber());
      smsRecord.setContent(request.getMessageContent());
      smsRecord.setTemplateId(request.getTemplateId());
      smsRecord.setResultId(resultId);
      smsRecord.setResponseStatus(code.toString());
      smsRecord.setResponseMsg(msg);
      //插入记录
      smsRecordService.save(smsRecord);
      // 返回
      return smsRecord;
   }

   /**
    * 发送记录保存
    * @param request 发送信息
    * @param number 号码个数
    */
   private SmsResult saveSendResult(SMSSendRequest request,Integer number) {
   @Override
   public SmsResult saveSendResult(SMSSendRequest request,Integer number) {
      // 先保存结果表
      SmsResult smsResult = new SmsResult();
      smsResult.setTemplateId(request.getTemplateId());
@@ -209,4 +189,28 @@
      // 返回
      return null;
   }


   /**
    * 保存发送短信记录信息
    * @param request
    * @param code 响应code
    * @param sendMsg 响应消息
    * @param resultId
    */
   @Override
   public SmsRecord saveSendRecord(SMSSendRequest request, Integer code, String sendMsg, Long resultId) {
      // 在保存明细
      SmsRecord smsRecord = new SmsRecord();
      smsRecord.setTel(request.getUserNumber());
      smsRecord.setContent(request.getMessageContent());
      smsRecord.setTemplateId(request.getTemplateId());
      smsRecord.setResultId(resultId);
      smsRecord.setResponseStatus(code.toString());
      smsRecord.setResponseMsg(sendMsg);
      //插入记录
      smsRecordService.save(smsRecord);
      // 返回
      return smsRecord;
   }
}