Merge remote-tracking branch 'origin/develop' into develop

health-im/health-im-biz/src/main/java/com/renkang/im/common/TencentCloudImConstant.java

@@ -99,4 +99,7 @@ public interface TencentCloudImConstant {
     String AP_SHANGHAI_TC_RAW = "https://cos.ap-shanghai.tencentcos.cn";
     String AP_SHANGHAI_TC_RP = "http://101.201.149.156:8609/tc";
 
+    String CN_RICH_ROW = "https://1600084494-cn.rich.my-imcloud.com";
+    String CN_RICH_RP = "http://101.201.149.156:8610/imdata";
+
 }

health-im/health-im-biz/src/main/java/com/renkang/im/controller/TxImMessageConTroller.java

@@ -46,9 +46,23 @@ public class TxImMessageConTroller {
     }
 
     @GetMapping("/syncImMessage")
+    @Operation(summary = "同步IM消息")
     public Result<Void> test(String groupId) {
         imService.syncGroupHistory(groupId);
         return Result.ok();
     }
 
+    /**
+     * 同步IM消息（数据修复）
+     *
+     * @param groupIds（修复消息的群组id（多个用,隔开，不传则修复所有数据））
+     * @return
+     */
+    @GetMapping("/syncImMessageRepairData")
+    @Operation(summary = "同步IM消息（数据修复）")
+    public Result<Void> syncImMessageRepairData(String groupIds) {
+        imService.syncImMessageRepairData(groupIds);
+        return Result.ok();
+    }
+
 }

health-im/health-im-biz/src/main/java/com/renkang/im/service/ImService.java

@@ -46,4 +46,6 @@ public interface ImService {
     Page<ImGroupSyncRecord> listGroupSyncRecord(GroupSyncFilter filter);
 
 
+    void syncImMessageRepairData(String groupIds);
+
 }

health-im/health-im-biz/src/main/java/com/renkang/im/service/impl/ImServiceImpl.java

@@ -1,11 +1,13 @@
 package com.renkang.im.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.renkang.consultation.api.ConSessionHelloApi;
@@ -38,6 +40,7 @@ import java.net.URISyntaxException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
+import java.util.stream.Collectors;
 
 import static com.renkang.im.common.TencentCloudImConstant.*;
 
@@ -347,6 +350,9 @@ public class ImServiceImpl implements ImService {
     }
 
     private String handleFile(String url) {
+        if (!url.startsWith("http")) {
+            return url;
+        }
         byte[] fileBytes;
         String fileName = UUID.randomUUID().toString();
         try {
@@ -386,6 +392,9 @@ public class ImServiceImpl implements ImService {
         if (url.startsWith(AP_SHANGHAI_TC_RAW)) {
             return url.replace(AP_SHANGHAI_TC_RAW, AP_SHANGHAI_TC_RP);
         }
+        if (url.startsWith(CN_RICH_ROW)) {
+            return url.replace(CN_RICH_ROW, CN_RICH_RP);
+        }
         return url;
     }
 
@@ -466,4 +475,72 @@ public class ImServiceImpl implements ImService {
         LambdaQueryWrapper<ImGroupSyncRecord> wrapper = WrapperUtils.initLambdaWrapper(filter);
         return imGroupSyncRecordMapper.selectPage(filter.getPage(), wrapper);
     }
+
+    /**
+     * description: 修复IM消息数据
+     *
+     * @date: 2025/11/27 16:27
+     * @Param groupIds:  [java.lang.String]
+     */
+    @Override
+    public void syncImMessageRepairData(String groupIds) {
+        List<String> groupIdArray = new ArrayList<>();
+        if (StrUtil.isNotBlank(groupIds)) {
+            groupIdArray = Arrays.stream(groupIds.split(",")).collect(Collectors.toList());
+        }
+        List<ImMsgRecordAll> imMsgRecordAlls = imMsgRecordAllMapper.selectList(new LambdaQueryWrapper<ImMsgRecordAll>()
+                .in(!groupIdArray.isEmpty(), ImMsgRecordAll::getGroupid, groupIdArray)
+        );
+        asyncTaskExecutor.submit(() -> {
+            int index = 0;
+            for (ImMsgRecordAll imMsgRecordAll : imMsgRecordAlls) {
+                index++;
+                try {
+                    String contentType = imMsgRecordAll.getContenttype();
+                    String content = imMsgRecordAll.getMsgcontent();
+                    if (StrUtil.isEmpty(contentType) || StrUtil.isEmpty(content)) {
+                        continue;
+                    }
+                    JSONObject jsonObject = JSON.parseObject(content);
+                    JSONArray msgBody = jsonObject.getJSONArray(MSG_BODY);
+                    boolean isRepair = false;
+                    for (int i = 0; i < msgBody.size(); i++) {
+                        JSONObject jsonObject1 = msgBody.getJSONObject(i);
+                        JSONObject msgContent = jsonObject1.getJSONObject(MSG_CONTENT);
+                        switch (contentType) {
+                            case TIM_IMAGE_ELEM:
+                                handleImageElem(msgContent);
+                                isRepair = true;
+                                break;
+                            case TIM_VIDEO_FILE_ELEM:
+                                handleVideoFileElem(msgContent);
+                                isRepair = true;
+                                break;
+                            case TIM_FILE_ELEM:
+                                handleFileElem(msgContent);
+                                isRepair = true;
+                                break;
+                            case TIM_SOUND_ELEM:
+                                handleSoundElem(msgContent);
+                                isRepair = true;
+                                break;
+                            default:
+                        }
+                    }
+                    if (isRepair && ObjectUtil.isNotNull(jsonObject)) {
+                        imMsgRecordAllMapper.update(new LambdaUpdateWrapper<ImMsgRecordAll>()
+                                .eq(ImMsgRecordAll::getId, imMsgRecordAll.getId())
+                                .set(ImMsgRecordAll::getMsgcontent, jsonObject.toJSONString())
+                        );
+                        log.info("修复数据(数据id：{})成功：{}", imMsgRecordAll.getId(), jsonObject.toJSONString());
+                    }
+                } catch (Exception e) {
+                    log.error("修复数据(数据id：{})失败：{}", imMsgRecordAll.getId(), e.getMessage());
+                } finally {
+                    //修复进度
+                    log.info("======修复进度：{}/{}", index, imMsgRecordAlls.size());
+                }
+            }
+        });
+    }
 }