:fix:角色战力排行榜，增加查询条件

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleCombatRankingDTO.java

@@ -81,4 +81,10 @@ public class RoleCombatRankingDTO extends BasePage {
     @ApiModelProperty(value = "SDK来源")
     private String sourceSystem;
 
+    /**
+     * 是否参与过合服
+     */
+    @ApiModelProperty(value = "是否参与过合服")
+    private Boolean isParticipateMerge;
+
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameMonitorAlarmServiceImpl.java

@@ -39,18 +39,21 @@ public class GameMonitorAlarmServiceImpl implements IGameMonitorAlarmService {
     @Transactional(rollbackFor = Exception.class)
     public boolean sendMsgToUser() {
         //数据库查表
+        log.info("查询告警信息");
         Sql sql = Sqls.create(getMonitorAlarmInfoSql());
         sql.setCallback(Sqls.callback.entities());
         sql.setEntity(dao.getEntity(GameMonitorAlarmVO.class));
         dao.execute(sql);
         //结果
+        log.info("查询告警信息结束");
         try{
             List<GameMonitorAlarmVO> list1 = sql.getList(GameMonitorAlarmVO.class);
+            log.info("告警信息：{}", list1);
             if (CollectionUtils.isEmpty(list1)){
                 log.info("没有告警信息");
                 return true;
             }
-
+            log.info("准备发送告警信息");
             for (GameMonitorAlarmVO vo : list1) {
                 String[] pitcherIds = vo.getPitcherId().split("-");
                 for (String pitcherId : pitcherIds) {

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1052,6 +1052,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //默认不传查询的区服，只看最新的合服数据
             cri.where().andEquals("is_merge", 0);
         }
+        //ture为参与过的 查询数据为1的是参与的 0是未参与的
+        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+            cri.where().andEquals("is_merge", 1);
+        }else {
+            cri.where().andEquals("is_merge", 0);
+        }
         //拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "parent_game_id" , "super_game_id");
         //分页
@@ -1180,8 +1186,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
-        //原始服可以参与多次合服，只看最新一次的合服的原始服信息
-        cri.where().andEquals("is_merge", 0);
+        //原始服可以参与多次合服，只看最新一次的合服的原始服信息  是否参与过合服:1是，0否
+        if(dto.getIsParticipateMerge()!=null&&dto.getIsParticipateMerge()){
+            cri.where().andEquals("is_merge", 1);
+        }else {
+            cri.where().andEquals("is_merge", 0);
+        }
+
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "server_id" , "boss_server_id" , "super_game_id");*/
         //分页
@@ -1312,6 +1323,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //默认不传查询的区服，只看最新的合服数据
             cri.where().andEquals("is_merge", 0);
         }
+        //ture为参与过的 查询数据为1的是参与的 0是未参与的
+        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+            cri.where().andEquals("is_merge", 1);
+        }else {
+            cri.where().andEquals("is_merge", 0);
+        }
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "super_game_id");*/
         //分页

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/task/GameMonitorAlarmTask.java

@@ -44,6 +44,7 @@ public class GameMonitorAlarmTask {
                     return;
                 }
                 try {
+                    log.info("进入告警方法");
                     gameMonitorAlarmService.sendMsgToUser();
                     log.info("游戏监控告警定时任务结束.");
                 } catch (Exception e) {