From 1bbb94e533d60b11687316eec2413be2d385ed5b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Dec 2021 16:11:03 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/SysSmsTemplateAction.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 e9a313e..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;
@@ -56,7 +57,6 @@
}
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
sysSmsTemplate.setCompanyId(users.getCompanyId());
- QueryUtil.setQueryLimitCom(sysSmsTemplate);
List<SysSmsTemplate> dataList = sysSmsTemplateDao.selectInPage(sysSmsTemplate, pageVo);
if (CollectionUtils.isNotEmpty(dataList)) {
@@ -95,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