|
|
@@ -151,12 +151,10 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
String str = String.valueOf(Finance.GetContentFromSlice(msg));
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(str);
|
|
|
String msgtype = jsonObject.getString("msgtype");
|
|
|
+ Date earlyToday = DateUtils.getEarlyToday();
|
|
|
+ Date date = DateUtils.getDateBefore(earlyToday, -1);
|
|
|
InputChatMsg chatMsg = new InputChatMsg(jsonObject);
|
|
|
- //获取五天前的时间
|
|
|
- Date date = DateUtils.getDateBefore(new Date(), 5);
|
|
|
- System.out.println(DateUtils.formatDate(date, "yyyy-MM-dd HH:mm:ss"));
|
|
|
- ChatMsg chatMsg1 = chatMsgMapper.selectByMsgId(chatMsg.getMsgid(),date);
|
|
|
- if (chatMsg1 == null){
|
|
|
+ if (chatMsg.getMsgtime().getTime()>date.getTime()){
|
|
|
//处理数据
|
|
|
pushSmgType(msgtype, jsonObject, sdk, chatMsg);
|
|
|
list.add(chatMsg);
|
|
|
@@ -451,18 +449,22 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
if(o!=null){
|
|
|
userName = o.toString();
|
|
|
}
|
|
|
- i= (Integer) maps.get("code");
|
|
|
- System.out.println(userId+"="+userName);
|
|
|
+ map.put ("code", maps.get("code"));
|
|
|
+ chatMsgUser = new ChatMsgUser();
|
|
|
+ chatMsgUser.setUserId(userId);
|
|
|
+ chatMsgUser.setType(type);
|
|
|
+ chatMsgUser.setCreateTime(new Date());
|
|
|
if (StringUtils.isNotBlank(userName)){
|
|
|
- chatMsgUser = new ChatMsgUser();
|
|
|
- chatMsgUser.setUserId(userId);
|
|
|
chatMsgUser.setName(userName);
|
|
|
- chatMsgUser.setType(type);
|
|
|
- chatMsgUser.setCreateTime(new Date());
|
|
|
- chatMsgUserMapper.insert(chatMsgUser);
|
|
|
+ map.put("name",userName);
|
|
|
+ }
|
|
|
+ chatMsgUserMapper.insert(chatMsgUser);
|
|
|
+ if (StringUtils.isBlank(userName)){
|
|
|
+ String str = "未知(" + chatMsgUser.getId() + ")";
|
|
|
+ chatMsgUser.setName(str);
|
|
|
+ map.put("name",str);
|
|
|
+ chatMsgUserMapper.update(chatMsgUser);
|
|
|
}
|
|
|
- map.put("name",userName);
|
|
|
- map.put("code",i);
|
|
|
return map;
|
|
|
}
|
|
|
}
|
|
|
@@ -483,6 +485,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
if (chatMsgUser != null){
|
|
|
return chatMsgUser.getName();
|
|
|
}else {
|
|
|
+ String roomname=null;
|
|
|
//查询编号中有没有external
|
|
|
String msgIdSub = chatMsg.getMsgid();
|
|
|
int i = msgIdSub.indexOf("external");
|
|
|
@@ -492,7 +495,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
map.put("chat_id",roomid);
|
|
|
map.put("cursor",0);
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = HttpUtils.httpPost(url, map);
|
|
|
- String roomname = jsonObject.getString("roomname");
|
|
|
+ roomname = jsonObject.getString("roomname");
|
|
|
if (StringUtils.isBlank(roomname)){
|
|
|
com.alibaba.fastjson.JSONObject groupChat = jsonObject.getJSONObject("group_chat");
|
|
|
if (groupChat!=null){
|
|
|
@@ -512,10 +515,10 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
map.put("roomid",roomid);
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = HttpUtils.httpPost(url, map);
|
|
|
System.out.println(jsonObject.toJSONString());
|
|
|
- String roomname = jsonObject.getString("roomname");
|
|
|
+ roomname = jsonObject.getString("roomname");
|
|
|
if (StringUtils.isBlank(roomname)){
|
|
|
com.alibaba.fastjson.JSONObject groupChat = jsonObject.getJSONObject("group_chat");
|
|
|
- name = groupChat.getString("name");
|
|
|
+ roomname = groupChat.getString("name");
|
|
|
}
|
|
|
if (jsonObject.getInteger("errcode")==0){
|
|
|
}else {
|
|
|
@@ -523,7 +526,16 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ chatMsgUser = new ChatMsgUser();
|
|
|
+ chatMsgUser.setUserId(roomid);
|
|
|
+ chatMsgUser.setType(3);
|
|
|
+ chatMsgUser.setCreateTime(new Date());
|
|
|
+ if (StringUtils.isNotBlank(roomname)){
|
|
|
+ chatMsgUser.setName(roomname);
|
|
|
+ }
|
|
|
+ chatMsgUserMapper.insert(chatMsgUser);
|
|
|
+ chatMsgUser.setName("未知群("+chatMsgUser.getId()+")");
|
|
|
+ chatMsgUserMapper.update(chatMsgUser);
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -616,17 +628,15 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
|
|
|
private Map<String,Object> getUserName(String url,Integer type){
|
|
|
String name = null;
|
|
|
- Integer code=null;
|
|
|
+ Integer code=0;
|
|
|
Map<String,Object> map=new HashMap<String, Object>();
|
|
|
if (type==0) {
|
|
|
name="机器人";
|
|
|
- code=0;
|
|
|
}else if (type==1){
|
|
|
com.alibaba.fastjson.JSONObject result = HttpUtils.httpGet(url);
|
|
|
if (result.getInteger("errcode")==0) {
|
|
|
System.out.println(result.toJSONString());
|
|
|
com.alibaba.fastjson.JSONObject externalContact = result.getJSONObject("external_contact");
|
|
|
- code = result.getInteger("errcode");
|
|
|
name=externalContact.getString("name");
|
|
|
}else {
|
|
|
code = result.getInteger("errcode");
|
|
|
@@ -638,17 +648,15 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
if (result.getInteger("errcode")==0) {
|
|
|
System.out.println(result.toJSONString());
|
|
|
com.alibaba.fastjson.JSONObject externalContact = result.getJSONObject("external_contact");
|
|
|
- code = result.getInteger("errcode");
|
|
|
name = result.getString("name");
|
|
|
}else {
|
|
|
System.out.println(result.toJSONString());
|
|
|
- System.out.println("获取内部联系人名称失败");
|
|
|
code = result.getInteger("errcode");
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if(name!=null)map.put("name",name);
|
|
|
- if (code!=null)map.put("code",code);
|
|
|
+ map.put("name",name);
|
|
|
+ map.put("code",code);
|
|
|
return map;
|
|
|
}
|
|
|
|