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; /** * 姓名 */ 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){ 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); // } // } // //}
