Merge branch 'feature/0803-im' of E:\cooleshow\code with conflicts.

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -2,6 +2,9 @@ package com.yonge.cooleshow.admin.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.tencentyun.TLSSigAPIv2;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
@@ -12,6 +15,8 @@ import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.redis.service.RedisCache;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.http.HttpUtil;
 import com.yonge.toolset.utils.validator.ValidationKit;
@@ -33,6 +38,7 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -142,13 +148,19 @@ public class ImGroupController extends BaseController {
     @ApiOperation("IM导入消息")
     @PostMapping(value = "/ImportIM")
     public void ImportIM() throws Exception {
-
-        //获取融云消息
-        List<ImHistoryMessage> info = imGroupService.getRongYunInfo();
-
-        imGroupService.importInfo(info);
-
-
+        List<ImHistoryMessage> info;
+        //计算总数据量
+        double count = imGroupService.queryCount();
+        //计算调用次数
+        int num = (int) Math.ceil(count / 100);
+        for (int i = 1; i <=num ; i++) {
+            int page =i;
+            int size =100;
+            //获取融云消息
+            //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+            info = imGroupService.getRongYunInfo(page,size);
+            imGroupService.importInfo(info);
+        }
     }
 
     @GetMapping(value = "/groupTransfer")

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/tets.java

@@ -0,0 +1,69 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.toolset.utils.date.DateUtil;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @Author：haonan
+ * @Date：2023/8/7 19:24
+ * @Filename：tets
+ */
+public class tets {
+    public static void main(String[] args) throws ParseException {
+        double count = 201;
+
+        int num = (int) Math.ceil(count / 100);
+        System.out.println(num);
+
+
+        String a = "7:student";
+        if (a.contains(":student")){
+            String[] split = a.split(":");
+            String s = split[0];
+            String b = split[1];
+            System.out.println(s);
+            System.out.println(b);
+            System.out.println("yes");
+        }
+        System.out.println("no");
+
+
+
+        // 获取当前日期
+        //Date currentDate = new Date();
+         String date ="2023080810";
+
+        //date = DateUtil.format(DateUtil.stringToDate(date), DateUtil.YEAR_MONTH_DAY_HOUR);
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH");
+        Date date1 = format.parse(date);
+        String d = DateUtil.format(DateUtil.addHours(date1,0), DateUtil.YEAR_MONTH_DAY_HOUR);
+        System.out.println(d);
+        // 创建Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date1);
+
+        // 将日期减少一个月
+        calendar.add(Calendar.DATE, -1);
+
+        // 获取减少一个月后的日期
+        Date lastMonthDate = calendar.getTime();
+        calendar.setTime(date1);
+        System.out.println(date1);
+        System.out.println(lastMonthDate);
+        while (date1.after(lastMonthDate)){
+            //currentDate = calendar.getTime();
+            calendar.add(Calendar.HOUR,-1);
+            date1 = calendar.getTime();
+            System.out.println(date1);
+
+            System.out.println(date1);
+
+            //System.out.println(DateUtil.format(DateUtil.addHours(new Date(),-2), DateUtil.YEAR_MONTH_DAY_HOUR));
+        }
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImGroupDao.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupResultDto;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
@@ -30,7 +31,8 @@ public interface ImGroupDao extends BaseMapper<ImGroup> {
     void batchInsert(@Param("list") List<ImHistoryMessage> historyMessages);
 
     //获取融云数据
-    List<ImHistoryMessage> selectAll();
+    List<ImHistoryMessage> selectAll(@Param("result") int result, @Param("size") int size);
 
+    int queryCount();
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImGroupService.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.yonge.cooleshow.biz.dal.dao.ImGroupDao;
@@ -143,10 +144,15 @@ public interface ImGroupService extends IService<ImGroup> {
      */
     void saveImHistoryMessage(File file);
 
+    @Override
+    default IPage<ImGroup> page(IPage<ImGroup> page) {
+        return null;
+    }
+
     /**
      * 读取融云数据库信息
      */
-    List<ImHistoryMessage> getRongYunInfo();
+    List<ImHistoryMessage> getRongYunInfo(int page,int size);
 
     /**
      * 导入IM腾讯云
@@ -164,5 +170,7 @@ public interface ImGroupService extends IService<ImGroup> {
      * 用户导入
      */
     void importUser();
+
+    int queryCount();
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -656,9 +656,10 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     }
 
     @Override
-    public List<ImHistoryMessage> getRongYunInfo() {
-        List<ImHistoryMessage> list = getDao().selectAll();
-        return list;
+    public List<ImHistoryMessage> getRongYunInfo( int page, int size) {
+        int result = (page-1)*size;
+        List<ImHistoryMessage> imHistoryMessageslist = getDao().selectAll(result,size);
+        return imHistoryMessageslist;
     }
 
     /**
@@ -848,6 +849,11 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         groupTransfer(Collections.singletonList(byId));
     }
 
+    @Override
+    public int queryCount() {
+        return getDao().queryCount();
+    }
+
     private void groupTransfer(List<ImGroup> records) {
         String fansIcon = sysConfigService.findConfigValue(SysConfigConstant.ICON_FANS_GROUP_DEFAULT);
         String courseIcon = sysConfigService.findConfigValue(SysConfigConstant.ICON_COURSE_GROUP_DEFAULT);

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -128,6 +128,10 @@
                appId_           AS appId
 
         from im_history_message
+        limit #{result},#{size}
 
     </select>
+    <select id="queryCount" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM im_history_message
+    </select>
 </mapper>