|
@@ -217,15 +217,15 @@ public class SendMessageContorller {
|
|
|
@WithoutUserLogin
|
|
@WithoutUserLogin
|
|
|
@RoleLimit(pid = Const.SYSTEM_ROLE_LIMIT_PID, mid = Const.SYSTEM_ROLE_LIMIT_MID)
|
|
@RoleLimit(pid = Const.SYSTEM_ROLE_LIMIT_PID, mid = Const.SYSTEM_ROLE_LIMIT_MID)
|
|
|
@Transactional(value = "txManager")
|
|
@Transactional(value = "txManager")
|
|
|
- @RequestMapping(value = "sendSmsBySignId")
|
|
|
|
|
- public void sendSms(HttpServletRequest request, HttpServletResponse response) {
|
|
|
|
|
|
|
+ @RequestMapping(value = "sendTemplateSms")
|
|
|
|
|
+ public void sendTemplateSms(HttpServletRequest request, HttpServletResponse response) {
|
|
|
JSONObject json = new JSONObject();
|
|
JSONObject json = new JSONObject();
|
|
|
try {
|
|
try {
|
|
|
request.setCharacterEncoding("utf-8");
|
|
request.setCharacterEncoding("utf-8");
|
|
|
- String smsUserPhoens = request.getParameter("phones");
|
|
|
|
|
|
|
+ String smsUserPhones = request.getParameter("phones");
|
|
|
String content = request.getParameter("contents");
|
|
String content = request.getParameter("contents");
|
|
|
- String signId = request.getParameter("signId");
|
|
|
|
|
- String res = SmsUtil.sendNewSmsPostBySignId(smsUserPhoens, content, signId);
|
|
|
|
|
|
|
+ String templateId = request.getParameter("templateId");
|
|
|
|
|
+ String res = SmsUtil.sendNewTemplateSmsSmsPost(smsUserPhones, content, templateId);
|
|
|
Map mapObj = JSON.parseObject(res, Map.class);
|
|
Map mapObj = JSON.parseObject(res, Map.class);
|
|
|
String msgNo = mapObj.get("msg_no").toString();
|
|
String msgNo = mapObj.get("msg_no").toString();
|
|
|
Integer code = Integer.valueOf(mapObj.get("code").toString());
|
|
Integer code = Integer.valueOf(mapObj.get("code").toString());
|
|
@@ -233,7 +233,7 @@ public class SendMessageContorller {
|
|
|
SmsRecord smsRecord = new SmsRecord();
|
|
SmsRecord smsRecord = new SmsRecord();
|
|
|
smsRecord.setContent(content);
|
|
smsRecord.setContent(content);
|
|
|
smsRecord.setCreateDate(new Date());
|
|
smsRecord.setCreateDate(new Date());
|
|
|
- smsRecord.setPhoens(smsUserPhoens);
|
|
|
|
|
|
|
+ smsRecord.setPhoens(smsUserPhones);
|
|
|
smsRecord.setMsgid(msgNo);
|
|
smsRecord.setMsgid(msgNo);
|
|
|
smsRecordService.insertSelective(smsRecord);
|
|
smsRecordService.insertSelective(smsRecord);
|
|
|
if (code == 0) {// 提交供应商成功,查询发送是否成功
|
|
if (code == 0) {// 提交供应商成功,查询发送是否成功
|