feat : 删除多余的表

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

@@ -1,40 +0,0 @@
-package com.zanxiang.manage.controller;
-
-import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.manage.domain.vo.PromoChannelChoiceVO;
-import com.zanxiang.manage.service.ChannelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 渠道管理接口
- */
-@Api(tags = {"渠道管理接口"})
-@RestController
-@RequestMapping("/channel")
-@Slf4j
-public class ChannelController {
-
-    @Autowired
-    private ChannelService channelService;
-
-    @ApiOperation(value = "渠道选择列表查询")
-    @GetMapping(value = "/choice/list")
-    @PreAuthorize(permissionKey = "sdk:channelChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoChannelChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoChannelChoiceVO>> choiceList() {
-        return new ResultVO<>(channelService.choiceList());
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.zanxiang.manage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.manage.domain.dto.ChannelDTO;
-import com.zanxiang.manage.domain.vo.PromoChannelChoiceVO;
-import com.zanxiang.mybatis.entity.Channel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 渠道
- */
-public interface ChannelService extends IService<Channel> {
-
-    /**
-     * 查询渠道选择列表
-     *
-     * @return : 返回所有cp信息
-     */
-    List<PromoChannelChoiceVO> choiceList();
-
-    /**
-     * 查询渠道选择列表
-     *
-     * @return : 返回所有cp信息
-     */
-    Map<Long, String> choiceMap();
-
-    /**
-     * 根据主键id查询
-     *
-     * @param id : 主键id
-     * @return : 返回渠道信息
-     */
-    ChannelDTO getById(Long id);
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/ChannelServiceImpl.java

@@ -1,59 +0,0 @@
-package com.zanxiang.manage.service.Impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.dto.ChannelDTO;
-import com.zanxiang.manage.domain.vo.PromoChannelChoiceVO;
-import com.zanxiang.manage.service.ChannelService;
-import com.zanxiang.mybatis.entity.Channel;
-import com.zanxiang.mybatis.mapper.ChannelMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 渠道
- */
-@Slf4j
-@Service
-public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> implements ChannelService {
-
-    /**
-     * 查询渠道选择列表
-     *
-     * @return : 返回所有cp信息
-     */
-    @Override
-    public List<PromoChannelChoiceVO> choiceList() {
-        return null;
-    }
-
-    /**
-     * 查询渠道选择列表
-     *
-     * @return : 返回所有cp信息
-     */
-    @Override
-    public Map<Long, String> choiceMap() {
-        Map<Long, String> map = new HashMap<>(2);
-        map.put(1L, "szqremenshouyoubabangtuijianpyq|邵邵-烈火骑士-热门手游霸榜推荐-朋友圈");
-        map.put(2L, "SZQhuoreshouyouxinzhanbaoJL(szq-奇迹战神-火热手游新战报-激励-巨网)");
-        return map;
-    }
-
-    /**
-     * 根据主键id查询
-     *
-     * @param id : 主键id
-     * @return : 返回渠道信息
-     */
-    @Override
-    public ChannelDTO getById(Long id) {
-        return BeanUtils.copy(super.getById(id), ChannelDTO.class);
-    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameUserRoleServiceImpl.java

@@ -48,9 +48,6 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
     @Autowired
     private GameCategoryService gameCategoryService;
 
-    @Autowired
-    private ChannelService channelService;
-
     @Autowired
     private CpService cpService;
 

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/UserExtServiceImpl.java

@@ -1,90 +0,0 @@
-package com.zanxiang.manage.service.Impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.dto.UserExtDTO;
-import com.zanxiang.manage.service.UserExtService;
-import com.zanxiang.mybatis.entity.UserExt;
-import com.zanxiang.mybatis.mapper.UserExtMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-29
- * @description : 玩家拓展信息
- */
-@Slf4j
-@Service
-public class UserExtServiceImpl extends ServiceImpl<UserExtMapper, UserExt> implements UserExtService {
-
-    /**
-     * 多条件查询用户拓展信息
-     *
-     * @param realName : 真实姓名
-     * @param regIp    : 注册ip
-     * @param isAuth   : 是否实名
-     * @return : 返回用户拓展信息列表
-     */
-    @Override
-    public Map<Long, UserExtDTO> getUserExtList(String realName, String regIp, Boolean isAuth) {
-        if (Strings.isBlank(realName) && Strings.isBlank(regIp) && isAuth == null) {
-            return null;
-        }
-        List<UserExt> userExtList = super.list(new LambdaQueryWrapper<UserExt>()
-                .eq(Strings.isNotBlank(realName), UserExt::getRealName, realName)
-                .eq(Strings.isNotBlank(regIp), UserExt::getRegIp, regIp)
-                .eq(isAuth != null, UserExt::getIsAuth, isAuth)
-                .select(UserExt::getUserId, UserExt::getRealName, UserExt::getRegIp, UserExt::getIsAuth, UserExt::getIdCard));
-        if (CollectionUtils.isEmpty(userExtList)) {
-            return Collections.emptyMap();
-        }
-        return BeanUtils.copyList(userExtList, UserExtDTO.class).stream()
-                .collect(Collectors.toMap(UserExtDTO::getUserId, Function.identity()));
-    }
-
-    /**
-     * 注册ip相关条件查询用户拓展信息
-     *
-     * @param regIp : 参数
-     * @return : 玩家信息
-     */
-    @Override
-    public Map<Long, UserExtDTO> regIpCondition(String regIp) {
-        if (Strings.isBlank(regIp)) {
-            return null;
-        }
-        //玩家注册ip条件处理
-        List<UserExt> userExtList = super.list(new LambdaQueryWrapper<UserExt>()
-                .eq(UserExt::getRegIp, regIp)
-                .select(UserExt::getUserId, UserExt::getRegIp));
-        if (CollectionUtils.isEmpty(userExtList)) {
-            return Collections.emptyMap();
-        }
-        return BeanUtils.copyList(userExtList, UserExtDTO.class).stream()
-                .collect(Collectors.toMap(UserExtDTO::getUserId, Function.identity()));
-    }
-
-    /**
-     * 根据玩家id查询
-     *
-     * @param userId : 玩家id
-     * @return : 返回玩家信息
-     */
-    @Override
-    public UserExtDTO getById(Long userId) {
-        if (userId == null) {
-            return null;
-        }
-        return BeanUtils.copy(super.getById(userId), UserExtDTO.class);
-    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/UserServiceImpl.java

@@ -23,7 +23,6 @@ import com.zanxiang.manage.service.*;
 import com.zanxiang.mybatis.entity.PromoAccount;
 import com.zanxiang.mybatis.entity.PromoChannel;
 import com.zanxiang.mybatis.entity.User;
-import com.zanxiang.mybatis.entity.UserExt;
 import com.zanxiang.mybatis.mapper.UserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -46,9 +45,6 @@ import java.util.stream.Collectors;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
-    @Autowired
-    private UserExtService userExtService;
-
     @Autowired
     private GameService gameService;
 
@@ -217,13 +213,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     .set(User::getUpdateTime, LocalDateTime.now()));
         }
         //用户拓展信息更新
-        if (Strings.isNotBlank(param.getRealName()) || Strings.isNotBlank(param.getIdCard())) {
-            userExtService.update(new LambdaUpdateWrapper<UserExt>()
-                    .eq(UserExt::getUserId, param.getUserId())
-                    .set(Strings.isNotBlank(param.getRealName()), UserExt::getRealName, param.getRealName())
-                    .set(Strings.isNotBlank(param.getIdCard()), UserExt::getIdCard, param.getIdCard())
-                    .set(UserExt::getUpdateTime, LocalDateTime.now()));
-        }
+//        if (Strings.isNotBlank(param.getRealName()) || Strings.isNotBlank(param.getIdCard())) {
+//            userExtService.update(new LambdaUpdateWrapper<UserExt>()
+//                    .eq(UserExt::getUserId, param.getUserId())
+//                    .set(Strings.isNotBlank(param.getRealName()), UserExt::getRealName, param.getRealName())
+//                    .set(Strings.isNotBlank(param.getIdCard()), UserExt::getIdCard, param.getIdCard())
+//                    .set(UserExt::getUpdateTime, LocalDateTime.now()));
+//        }
         return Boolean.TRUE;
     }
 

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

@@ -1,41 +0,0 @@
-package com.zanxiang.manage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.manage.domain.dto.UserExtDTO;
-import com.zanxiang.mybatis.entity.UserExt;
-
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-29
- * @description : 玩家拓展信息
- */
-public interface UserExtService extends IService<UserExt> {
-
-    /**
-     * 多条件查询用户拓展信息
-     *
-     * @param realName : 真实姓名
-     * @param regIp    : 注册ip
-     * @param isAuth   : 是否实名
-     * @return : 返回用户拓展信息列表
-     */
-    Map<Long, UserExtDTO> getUserExtList(String realName, String regIp, Boolean isAuth);
-
-    /**
-     * 注册ip相关条件查询用户拓展信息
-     *
-     * @param regIp : 参数
-     * @return : 玩家信息
-     */
-    Map<Long, UserExtDTO> regIpCondition(String regIp);
-
-    /**
-     * 根据玩家id查询
-     *
-     * @param userId : 玩家id
-     * @return : 返回玩家信息
-     */
-    UserExtDTO getById(Long userId);
-}

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Channel.java

@@ -1,80 +0,0 @@
-package com.zanxiang.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-06
- * @description : 渠道表
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_channel")
-public class Channel {
-
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 渠道名称
-     */
-    private String channelName;
-
-    /**
-     * 渠道唯一标识
-     */
-    private String channelSign;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 联系人
-     */
-    private String linkMan;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 职位
-     */
-    private String position;
-
-    /**
-     * 1 删除  0 正常
-     */
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 删除时间
-     */
-    private LocalDateTime deleteTime;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/UserExt.java

@@ -1,117 +0,0 @@
-package com.zanxiang.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-06
- * @description : 玩家拓展表
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_user_ext")
-public class UserExt {
-
-    /**
-     * user_id
-     */
-    @TableId(value = "user_id")
-    private Long userId;
-
-    /**
-     * 注册IP
-     */
-    private String regIp;
-
-    /**
-     * 注册手机号
-     */
-    private String regMobile;
-
-    /**
-     * 注册邮箱
-     */
-    private String regEmail;
-
-    /**
-     * 注册游戏id
-     */
-    private Long regGameId;
-
-    /**
-     * 注册来源
-     */
-    private String regFrom;
-
-    /**
-     * 是否实名认证
-     */
-    private Boolean isAuth;
-
-    /**
-     * 身份证类型 1、身份证
-     */
-    private Integer identifyType;
-
-    /**
-     * 证件号码
-     */
-    private String idCard;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 生日
-     */
-    private String birthday;
-
-    /**
-     * 性别, 0 : 未知, 1 : 男, 2 : 女
-     */
-    private Integer sex;
-
-    /**
-     * 实名认证平台, 1 国家网络防沉迷
-     */
-    private Integer authPlatform;
-
-    /**
-     * 实名认证时间
-     */
-    private LocalDateTime authTime;
-
-    /**
-     * 中宣部PI
-     */
-    private String zxbPi;
-
-    /**
-     * 上次登录时间
-     */
-    private LocalDateTime lastLoginTime;
-
-    /**
-     * 上次登录ip
-     */
-    private String lastLoginIp;
-
-    /**
-     * 注册时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更改时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/ChannelMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.mybatis.entity.Channel;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-06
- * @description : ${description}
- */
-public interface ChannelMapper extends BaseMapper<Channel> {
-}

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserExtMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.mybatis.entity.UserExt;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-06
- * @description : ${description}
- */
-public interface UserExtMapper extends BaseMapper<UserExt> {
-}

game-module/game-mybatis/src/main/resources/mapper/ChannelMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zanxiang.mybatis.mapper.ChannelMapper">
-</mapper>

game-module/game-mybatis/src/main/resources/mapper/UserExtMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zanxiang.mybatis.mapper.UserExtMapper">
-</mapper>

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserExtServiceImpl.java

@@ -1,20 +0,0 @@
-package com.zanxiang.sdk.service.Impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.mybatis.entity.UserExt;
-import com.zanxiang.mybatis.mapper.UserExtMapper;
-import com.zanxiang.sdk.service.UserExtService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : xufeng
- * @time : 2022-07-06
- * @description : 玩家拓展信息
- */
-@Slf4j
-@Service
-public class UserExtServiceImpl extends ServiceImpl<UserExtMapper, UserExt> implements UserExtService {
-
-
-}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserExtService.java

@@ -1,13 +0,0 @@
-package com.zanxiang.sdk.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.mybatis.entity.UserExt;
-
-/**
- * @author : xufeng
- * @time : 2022-07-06
- * @description : 玩家拓展信息
- */
-public interface UserExtService extends IService<UserExt> {
-
-}