增加删除用户任务，修改page查询逻辑

we-com-server/src/main/java/com/tzld/piaoquan/wecom/job/WeComHistoryDataJob.java

@@ -30,6 +30,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.tzld.piaoquan.wecom.common.constant.WeComConstant.GET_HISTORY_DATA_URL;
 
@@ -179,6 +181,25 @@ public class WeComHistoryDataJob {
                 + "&limit=" + limit + "&offset=" + offset + "&start_time=" + startTime + "&end_time=" + endTime;
         return httpPoolClientDefault.get(url);
     }
+
+
+    @XxlJob("saveHistoryMessageJob")
+    public ReturnT<String> deleteHistoryMessage(String param) {
+        UserExample userExample = new UserExample();
+        userExample.createCriteria().andIsDeleteEqualTo(1);
+        List<User> userList = userMapper.selectByExample(userExample);
+        for (User user : userList) {
+            HistoryMessageExample example = new HistoryMessageExample();
+            example.createCriteria().andUserIdEqualTo(user.getId());
+            List<HistoryMessage> historyMessages = historyMessageMapper.selectByExample(example);
+            for (HistoryMessage historyMessage : historyMessages) {
+                if (historyMessage.getSendTime().getTime() > user.getDeletedAt() * 1000) {
+                    historyMessageMapper.deleteByPrimaryKey(historyMessage.getId());
+                }
+            }
+        }
+        return ReturnT.SUCCESS;
+    }
 }
 
 

we-com-server/src/main/java/com/tzld/piaoquan/wecom/job/WeComMessageDataJob.java

@@ -131,6 +131,7 @@ public class WeComMessageDataJob {
             staffId = Long.parseLong(param);
         }
         UserExample example = new UserExample();
+        example.createCriteria().andIsDeleteEqualTo(0);
         long count = userMapper.countByExample(example);
         int page = 1;
         int pageSize = 1000;