diff --git a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java index 422feea..d213b5e 100644 --- a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java @@ -128,14 +128,10 @@ public class AppMessageController { messageInfo.setTitle("通知上线"); messageInfo.setByUserName(userEntity.getUserName()); messageInfo.setUserName(artificer.getArtificerName()); - messageService.saveBody(messageInfo); - - + messageService.insertUpMessage(messageInfo); if (StringUtils.isNotEmpty(artificerUser.getPhone())) { userService.sendMsg(artificerUser.getPhone(), "qtsx"); } - - return Result.success(); } diff --git a/src/main/java/com/sqx/modules/message/service/MessageService.java b/src/main/java/com/sqx/modules/message/service/MessageService.java index 2633e29..c2b7005 100644 --- a/src/main/java/com/sqx/modules/message/service/MessageService.java +++ b/src/main/java/com/sqx/modules/message/service/MessageService.java @@ -22,6 +22,8 @@ public interface MessageService extends IService { int saveBody(MessageInfo messageInfo); + int insertUpMessage(MessageInfo messageInfo); + Result insertArtificerLocation(MessageInfo messageInfo); int update(MessageInfo messageInfo); diff --git a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java index d6053f0..bf5da5d 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java @@ -30,10 +30,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 消息 @@ -165,6 +162,30 @@ public class MessageServiceImpl extends return messageInfoDao.insert(messageInfo); } + @Override + public int insertUpMessage(MessageInfo messageInfo){ + messageInfo.setCreateAt(DateUtils.format(new Date())); + int returncount = messageInfoDao.insert(messageInfo); + if(returncount == 1) { + //技师电话通知业务 + //accountId + String accountId = commonInfoService.findOne(428).getValue(); + //token + String token = commonInfoService.findOne(429).getValue(); + //templateId 模板id + String templateId = commonInfoService.findOne(466).getValue(); + //呼救手机号 + Artificer artificer = artificerService.getById(Long.valueOf(messageInfo.getUserId())); + UserEntity byId = userService.getById(artificer.getUserId()); + //参数 + LinkedHashMap params = new LinkedHashMap(); + params.put("var1",messageInfo.getByUserName()); + //呼叫 + AppNotifyUtil.AppNotify(byId.getPhone(), accountId, token, templateId, params); + } + return returncount; + } + @Override public Result insertArtificerLocation(MessageInfo messageInfo){ messageInfo.setState("12"); diff --git a/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java b/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java index 0e6f106..17b9dac 100644 --- a/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java +++ b/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java @@ -31,4 +31,27 @@ public class AppNotifyUtil { } return Result.error("系统错误,请联系管理员。"); } + + public static Result AppNotify(String calleeNumber, String accountId, String token, String templateId, LinkedHashMap params) { + VoiceNotifyBody message = new VoiceNotifyBody(); + /*用户接收回执的服务器地址*/ + message.setCallbackUrl(""); + message.setCalleeNumber(calleeNumber); + message.setReplayTimes(1); + /*设置平台分配的模板ID*/ + message.setTemplateId(templateId); + if(params == null){ + params = new LinkedHashMap(); + } + message.setTemplateArgs(params); + try { + VoiceResponseResult result1 = VoiceSender.httpsSendVoiceNotify(message, accountId, token); + System.out.println("result = " + result1); + return Result.success().put("data",result1); + }catch (Exception e) { + //Log.e(this.getClass(), " e = " + e); + e.printStackTrace(); + } + return Result.error("系统错误,请联系管理员。"); + } }