aijinhui
2023-12-25 fbc6fc4e835c0249f8d5aaaec71e99d1817f08dd
融云
已添加4个文件
已修改5个文件
125 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncEndParam.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncParam.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncTwoParam.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupUserParam.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudGroupSyncParam;
import com.ruoyi.rongcloud.param.RongCloudGroupUserParam;
import com.ruoyi.rongcloud.service.RongCloudService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -85,6 +87,20 @@
    @ApiOperation("群组管理-刷新群组信息")
    public AjaxResult groupRefresh(@RequestBody RongCloudGroupParam groupParam)
    {
        return rongCloudService.groupUserQuery(groupParam);
        return rongCloudService.groupRefresh(groupParam);
    }
    @PostMapping("/userGroupQuery")
    @ApiOperation("群组管理-查询用户所在群组")
    public AjaxResult userGroupQuery(@RequestBody RongCloudGroupUserParam userParam)
    {
        return rongCloudService.userGroupQuery(userParam);
    }
    @PostMapping("/groupSync")
    @ApiOperation("群组管理-同步用户所在群组")
    public AjaxResult groupSync(@RequestBody RongCloudGroupSyncParam syncParam)
    {
        return rongCloudService.groupSync(syncParam);
    }
}
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncEndParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.rongcloud.param;
import lombok.Data;
/**
 * @author Administrator
 */
@Data
public class RongCloudGroupSyncEndParam {
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    String userId;
}
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.ruoyi.rongcloud.param;
import lombok.Data;
import java.util.List;
/**
 * @author Administrator
 */
@Data
public class RongCloudGroupSyncParam {
    String userId;
    List<RongCloudGroupSyncTwoParam> list;
}
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupSyncTwoParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ruoyi.rongcloud.param;
import lombok.Data;
/**
 * @author Administrator
 */
@Data
public class RongCloudGroupSyncTwoParam {
    String groupId;
    String groupName;
}
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupUserParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.ruoyi.rongcloud.param;
import lombok.Data;
/**
 * @author Administrator
 */
@Data
public class RongCloudGroupUserParam {
    private String userId;
    private Integer page;
    private Integer size;
}
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -7,9 +7,7 @@
import com.ruoyi.rongcloud.mapper.ArdRongGroupMapper;
import com.ruoyi.rongcloud.mapper.ArdRongGroupUserMapper;
import com.ruoyi.rongcloud.domain.*;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudParam;
import com.ruoyi.rongcloud.param.*;
import com.ruoyi.rongcloud.service.RongCloudService;
import com.ruoyi.utils.forest.RongCloudClient;
import lombok.extern.slf4j.Slf4j;
@@ -18,6 +16,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.*;
/**
@@ -193,6 +192,34 @@
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult userGroupQuery(RongCloudGroupUserParam userParam) {
        return AjaxResult.success(rongCloudClient.userGroupQuery(getRongCloudHead(),userParam));
    }
    @Override
    public AjaxResult groupSync(RongCloudGroupSyncParam syncParam) {
        RongCloudGroupSyncEndParam endParam = new RongCloudGroupSyncEndParam();
        endParam.setUserId(syncParam.getUserId());
        List<RongCloudGroupSyncTwoParam> twoParams = syncParam.getList();
        for (int i = 0; i < twoParams.size(); i++) {
            RongCloudGroupSyncTwoParam syncTwoParam= twoParams.get(i);
            String groupId = syncTwoParam.getGroupId();
            String groupName = syncTwoParam.getGroupName();
            try {
                Class clazz = endParam.getClass();
                // åŠ¨æ€æ·»åŠ å±žæ€§
                Field ageField = clazz.getDeclaredField("group["+groupId+"]");
                ageField.setAccessible(true); // è®¾ç½®ç§æœ‰å±žæ€§å¯è®¿é—®
                ageField.set(endParam, groupName);
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        Map<String, Object> groupMap =  rongCloudClient.groupSync(getRongCloudHead(),endParam);
        return AjaxResult.success(groupMap);
    }
    /**
     * èŽ·å–èžäº‘ç­¾åä¿¡æ¯
     */
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudGroupSyncParam;
import com.ruoyi.rongcloud.param.RongCloudGroupUserParam;
import java.util.List;
import java.util.Map;
@@ -26,4 +28,6 @@
    AjaxResult groupQuit(RongCloudGroupParam groupParam);
    AjaxResult groupUserQuery(RongCloudGroupParam groupId);
    AjaxResult groupRefresh(RongCloudGroupParam groupParam);
    AjaxResult userGroupQuery(RongCloudGroupUserParam userParam);
    AjaxResult groupSync(RongCloudGroupSyncParam syncParam);
}
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -215,7 +215,7 @@
    /**
     * èŽ·å–æœªæŒ‚æŽ¥æƒé™çš„ä¸‰ä¸€è½¦è¾†
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PostMapping("/getArdSyCarNoRight")
    @ApiOperation("获取未挂接权限的三一车辆")
    public Map<String,Object> getArdSyCarNoRight(){
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java
@@ -1,9 +1,7 @@
package com.ruoyi.utils.forest;
import com.dtflys.forest.annotation.*;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudParam;
import com.ruoyi.rongcloud.param.*;
import com.ruoyi.rongcloud.service.MyAddressSource;
import java.util.Map;
@@ -37,4 +35,10 @@
    @Post(url = "/group/refresh.json")
    Map<String,Object> groupRefresh(@Header Map<String, Object> headerMap, @Body RongCloudGroupParam groupParam);
    @Post(url = "/user/group/query.json")
    Map<String,Object> userGroupQuery(@Header Map<String, Object> headerMap, @Body RongCloudGroupUserParam userParam);
    @Post(url = "/group/sync.json")
    Map<String,Object> groupSync(@Header Map<String, Object> headerMap, @Body RongCloudGroupSyncEndParam endParam);
}