Merge branch 'package' of GameCenter/game-center into dev

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, 提现记录和有效创角上线> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, 解决ip封禁未指定游戏得问题> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -1,8 +1,10 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -13,6 +15,13 @@ import java.util.List;
 @Data
 public class IpBanAddParam {
 
+    /**
+     * 游戏id
+     */
+    @NotNull(message = "游戏id不可为空")
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     /**
      * ip列表
      */

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

@@ -25,6 +25,12 @@ public class IpBanListParam extends BaseListDTO<IpBan> {
     @ApiModelProperty(notes = "查询的ip")
     private String ip;
 
+    /**
+     * 游戏id
+     */
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     /**
      * 封禁状态
      */

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

@@ -25,6 +25,18 @@ public class IpBanVO {
     @ApiModelProperty(notes = "ip")
     private String ip;
 
+    /**
+     * 游戏id
+     */
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
+    /**
+     * 游戏名称
+     */
+    @ApiModelProperty(notes = "游戏名称")
+    private String gameName;
+
     /**
      * 封禁时间
      */

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

@@ -7,16 +7,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
+import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.IpBanAddParam;
 import com.zanxiang.game.module.manage.pojo.params.IpBanListParam;
 import com.zanxiang.game.module.manage.pojo.params.IpBanUpdateParam;
 import com.zanxiang.game.module.manage.pojo.vo.IpBanVO;
+import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.manage.service.IIpBanService;
 import com.zanxiang.game.module.mybatis.entity.IpBan;
 import com.zanxiang.game.module.mybatis.mapper.IpBanMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,10 +38,14 @@ import java.util.Objects;
 @Service
 public class IpBanServiceImpl extends ServiceImpl<IpBanMapper, IpBan> implements IIpBanService {
 
+    @Autowired
+    private IGameService gameService;
+
     @Override
     public IPage<IpBanVO> list(IpBanListParam param) {
         return page(param.toPage(), new QueryWrapper<IpBan>().lambda()
                 .eq(Strings.isNotBlank(param.getIp()), IpBan::getIp, param.getIp())
+                .eq(param.getGameId() != null, IpBan::getGameId, param.getGameId())
                 .eq(param.getStatus() != null, IpBan::getStatus, param.getStatus())
                 .ge(param.getBeginDate() != null, IpBan::getBanTime, param.getBeginDate() == null ? null : LocalDateTime.of(param.getBeginDate(), LocalTime.MIN))
                 .le(param.getEndDate() != null, IpBan::getBanTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
@@ -50,7 +57,10 @@ public class IpBanServiceImpl extends ServiceImpl<IpBanMapper, IpBan> implements
         if (Objects.isNull(ipBan)) {
             return null;
         }
-        return BeanUtil.copy(ipBan, IpBanVO.class);
+        IpBanVO ipBanVO = BeanUtil.copy(ipBan, IpBanVO.class);
+        GameDTO gameDTO = gameService.getById(ipBanVO.getGameId());
+        ipBanVO.setGameName(gameDTO == null ? null : gameDTO.getName());
+        return ipBanVO;
     }
 
     @Override
@@ -63,6 +73,7 @@ public class IpBanServiceImpl extends ServiceImpl<IpBanMapper, IpBan> implements
             if (ipBan == null) {
                 ipBan = IpBan.builder()
                         .ip(ip)
+                        .gameId(param.getGameId())
                         .banTime(LocalDateTime.now())
                         .status(BanStatusEnum.BAN_STATUS.getStatus())
                         .operateId(SecurityUtil.getUserId())