|
|
@ -114,9 +114,9 @@ public class MessagePushSchedule { |
|
|
|
} |
|
|
|
} |
|
|
|
else if(MessageConstants.SMS_PUSH.equals(type)) { |
|
|
|
else if(MessageConstants.SMS_PUSH.equals(type)) { |
|
|
|
Map<String,String> params = new HashMap<>(); |
|
|
|
Map<String,String> params = new HashMap<>(); |
|
|
|
list.stream().map(MessagePushRecordEntity::getContent).forEachOrdered(record -> { |
|
|
|
list.stream().map(MessagePushRecordEntity::getSmsParam).forEachOrdered(param -> { |
|
|
|
JSONObject param = JSONObject.parseObject(record); |
|
|
|
JSONObject paramJson = JSONObject.parseObject(param); |
|
|
|
param.forEach((k,v) -> { |
|
|
|
paramJson.forEach((k,v) -> { |
|
|
|
params.put(k, params.containsKey(k) && Func.isNotEmpty(params.get(k)) ? params.get(k) + "," + v : (String) v); |
|
|
|
params.put(k, params.containsKey(k) && Func.isNotEmpty(params.get(k)) ? params.get(k) + "," + v : (String) v); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|