Bladeren bron

:fix: gs区服sql修改

zhangxianyu 1 jaar geleden
bovenliggende
commit
44564aa821

+ 7 - 7
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameServerServiceImpl.java

@@ -592,7 +592,7 @@ public class GameServerServiceImpl implements IGameServerService {
                     throw new RuntimeException(e);
                 }
             }
-            if(userMap != null && userMap.getData() != null&&StringUtils.isNotEmpty(vo.getGsIds())){
+            if (userMap != null && userMap.getData() != null && StringUtils.isNotEmpty(vo.getGsIds())) {
                 Map<Long, String> data = userMap.getData();
                 List<Long> userIds = Arrays.stream(vo.getGsIds().split(",")).map(Long::parseLong).toList();
                 String gsNames = userIds.stream().map(data::get).collect(Collectors.joining(","));
@@ -816,8 +816,8 @@ public class GameServerServiceImpl implements IGameServerService {
         if (StringUtils.isNotEmpty(dto.getServerName())) {
             cri.where().andLike("a.server_name", dto.getServerName());
         }
-        if(dto.getGsId()!=null){
-            cri.where().and(new Static("find_in_set("+dto.getGsId()+",a.gs_ids)"));
+        if (dto.getGsId() != null) {
+            cri.where().and(new Static("find_in_set(" + dto.getGsId() + ",a.gs_ids)"));
         }
         return cri;
     }
@@ -868,8 +868,8 @@ public class GameServerServiceImpl implements IGameServerService {
         StringBuilder sql = new StringBuilder(StringUtils.EMPTY);
         for (int i = 1; i <= 90; i++) {
             sql.append("""
-                    concat(ifnull(round(c.da%d_active_num / e.new_da%d_total_num,4),0),'/',round(ifnull(d.new_da%d_total_num/(d.new_da%d_num + d.old_da%d_num) ,0),4),'/',IFNULL(c.da%d_role_num,0),'/',IFNULL(c.da%d_num,0)) as da_str%d,
-                     """.formatted(i, i, i, i, i, i, i, i));
+                    concat(a.da%d,'/',IFNULL(c.da%d_role_num,0),'/',IFNULL(c.da%d_num,0)) as da_str%d,
+                     """.formatted(i, i, i, i));
 
         }
         return sql.toString();
@@ -882,8 +882,8 @@ public class GameServerServiceImpl implements IGameServerService {
         StringBuilder sql = new StringBuilder(StringUtils.EMPTY);
         for (int i = 1; i <= 90; i++) {
             sql.append("""
-                    concat(ifnull(round(SUM(c.da%d_active_num) / SUM(e.new_da%d_total_num) ,4),0),'/',ifnull(round(SUM(d.new_da%d_total_num)/((SUM(d.new_da%d_num) + SUM(d.old_da%d_num))),4),0),'/',IFNULL(SUM(c.da%d_role_num),0),'/',IFNULL(SUM(c.da%d_num),0)) as da_str%d,
-                     """.formatted(i, i, i, i, i, i, i, i));
+                    concat(ifnull(round(SUM(c.da%d_active_num) / SUM(e.new_da%d_total_num) ,4),0),'/',ifnull(round(sum(c.da%d_num)/sum(c.da%d_total_num),4),0),'/',IFNULL(SUM(c.da%d_role_num),0),'/',IFNULL(SUM(c.da%d_num),0)) as da_str%d,
+                     """.formatted(i, i, i, i, i, i, i));
         }
         return sql.toString();
     }