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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/GameAuthEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/GameAuthEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/GameAuthUserVO.java

@@ -0,0 +1,34 @@
+package com.zanxiang.game.module.base.pojo.vo;
+
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-08-17
+ * @description : 游戏授权用户
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GameAuthUserVO {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 游戏id
+     */
+    private Long gameId;
+
+    /**
+     * 授权类型
+     */
+    private GameAuthEnum gameAuthEnum;
+}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/rpc/GameAuthRpc.java

@@ -0,0 +1,21 @@
+package com.zanxiang.game.module.base.rpc;
+
+import com.zanxiang.game.module.base.pojo.vo.GameAuthUserVO;
+
+import java.util.List;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-08-17
+ * @description : 游戏授权
+ */
+public interface GameAuthRpc {
+
+    /**
+     * 让游戏authby用户id
+     *
+     * @param userIds 用户id
+     * @return {@link List}<{@link GameAuthUserVO}>
+     */
+    List<GameAuthUserVO> getGameAuthByUserIds(List<Long> userIds);
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameAuthController.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import com.zanxiang.game.module.manage.pojo.params.*;
 import com.zanxiang.game.module.manage.pojo.vo.GameAuthRoleVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameAuthVO;
@@ -93,7 +93,7 @@ public class GameAuthController {
         return ResultVO.ok(gameAuthRoleService.deleteById(id));
     }
 
-    @ApiOperation(value = "游戏授权用户列表")
+    @ApiOperation(value = "用户授权角色列表")
     @PostMapping(value = "/list/role")
     @PreAuthorize(permissionKey = "manage:gameAuth:listRole")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameAuthRoleVO.class)})
@@ -109,7 +109,7 @@ public class GameAuthController {
         return ResultVO.ok(GameAuthEnum.getGameAuthMap());
     }
 
-    @ApiOperation(value = "获取权限类型枚举")
+    @ApiOperation(value = "获取权限类型相关用户")
     @GetMapping(value = "/role/auth/user")
     @PreAuthorize(permissionKey = "manage:gameServer:roleAuthUser")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAuthAddParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAuthRoleAddParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import lombok.Data;
 
 import java.util.List;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAuthRoleListParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import com.zanxiang.game.module.mybatis.entity.GameAuthRole;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAuthRoleUpdateParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAuthRoleVO.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.vo;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAuthVO.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.vo;
 
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/rpc/impl/GameAuthRpcImpl.java

@@ -0,0 +1,52 @@
+package com.zanxiang.game.module.manage.rpc.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.vo.GameAuthUserVO;
+import com.zanxiang.game.module.base.rpc.GameAuthRpc;
+import com.zanxiang.game.module.manage.service.IGameAuthRoleService;
+import com.zanxiang.game.module.manage.service.IGameAuthService;
+import com.zanxiang.game.module.mybatis.entity.GameAuth;
+import com.zanxiang.game.module.mybatis.entity.GameAuthRole;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-08-17
+ * @description : 游戏授权
+ */
+@DubboService
+public class GameAuthRpcImpl implements GameAuthRpc {
+
+    @Autowired
+    private IGameAuthRoleService gameAuthRoleService;
+
+    @Autowired
+    private IGameAuthService gameAuthService;
+
+    @Override
+    public List<GameAuthUserVO> getGameAuthByUserIds(List<Long> userIds) {
+        List<GameAuthUserVO> list = new ArrayList<>();
+        userIds.forEach(userId -> {
+            GameAuthRole gameAuthRole = gameAuthRoleService.getOne(new LambdaQueryWrapper<GameAuthRole>()
+                    .eq(GameAuthRole::getUserId, userId));
+            List<GameAuth> gameAuthList = gameAuthService.list(new LambdaUpdateWrapper<GameAuth>()
+                    .eq(GameAuth::getUserId, userId));
+            gameAuthList.forEach(gameAuth -> list.add(this.transform(gameAuth, gameAuthRole.getAuthType())));
+        });
+        return list;
+    }
+
+    private GameAuthUserVO transform(GameAuth gameAuth, String authType) {
+        return GameAuthUserVO.builder()
+                .userId(gameAuth.getUserId())
+                .gameId(gameAuth.getGameId())
+                .gameAuthEnum(GameAuthEnum.getByValue(authType))
+                .build();
+    }
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthServiceImpl.java

@@ -9,7 +9,7 @@ import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
-import com.zanxiang.game.module.manage.enums.GameAuthEnum;
+import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameAuthAddParam;
 import com.zanxiang.game.module.manage.pojo.params.GameAuthListParam;