退出群组时，删掉群相关用户设置

heavyrain2012 · heavyrain2012 · commit bf70a1e80e7a · 2019-08-06T22:55:41.000+08:00
diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -911,6 +911,40 @@ List<WFCMessage.UserSettingEntry> getPersistUserSetting(final String userId) {
     }
 
 
+    void removeGroupUserSettings(String groupId, List<String> users) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            StringBuilder sb = new StringBuilder("delete t_user_setting where _scope in (1,3,5,7) and _uid in (");
+            for (int i = 0; i < users.size(); i++) {
+                sb.append("?");
+                if (i != users.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(") and _key like '1-_-?'");
+
+
+            statement = connection.prepareStatement(sb.toString());
+            int index = 1;
+            for (String userId:users) {
+                statement.setString(index++, userId);
+            }
+            statement.setString(index++, groupId);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     void persistGroupInfo(final WFCMessage.GroupInfo groupInfo) {
         mScheduler.execute(()->{
             Connection connection = null;
diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -758,7 +758,7 @@ public ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String gr
         }
 
         removeFavGroup(groupId, removedIds);
-
+        removeGroupUserSettings(groupId, removedIds);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -827,9 +827,21 @@ public ErrorCode quitGroup(String operator, String groupId) {
         }
 
         removeFavGroup(groupId, Arrays.asList(operator));
+        removeGroupUserSettings(groupId, Arrays.asList(operator));
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    private void removeGroupUserSettings(String groupId, List<String> users) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
+
+        databaseStore.removeGroupUserSettings(groupId, users);
+        for (String userId:users) {
+            userSettingMap.remove(userId);
+        }
+
+    }
+
     @Override
     public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -869,6 +881,7 @@ public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin)
             }
         }
         removeFavGroup(groupId, ids);
+        removeGroupUserSettings(groupId, ids);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
     }

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ public ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String gr`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`removeFavGroup(groupId, removedIds);`
`761`		`-`
	`761`	`+ removeGroupUserSettings(groupId, removedIds);`
`762`	`762`	`return ErrorCode.ERROR_CODE_SUCCESS;`
`763`	`763`	`}`
`764`	`764`
`@@ -827,9 +827,21 @@ public ErrorCode quitGroup(String operator, String groupId) {`
`827`	`827`	`}`
`828`	`828`
`829`	`829`	`removeFavGroup(groupId, Arrays.asList(operator));`
	`830`	`+ removeGroupUserSettings(groupId, Arrays.asList(operator));`
`830`	`831`	`return ErrorCode.ERROR_CODE_SUCCESS;`
`831`	`832`	`}`
`832`	`833`
	`834`	`+ private void removeGroupUserSettings(String groupId, List<String> users) {`
	`835`	`+ HazelcastInstance hzInstance = m_Server.getHazelcastInstance();`
	`836`	`+ MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);`
	`837`	`+`
	`838`	`+ databaseStore.removeGroupUserSettings(groupId, users);`
	`839`	`+ for (String userId:users) {`
	`840`	`+ userSettingMap.remove(userId);`
	`841`	`+ }`
	`842`	`+`
	`843`	`+ }`
	`844`	`+`
`833`	`845`	`@Override`
`834`	`846`	`public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin) {`
`835`	`847`	`HazelcastInstance hzInstance = m_Server.getHazelcastInstance();`
`@@ -869,6 +881,7 @@ public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin)`
`869`	`881`	`}`
`870`	`882`	`}`
`871`	`883`	`removeFavGroup(groupId, ids);`
	`884`	`+ removeGroupUserSettings(groupId, ids);`
`872`	`885`
`873`	`886`	`return ErrorCode.ERROR_CODE_SUCCESS;`
`874`	`887`	`}`