diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index 0dcf5c5..8918d39 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -184,6 +184,9 @@ public class MessageClient extends BladeController implements IMessageClient{ record.setMessageId(IdWorker.getId()); for (Long pushId : Func.toLongList(",", smsImmediatelyPushDTO.getPusher())) { User user = UserCache.getUser(pushId); + if (ObjectUtil.isEmpty(user)||ObjectUtil.isEmpty(user.getPhone())){ + continue; + } record.setPusherName(user.getName()); record.setPusher(pushId.toString()); record.setPushType(MessageConstants.IMMEDIATELY); @@ -195,14 +198,13 @@ public class MessageClient extends BladeController implements IMessageClient{ record.setStatus(MessageConstants.NOT_PUSH); Map params = smsImmediatelyPushDTO.getParams(); int maxSize=35; - params.put("ruleDefName",getTruncateString(params.get("ruleDefName"), maxSize)); - params.put("projectName",getTruncateString(params.get("projectName"), maxSize)); - params.put("deviceName",getTruncateString(params.get("deviceName"), maxSize)); + for (Map.Entry stringStringEntry : params.entrySet()) { + params.put(stringStringEntry.getKey(),getTruncateString(stringStringEntry.getValue(), maxSize)); + } record.setSmsParam(JSON.toJSONString(params)); Boolean flag = recordService.sendSmsImmediatelyMsg(record); if (!flag) { log.error("短信推送失败,参数:" + record.toString()); - return R.data(false); } } return R.data(true);