Commit 479efe2d authored by xinglei's avatar xinglei

*)增加消息展示字段

parent 53a10a5f
...@@ -27,11 +27,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -27,11 +27,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.context.RequestContextModel; import org.typroject.tyboot.core.foundation.context.RequestContextModel;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.util.Date; import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -167,8 +163,8 @@ public class AsyncTask { ...@@ -167,8 +163,8 @@ public class AsyncTask {
RequestContext.setProduct(requestContextModel.getProduct()); RequestContext.setProduct(requestContextModel.getProduct());
RequestContext.setAppKey(requestContextModel.getAppKey()); RequestContext.setAppKey(requestContextModel.getAppKey());
MessageModel model = new MessageModel(); MessageModel model = new MessageModel();
String body = String.format("隐患名称:%s;隐患级别:%s;治理方式:%s;推送时间:%s", String body = String.format("隐患名称:%s;隐患级别:%s;治理方式:%s;当前状态:%s;推送时间:%s",
latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), DateUtil.date2LongStr(new Date())); latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), latentDanger.getDangerStateName(), DateUtil.date2LongStr(new Date()));
model.setBody(body); model.setBody(body);
getMessageModel(model, latentDanger); getMessageModel(model, latentDanger);
try { try {
...@@ -193,8 +189,8 @@ public class AsyncTask { ...@@ -193,8 +189,8 @@ public class AsyncTask {
RequestContext.setProduct(requestContextModel.getProduct()); RequestContext.setProduct(requestContextModel.getProduct());
RequestContext.setAppKey(requestContextModel.getAppKey()); RequestContext.setAppKey(requestContextModel.getAppKey());
MessageModel model = new MessageModel(); MessageModel model = new MessageModel();
String body = String.format("隐患名称:%s;隐患级别:%s;治理方式:%s;推送时间:%s", String body = String.format("隐患名称:%s;隐患级别:%s;治理方式:%s;当前状态:%s;推送时间:%s",
latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), DateUtil.date2LongStr(new Date())); latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), latentDanger.getDangerStateName(), DateUtil.date2LongStr(new Date()));
model.setBody(body); model.setBody(body);
model.setIsSendWeb(true); model.setIsSendWeb(true);
model.setRecivers(userIds); model.setRecivers(userIds);
...@@ -219,7 +215,9 @@ public class AsyncTask { ...@@ -219,7 +215,9 @@ public class AsyncTask {
} }
} }
if (!ValidationUtil.isEmpty(type)){ if (!ValidationUtil.isEmpty(type)){
model.getExtras().put("type", type); Map<String, String> map = new HashMap<>();
map.put("type", type);
model.setExtras(map);
} }
model.setTitle(latentDanger.getDangerName()); model.setTitle(latentDanger.getDangerName());
model.setIsSendApp(true); model.setIsSendApp(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment