From c98096bd3b19f30febc92baab1f3428383c17965 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 16:52:27 +0800
Subject: [PATCH] 修改bug
---
cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java | 31 +++++++++++++++++++------------
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java | 10 +++++-----
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.java | 6 +++++-
3 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.java
index 6bfae1c..f30c187 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.java
@@ -11,7 +11,11 @@
/**
* 参赛数据id
*/
- private Long id;
+ private Long participantId;
+ /**
+ * 参赛人员类型
+ */
+ private Integer participantType;
/**
* 姓名
*/
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
index 84d093e..d37c79f 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -445,17 +445,17 @@
*/
@Override
public Map<String, Object> worldCupGameStatisticsListInfo(WorldCupGameStatisticsListInfo worldCupGameStatisticsListInfo) {
- Long id = worldCupGameStatisticsListInfo.getId();
+ Long participantId = worldCupGameStatisticsListInfo.getParticipantId();
+ Integer participantType = worldCupGameStatisticsListInfo.getParticipantType();
String name = worldCupGameStatisticsListInfo.getName();
- WorldCupCompetitor worldCupCompetitor = this.getById(id);
- List<WorldCupCompetitor> list = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()));
+ List<WorldCupCompetitor> list = this.list(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantType", participantType).eq("participantId", participantId)
+ .isNotNull("matchResult").orderByDesc("startTime"));
List<Map<String, Object>> mapList = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.HH.dd HH:mm");
for (WorldCupCompetitor cupCompetitor : list) {
Map<String, Object> map = new HashMap<>();
map.put("id", cupCompetitor.getId());
- Integer participantType = cupCompetitor.getParticipantType();
- Long participantId = cupCompetitor.getParticipantId();
if(1 == participantType){
TStudent tStudent = studentClient.queryById(participantId.intValue());
if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
diff --git a/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java b/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
index 43d26e2..34ba428 100644
--- a/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
+++ b/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
@@ -1,14 +1,12 @@
//package com.dsh;
//
-//import com.dsh.communityWorldCup.model.WorldCupRank;
-//import com.dsh.communityWorldCup.model.WorldCupRankVo;
-//import com.dsh.communityWorldCup.service.IWorldCupCompetitorService;
+//import com.alibaba.fastjson.JSONObject;
//import org.junit.Test;
//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
+//import java.util.HashMap;
//import java.util.List;
//
///**
@@ -19,18 +17,27 @@
//@SpringBootTest
//public class CommunityWorldCupApplicationTest {
//
-// @Autowired
-// private IWorldCupCompetitorService worldCupCompetitorService;
//
//
// @Test
// public void test(){
-// WorldCupRank worldCupRank = new WorldCupRank();
-// worldCupRank.setAppUserId(129);
-// worldCupRank.setSort(2);
-// worldCupRank.setIsStudent(0);
-// worldCupRank.setRadius(1);
-// List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
+// HashMap<String, String> map = new HashMap<>();
+// map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id", "2024");
+// map.put("red_sutu_id", "1037");
+// map.put("blue_sutu_id", "1036");
+// map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
+// map.put("custom", "");
+//
+// String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/batterGame", map);
+// JSONObject jsonObject = JSONObject.parseObject(s);
+// Integer code1 = jsonObject.getInteger("code");
+// String message = jsonObject.getString("message");
+// if (200 == code1) {
+// return ResultUtil.success();
+// } else {
+// return ResultUtil.error(message);
+// }
// }
//
//}
--
Gitblit v1.7.1