Переглянути джерело

修改内容:登陆ip玩家列表、玩家登陆日志

lth 1 рік тому
батько
коміт
eee258e6b4

+ 6 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/PlayerDataListDTO.java

@@ -176,4 +176,10 @@ public class PlayerDataListDTO extends BasePage {
     @ApiModelProperty("SDK来源")
     private String sourceSystem;
 
+    /**
+     * 玩家最近游戏角色名
+     */
+    @ApiModelProperty(value = "玩家最近游戏角色名称")
+    private String roleName;
+
 }

+ 2 - 1
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/PlayerLoginLogDataListDTO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author tianhua
@@ -78,7 +79,7 @@ public class PlayerLoginLogDataListDTO extends BasePage {
      * 区服ID
      */
     @ApiModelProperty(value = "区服ID")
-    private Long serverId;
+    private List<String> serverId;
 
     /**
      * 操作系统

+ 6 - 2
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/PlayerDataServiceImpl.java

@@ -14,6 +14,7 @@ import com.zanxiang.game.data.serve.pojo.vo.PlayerRoleDataVO;
 import com.zanxiang.game.data.serve.service.IPlayerDataService;
 import com.zanxiang.game.data.serve.utils.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nutz.dao.Cnd;
@@ -69,6 +70,9 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
         if (StringUtils.isNotBlank(dto.getNickname())) {
             cri.where().andLike("nickname", dto.getNickname());
         }
+        if (StringUtils.isNotBlank(dto.getRoleName())) {
+            cri.where().andLike("last_game_role_name", dto.getRoleName());
+        }
         if (StringUtils.isNotBlank(dto.getMobile())) {
             cri.where().andEquals("mobile", dto.getMobile());
         }
@@ -371,8 +375,8 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
         if (StringUtils.isNotBlank(dto.getRoleName())) {
             cri.where().andEquals("role_name", dto.getRoleName());
         }
-        if (dto.getServerId() != null) {
-            cri.where().andEquals("server_id", dto.getServerId());
+        if (CollectionUtils.isNotEmpty(dto.getServerId())) {
+            cri.where().andIn("server_id", dto.getServerId().toArray(String[]::new));
         }
         if (StringUtils.isNotBlank(dto.getOs())) {
             cri.where().andEquals("os", dto.getOs());