Merge branch 'feature/0803-im'

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

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.admin.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.tencentyun.TLSSigAPIv2;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.entity.ImHistoryMessage;
@@ -13,7 +12,6 @@ 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.utils.date.DateUtil;
-import com.yonge.toolset.utils.http.HttpUtil;
 import com.yonge.toolset.utils.validator.ValidationKit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +27,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -142,13 +138,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-biz/pom.xml

@@ -124,6 +124,12 @@
             <version>1.0.0</version>
         </dependency>
 
+
+        <!--修复依赖冲突-->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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/entity/LiveRoom.java

@@ -46,7 +46,7 @@ public class LiveRoom implements Serializable {
 
     @TableField("service_provider_")
     @ApiModelProperty(value = "服务提供方")
-    private String serviceProvider;
+    private String serviceProvider= "tencentCloud";
 
     @TableField("video_record_")
     @ApiModelProperty(value = "录制记录")

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;
@@ -151,11 +152,12 @@ public interface ImGroupService extends IService<ImGroup> {
      * @param file
      */
     void saveImHistoryMessage(File file);
+    
 
     /**
      * 读取融云数据库信息
      */
-    List<ImHistoryMessage> getRongYunInfo();
+    List<ImHistoryMessage> getRongYunInfo(int page,int size);
 
     /**
      * 导入IM腾讯云
@@ -173,5 +175,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

@@ -706,9 +706,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;
     }
 
     /**
@@ -898,6 +899,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/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomServiceImpl.java

@@ -423,7 +423,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 setDefaultRoomDefinedInfo(room);
             }
         } catch (Exception e) {
-            throw new BizException("创建直播间失败!", e.getCause());
+            throw new BizException("创建直播间失败!", e);
         }
     }
 

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>

pom.xml

@@ -227,6 +227,14 @@
 				<version>5.1.1</version>
 			</dependency>
 
+
+            <!--修复依赖冲突-->
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>1.3.70</version>
+            </dependency>
+
 		</dependencies>
 	</dependencyManagement>