Prechádzať zdrojové kódy

feat : 接口对接口调试修改

bilingfeng 2 rokov pred
rodič
commit
755ea4848d

+ 3 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/LoginController.java

@@ -2,6 +2,7 @@ package com.zanxiang.sdk.controller;
 
 import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.sdk.annotation.UnSignCheck;
+import com.zanxiang.sdk.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.params.LoginMobileParam;
 import com.zanxiang.sdk.domain.params.LoginPasswordParam;
 import com.zanxiang.sdk.domain.params.UserData;
@@ -58,14 +59,14 @@ public class LoginController {
     @ApiOperation(value = "用户退出")
     @GetMapping("/sign/out")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVO<Boolean> loginOut() {
+    public ResultVO<Boolean> loginOut(@ValidLogin UserData userData) {
         return ResultVO.ok();
     }
 
     @ApiOperation(value = "用户账号注销")
     @GetMapping("/write/off")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVO<Boolean> writeOff() {
+    public ResultVO<Boolean> writeOff(@ValidLogin UserData userData) {
         return ResultVO.ok();
     }
 

+ 5 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -6,6 +6,7 @@ import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.CustomerVO;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 import com.zanxiang.sdk.domain.vo.UserVO;
+import com.zanxiang.sdk.service.GameUserRoleService;
 import com.zanxiang.sdk.service.UserCardService;
 import com.zanxiang.sdk.service.UserService;
 import io.swagger.annotations.Api;
@@ -32,6 +33,9 @@ public class UserController {
     @Autowired
     private UserCardService userCardService;
 
+    @Autowired
+    private GameUserRoleService gameUserRoleService;
+
     @ApiOperation(value = "忘记密码找回")
     @PostMapping("/find/password")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
@@ -78,8 +82,7 @@ public class UserController {
     @PostMapping("/update/game/role")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVO updateUserGameRole(@Validated @RequestBody GameUserRoleUpdateParam param, @ValidLogin UserData userData) {
-//       return ResultVO.ok(gameUserRoleService.updateUserGameRole(param, userData));
-        return null;
+       return ResultVO.ok(gameUserRoleService.updateUserGameRole(param, userData));
     }
 
 }

+ 51 - 32
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/GameUserRoleUpdateParam.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 游戏角色
@@ -17,67 +16,87 @@ import java.time.LocalDateTime;
 @Data
 public class GameUserRoleUpdateParam {
 
-    @ApiModelProperty("游戏id")
-    @NotNull(message = "游戏id不可为空")
-    private Long gameId;
-
+    /**
+     * 上报类型
+     */
     @ApiModelProperty("上报类型")
     @NotNull(message = "上报类型不可为空")
     private Integer dataType;
 
+    /**
+     * 角色id
+     */
     @ApiModelProperty("角色id")
     @NotBlank(message = "角色id不可为空")
     private String roleId;
 
+    /**
+     * 角色名称
+     */
     @ApiModelProperty("角色名称")
     @NotBlank(message = "角色名称不可为空")
     private String roleName;
 
+    /**
+     * 角色等级
+     */
     @ApiModelProperty("角色等级")
     @NotNull(message = "角色等级不可为空")
     private Long roleLevel;
 
+    /**
+     * 角色等级描述
+     */
+    @ApiModelProperty("角色等级描述")
+    private String roleGradeDesc;
+
+    /**
+     * 角色创建时间, 当TYPE_CREATE_ROLE为必须,时间戳
+     */
+    @ApiModelProperty("角色创建时间, 当TYPE_CREATE_ROLE为必须,时间戳")
+    private Long roleCreateTime;
+
+    /**
+     * 角色等级变化时间,时间戳
+     */
+    @ApiModelProperty("角色等级变化时间,时间戳")
+    private Long roleGradeUpdateTime;
+
+    /**
+     * 游戏服务器id
+     */
     @ApiModelProperty("游戏服务器id")
     @NotBlank(message = "游戏服务器id不可为空")
     private String serverId;
 
+    /**
+     * 所在服务器名称
+     */
     @ApiModelProperty("所在服务器名称")
     @NotBlank(message = "所在服务器名称不可为空")
     private String serverName;
 
-    @ApiModelProperty("角色创建时间")
-    @NotNull(message = "角色创建时间不可为空")
-    private LocalDateTime roleCreateTime;
-
-    //---------------- 非必传参数 ----------------
-
-    @ApiModelProperty("游戏区服id")
-    private Long regionalId;
-
-    @ApiModelProperty("游戏区服名称")
-    private String regionalName;
-
+    /**
+     * 角色VIP
+     */
     @ApiModelProperty("角色VIP")
     private Long roleVipLevel;
 
+    /**
+     * 玩家角色战力
+     */
     @ApiModelProperty("玩家角色战力")
     private Long rolePower;
 
-    @ApiModelProperty("平台币余额")
+    /**
+     * 角色余额
+     */
+    @ApiModelProperty("角色余额")
     private BigDecimal platformCoin;
 
-    @ApiModelProperty("充值金额")
-    private BigDecimal rechargeMoney;
-
-    @ApiModelProperty("充值次数")
-    private Integer rechargeCount;
-
-    @ApiModelProperty("最近充值时间")
-    private LocalDateTime lastRechargeTime;
-
-    @ApiModelProperty("扩展信息")
-    private String ext;
-
-    @ApiModelProperty("角色最后登录时间")
-    private LocalDateTime lastLoginTime;
+    /**
+     * 游戏在线时长
+     */
+    @ApiModelProperty("游戏在线时长")
+    private Long totalOnlineTime;
 }

+ 49 - 0
game-module/game-sdk/src/main/java/com/zanxiang/sdk/enums/DataTypeEnum.java

@@ -0,0 +1,49 @@
+package com.zanxiang.sdk.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-10-04
+ * @description : 角色数据上报类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum DataTypeEnum {
+
+    /**
+     * 选择服务器
+     */
+    TYPE_SELECT_SERVER(1, "选择服务器"),
+
+    /**
+     * 创建角色
+     */
+    TYPE_CREATE_ROLE(2, "创建角色"),
+
+    /**
+     * 进入游戏
+     */
+    TYPE_ENTER_GAME(3, "进入游戏"),
+
+    /**
+     * 等级提升
+     */
+    TYPE_LEVEL_UP(4, "等级提升"),
+
+    /**
+     * 退出游戏
+     */
+    TYPE_EXIT_GAME(5, "退出游戏");
+
+    /**
+     * 数据类型
+     */
+    private Integer dateType;
+
+    /**
+     * 描述
+     */
+    private String name;
+}

+ 15 - 3
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GameUserRoleImpl.java

@@ -11,6 +11,7 @@ import com.zanxiang.mybatis.entity.GameUserRole;
 import com.zanxiang.mybatis.mapper.GameUserRoleMapper;
 import com.zanxiang.sdk.domain.params.GameUserRoleUpdateParam;
 import com.zanxiang.sdk.domain.params.UserData;
+import com.zanxiang.sdk.enums.DataTypeEnum;
 import com.zanxiang.sdk.service.GameUserRoleService;
 import com.zanxiang.sdk.service.GameUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,9 +31,9 @@ public class GameUserRoleImpl extends ServiceImpl<GameUserRoleMapper, GameUserRo
     @Autowired
     private GameUserService gameUserService;
 
-    @Override
-    public Boolean updateUserGameRole(GameUserRoleUpdateParam param, UserData userData) {
-        Long gameId = param.getGameId();
+
+    public Boolean updateUserGameRole1(GameUserRoleUpdateParam param, UserData userData) {
+        Long gameId = userData.getGameId();
         GameUser gameUserData = gameUserService.getOne(new LambdaQueryWrapper<GameUser>().eq(GameUser::getGameId, gameId).eq(GameUser::getUserId, userData.getUserId()).last("limit 1"));
         if (Objects.isNull(gameUserData)) {
             throw new CustomException(HttpStatusEnum.GAME_USER_UN_CREATE);
@@ -58,4 +59,15 @@ public class GameUserRoleImpl extends ServiceImpl<GameUserRoleMapper, GameUserRo
         }
         return true;
     }
+
+    @Override
+    public Boolean updateUserGameRole(GameUserRoleUpdateParam param, UserData userData) {
+        //上报类型
+        Integer dataType = param.getDataType();
+        //创建角色
+        if (Objects.equals(dataType, DataTypeEnum.TYPE_CREATE_ROLE.getDateType())) {
+
+        }
+        return true;
+    }
 }