From 248f33ff3b981a15b4adf26880e24852809561d9 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Thu, 28 Oct 2021 09:57:22 +0800 Subject: [PATCH] 短信改造延期 --- zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java index f1ad139..00e2ad8 100644 --- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java +++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java @@ -1,28 +1,29 @@ package com.matrix.system.hiveErp.action; import com.alibaba.fastjson.JSONObject; -import com.matrix.core.constance.MatrixConstance; -import com.matrix.core.constance.SystemMessageCode; -import com.matrix.core.pojo.PaginationVO; -import com.matrix.core.constance.SystemErrorCode; import com.matrix.core.anotations.RemoveRequestToken; -import com.matrix.core.tools.*; -import com.matrix.system.common.bean.SysUsers; -import com.matrix.system.hive.action.util.QueryUtil; -import com.matrix.system.hive.dao.SysSmsTemplateDao; -import com.matrix.system.hive.plugin.message.StringUtil; -import com.matrix.system.hive.plugin.util.CollectionUtils; -import org.springframework.stereotype.Controller; +import com.matrix.core.anotations.SaveRequestToken; +import com.matrix.core.constance.MatrixConstance; +import com.matrix.core.constance.SystemErrorCode; +import com.matrix.core.constance.SystemMessageCode; import com.matrix.core.exception.GlobleException; +import com.matrix.core.pojo.AjaxResult; +import com.matrix.core.pojo.PaginationVO; +import com.matrix.core.tools.ModelUtils; +import com.matrix.core.tools.SmsUtils; +import com.matrix.core.tools.StringUtils; +import com.matrix.core.tools.WebUtil; +import com.matrix.system.common.bean.SysUsers; +import com.matrix.system.hive.bean.SysSmsTemplate; +import com.matrix.system.hive.dao.SysSmsTemplateDao; +import com.matrix.system.hive.hievEnum.SmsPlatformEnum; +import com.matrix.system.hive.plugin.util.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.matrix.core.anotations.SaveRequestToken; -import com.matrix.core.pojo.AjaxResult; -import org.springframework.beans.factory.annotation.Autowired; -import com.matrix.system.hive.bean.SysSmsTemplate; import org.springframework.web.servlet.ModelAndView; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -94,12 +95,16 @@ SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); sysSmsTemplate.setCompanyId(users.getCompanyId()); sysSmsTemplate.setStTemplate(sysSmsTemplate.getStTemplate() + "回T退订"); - String code = smsUtils.addSmsTemplate(SysSmsTemplate.SMS_TYPE_PROMOTE, sysSmsTemplate.getStName(), sysSmsTemplate.getStTemplate(), sysSmsTemplate.getStRemark()); + String code=""; + //调用阿里云接口添加阿里云短信模板,todo 如果有其他短信供应商在继续加 + if(SmsPlatformEnum.ALIBABA.getValue().equals(sysSmsTemplate.getSmsType())){ + code=smsUtils.addAliyunSmsTemplate(sysSmsTemplate.getSmsType(), sysSmsTemplate.getStName(), sysSmsTemplate.getStTemplate(), sysSmsTemplate.getStRemark()); + } sysSmsTemplate.setStCode(code); sysSmsTemplate.setStStatus(SysSmsTemplate.SMS_STATUS_DOING); int i = sysSmsTemplateDao.insert(sysSmsTemplate); if (i > 0) { - return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, "短信模板表"); + return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, "短信模板"); } else { throw new GlobleException(SystemErrorCode.DATA_ADD_FAIL); } -- Gitblit v1.9.1