群成员增加加入时间字段
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
alter table t_group_member add column `_create_dt` bigint(20) DEFAULT 0;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
alter table t_group_member add column `_create_dt` bigint(20) DEFAULT 0, COMMENT "group member create time";
|
||||||
@@ -331,7 +331,7 @@ public class DatabaseStore {
|
|||||||
String sql = "select `_mid`" +
|
String sql = "select `_mid`" +
|
||||||
", `_alias`" +
|
", `_alias`" +
|
||||||
", `_type`" +
|
", `_type`" +
|
||||||
", `_dt` from t_group_member where _gid = ?";
|
", `_dt`, `_create_dt` from t_group_member where _gid = ?";
|
||||||
statement = connection.prepareStatement(sql);
|
statement = connection.prepareStatement(sql);
|
||||||
|
|
||||||
statement.setString(1, groupId);
|
statement.setString(1, groupId);
|
||||||
@@ -358,6 +358,9 @@ public class DatabaseStore {
|
|||||||
long longValue = rs.getLong(index++);
|
long longValue = rs.getLong(index++);
|
||||||
builder.setUpdateDt(longValue);
|
builder.setUpdateDt(longValue);
|
||||||
|
|
||||||
|
longValue = rs.getLong(index++);
|
||||||
|
builder.setCreateDt(longValue);
|
||||||
|
|
||||||
WFCMessage.GroupMember member = builder.build();
|
WFCMessage.GroupMember member = builder.build();
|
||||||
groupMembers.put(groupId, member);
|
groupMembers.put(groupId, member);
|
||||||
}
|
}
|
||||||
@@ -1652,7 +1655,7 @@ public class DatabaseStore {
|
|||||||
", `_mid`" +
|
", `_mid`" +
|
||||||
", `_alias`" +
|
", `_alias`" +
|
||||||
", `_type`" +
|
", `_type`" +
|
||||||
", `_dt`) values(?, ?, ?, ?, ?)" +
|
", `_dt`, `_create_dt`) values(?, ?, ?, ?, ?, ?)" +
|
||||||
" ON DUPLICATE KEY UPDATE " +
|
" ON DUPLICATE KEY UPDATE " +
|
||||||
"`_alias` = ?," +
|
"`_alias` = ?," +
|
||||||
"`_type` = ?," +
|
"`_type` = ?," +
|
||||||
@@ -1673,6 +1676,7 @@ public class DatabaseStore {
|
|||||||
statement.setString(index++, member.getAlias());
|
statement.setString(index++, member.getAlias());
|
||||||
statement.setInt(index++, member.getType());
|
statement.setInt(index++, member.getType());
|
||||||
statement.setLong(index++, dt);
|
statement.setLong(index++, dt);
|
||||||
|
statement.setLong(index++, member.getCreateDt());
|
||||||
statement.setString(index++, member.getAlias());
|
statement.setString(index++, member.getAlias());
|
||||||
statement.setInt(index++, member.getType());
|
statement.setInt(index++, member.getType());
|
||||||
statement.setLong(index++, dt);
|
statement.setLong(index++, dt);
|
||||||
|
|||||||
@@ -781,9 +781,9 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
|
List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
|
||||||
for (WFCMessage.GroupMember member : memberList) {
|
for (WFCMessage.GroupMember member : memberList) {
|
||||||
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
||||||
member = member.toBuilder().setUpdateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
|
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
|
||||||
} else {
|
} else {
|
||||||
member = member.toBuilder().setUpdateDt(dt).build();
|
member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
|
||||||
}
|
}
|
||||||
groupMembers.put(groupId, member);
|
groupMembers.put(groupId, member);
|
||||||
updatedMemberList.add(member);
|
updatedMemberList.add(member);
|
||||||
@@ -843,9 +843,9 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
ArrayList<String> newInviteUsers = new ArrayList<>();
|
ArrayList<String> newInviteUsers = new ArrayList<>();
|
||||||
for (WFCMessage.GroupMember member : memberList) {
|
for (WFCMessage.GroupMember member : memberList) {
|
||||||
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
if (member.getMemberId().equals(groupInfo.getOwner())) {
|
||||||
member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setAlias("").build();
|
member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setCreateDt(updateDt).setAlias("").build();
|
||||||
} else {
|
} else {
|
||||||
member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setAlias("").build();
|
member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setCreateDt(updateDt).setAlias("").build();
|
||||||
}
|
}
|
||||||
tmp.add(member);
|
tmp.add(member);
|
||||||
newInviteUsers.add(member.getMemberId());
|
newInviteUsers.add(member.getMemberId());
|
||||||
|
|||||||
Reference in New Issue
Block a user