|
|
@@ -164,9 +164,11 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
// return;
|
|
|
}
|
|
|
String str = String.valueOf(Finance.GetContentFromSlice(msg));
|
|
|
+ System.out.println("getwep="+str);
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(str);
|
|
|
String msgtype = jsonObject.getString("msgtype");
|
|
|
InputChatMsg chatMsg = new InputChatMsg(jsonObject);
|
|
|
+ System.out.println(chatMsg.getMsgtime());
|
|
|
if (chatMsg.getMsgtime().getTime()>date.getTime()){
|
|
|
//处理数据
|
|
|
ChatMsgOptimize chatMsgOptimize = chatMsgOptimizeMapper.selectById(chatMsg.getMsgid());
|
|
|
@@ -194,7 +196,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
}
|
|
|
|
|
|
private void pushSmgType(String msgtype, com.alibaba.fastjson.JSONObject jsonObject, long sdk, InputChatMsg chatMsg) {
|
|
|
- if (msgtype.equals("text"))
|
|
|
+ if (msgtype!=null&&msgtype.equals("text"))
|
|
|
{
|
|
|
//文档
|
|
|
com.alibaba.fastjson.JSONObject text = jsonObject.getJSONObject("text");
|
|
|
@@ -252,7 +254,10 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
String url=pushFileUrl(sdk, msgtype, jsonObject);
|
|
|
chatMsg.setMsgurl(url);
|
|
|
} else {
|
|
|
- chatMsg.setContent(pushCharset(jsonObject.toJSONString()));
|
|
|
+ if (!jsonObject.getString("action").equals("switch")&&!jsonObject.getString("action").equals("recall")) {
|
|
|
+ chatMsg.setContent(jsonObject.toJSONString());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|