Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

44323

2024-03-11 52276cea4d1b2b45406dc3e1d3d8feb4950f71aa

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 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);
//        }
//    }
//
//}

 cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java

@@ -11,7 +11,11 @@
    /**
     * 参赛数据id
     */
    private Long id;
    private Long participantId;
    /**
     * 参赛人员类型
     */
    private Integer participantType;
    /**
     * 姓名
     */

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java

@@ -161,7 +161,11 @@
    @ResponseBody
    @PostMapping("/addWorldCup")
    public ResultUtil addWorldCup(WorldCup worldCup, String stores){
        worldCup.setStatus(1);
        if(worldCup.getStartTime().before(new Date())){
            worldCup.setStatus(2);
        }else{
            worldCup.setStatus(1);
        }
        worldCup.setCreateTime(new Date());
        worldCup.setMatchNumber(0);
        Integer integer = worldCupClient.addWorldCup(worldCup);
@@ -195,6 +199,11 @@
        if(worldCup1.getStartTime().before(DateUtil.getDate())){
            return ResultUtil.error("赛事已开始，不能编辑");
        }
        if(worldCup.getStartTime().before(new Date())){
            worldCup.setStatus(2);
        }else{
            worldCup.setStatus(1);
        }
        worldCupClient.editWorldCup(worldCup);
        worldCupStoreClient.delWorldCupStore(worldCup.getId());
        JSONArray jsonArray = JSON.parseArray(stores);

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java

@@ -49,8 +49,9 @@


    @RequestMapping("/openWorldCupGameStatisticsListInfo")
    public String openWorldCupGameStatisticsListInfo(Model model, Integer id){
        model.addAttribute("id", id);
    public String openWorldCupGameStatisticsListInfo(Model model, Long participantId, Integer participantType){
        model.addAttribute("participantId", participantId);
        model.addAttribute("participantType", participantType);
        return PREFIX + "worldCupGameStatisticsListInfo.html";
    }


 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html

@@ -16,7 +16,7 @@
    text-indent: 10px;
  }
  .el-upload__input{
    display: none;
    display: none !important;
  }
</style>
<div class="ibox float-e-margins">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html

@@ -16,7 +16,7 @@
    text-indent: 10px;
  }
  .el-upload__input{
    display: none;
    display: none !important;
  }
</style>
<div class="ibox float-e-margins">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html

@@ -8,7 +8,8 @@
      <div class="ibox-content">
        <div class="row row-lg">
          <div class="col-sm-12">
            <input type="hidden" id="id" value="${id}">
            <input type="hidden" id="participantId" value="${participantId}">
              <input type="hidden" id="participantType" value="${participantType}">
            <div class="row">
              <div class="col-sm-3">
                <#NameCon id="name" name="用户姓名：" />

 cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js

@@ -140,7 +140,6 @@
        'name': name,
        'startTime': new Date(startTime + " 00:00:00"),
        'endTime': new Date(endTime + " 23:59:59"),
        'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
        'startAge': startAge,
        'endAge': endAge,
        'gender': gender,
@@ -161,6 +160,9 @@
        'intro': intro,
        'content': content,
        'stores': JSON.stringify(WorldCupInfo.stores)
    }
    if(null != registrationClosingTime && '' != registrationClosingTime){
        data.registrationClosingTime = registrationClosingTime;
    }

    //提交信息
@@ -301,7 +303,6 @@
        'name': name,
        'startTime': new Date(startTime + " 00:00:00"),
        'endTime': new Date(endTime + " 23:59:59"),
        'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
        'startAge': startAge,
        'endAge': endAge,
        'gender': gender,
@@ -323,6 +324,9 @@
        'content': content,
        'stores': JSON.stringify(WorldCupInfo.stores)
    }
    if(null != registrationClosingTime && '' != registrationClosingTime){
        data.registrationClosingTime = registrationClosingTime;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/worldCup/editWorldCup", function (res) {

 cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js

@@ -111,7 +111,8 @@

WorldCupGameStatisticsListInfo.search = function () {
    var queryData = {};
    queryData['id']  = $("#id").val();
    queryData['participantId']  = $("#participantId").val();
    queryData['participantType']  = $("#participantType").val();
    queryData['name']  = $("#name").val();
    WorldCupGameStatisticsListInfo.table.refresh({query: queryData});
};
@@ -126,7 +127,8 @@
    var table = new BSTable(WorldCupGameStatisticsListInfo.id, "/worldCupRecords/worldCupGameStatisticsListInfo", defaultColunms);
    table.setPaginationType("server");
    table.setQueryParams({
        'id': $('#id').val()
        'participantId': $('#participantId').val(),
        'participantType': $('#participantType').val()
    })
    WorldCupGameStatisticsListInfo.table = table.init();