xiaoyong931011
2023-09-21 54be1e5481d58ea7fa39a34c0bd0e442c406a4b8
后台修改
8 files modified
4 files added
238 ■■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java 27 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/soccer/dto/LeaguesApiDto.java 18 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/soccer/entity/SoccerLeagues.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/soccer/mapper/SoccerLeaguesMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 12 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/dapp/DappMemberDao.xml 7 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/dapp/soccerLeagues.html 115 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -10,10 +10,13 @@
import cc.mrbird.febs.dapp.service.DappSimulateDataService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.soccer.dto.LeaguesApiDto;
import cc.mrbird.febs.dapp.vo.MallGoodsListVo;
import cc.mrbird.febs.dapp.vo.NewsListVo;
import cc.mrbird.febs.dapp.vo.SimulateDataVo;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.http.exceptions.UnirestException;
@@ -117,7 +120,7 @@
        return new FebsResponse().success().data(news);
    }
    @ApiOperation(value = "testApi", notes = "testApi")
    @ApiOperation(value = "获取国家", notes = "获取国家")
    @GetMapping(value = "/testApi")
    public FebsResponse testApi() {
        HttpResponse<String> response = null;
@@ -134,6 +137,28 @@
        return new FebsResponse().success();
    }
    @ApiOperation(value = "获取联赛", notes = "获取联赛")
    @PostMapping(value = "/leaguesApi")
    public FebsResponse leaguesApi(LeaguesApiDto leaguesApiDto) {
        HttpResponse<String> response = null;
        int season = ObjectUtil.isEmpty(leaguesApiDto.getSeason()) ? DateUtil.date().year() : leaguesApiDto.getSeason();
        String current = ObjectUtil.isEmpty(leaguesApiDto.getCurrent()) ? "true" : leaguesApiDto.getCurrent();
        try {
            response = Unirest.get(" https://v3.football.api-sports.io/fixtures")
                    .header("x-rapidapi-key", "87f8d87d629d1704ba49622cb978eb81")
                    .header("x-rapidapi-host", "v3.football.api-sports.io")
                    .queryString("season",season)
                    .queryString("current",current)
                    .asString();
        } catch (UnirestException e) {
            e.printStackTrace();
        }
        log.info(String.valueOf(response));
        log.info(response.getBody());
        log.info(String.valueOf(response.getRawBody()));
        return new FebsResponse().success();
    }
//    @ApiOperation(value = "头部数据", notes = "头部数据")
//    @GetMapping(value = "/totalIncome")
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -14,6 +14,7 @@
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
import cc.mrbird.febs.dapp.entity.MallOrderInfo;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import cc.mrbird.febs.dapp.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
import cc.mrbird.febs.system.entity.User;
@@ -217,4 +218,10 @@
//        return new FebsResponse().success().message("操作成功");
    }
    @RequestMapping(value = "/leaguesList")
    public FebsResponse leaguesList(SoccerLeagues soccerLeagues, QueryRequest request) {
        Map<String, Object> dataTable = getDataTable(dappMemberService.selectSoccerLeaguesInPage(soccerLeagues, request));
        return new FebsResponse().success().data(dataTable);
    }
}
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -273,4 +273,10 @@
        idMemberMoneyFlow = id;
        return FebsUtil.view("dapp/memberMoneyFlow");
    }
    @GetMapping("soccerLeagues")
    @RequiresPermissions("soccerLeagues:view")
    public String soccerLeagues() {
        return FebsUtil.view("dapp/soccerLeagues");
    }
}
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.MallAddressInfo;
import cc.mrbird.febs.dapp.entity.MallOrderInfo;
import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import cc.mrbird.febs.dapp.vo.*;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -133,4 +134,6 @@
    List<PackageRecordVo> selectPackageRecordWeekInPage(@Param("date") Date date);
    MallOrderInfo selectOrderByOrderNo(@Param("orderNo") String orderNo);
    IPage<SoccerLeagues> selectSoccerLeaguesInPage(@Param("record")SoccerLeagues soccerLeagues, Page<SoccerLeagues> page);
}
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import cc.mrbird.febs.dapp.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -118,4 +119,6 @@
    FebsResponse changeAbleYes(Long id);
    FebsResponse changeAbleNo(Long id);
    IPage<SoccerLeagues> selectSoccerLeaguesInPage(SoccerLeagues soccerLeagues, QueryRequest request);
}
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -14,6 +14,7 @@
import cc.mrbird.febs.dapp.enumerate.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import cc.mrbird.febs.dapp.vo.*;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.system.entity.User;
@@ -1354,6 +1355,13 @@
        return new FebsResponse().success();
    }
    @Override
    public IPage<SoccerLeagues> selectSoccerLeaguesInPage(SoccerLeagues soccerLeagues, QueryRequest request) {
        Page<SoccerLeagues> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<SoccerLeagues> soccerLeaguesIPage = dappMemberDao.selectSoccerLeaguesInPage(soccerLeagues, page);
        return soccerLeaguesIPage;
    }
    public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
        List<List<String>> partitionedList = new ArrayList<>();
        int size = originalList.size();
src/main/java/cc/mrbird/febs/dapp/soccer/dto/LeaguesApiDto.java
New file
@@ -0,0 +1,18 @@
package cc.mrbird.febs.dapp.soccer.dto;
import lombok.Data;
@Data
public class LeaguesApiDto {
    /**
     * integer = 4 characters YYYY
     * The season of the league
     */
    private Integer season;
    /**
     * string Return the list of active seasons or the las...Show pattern
     * Enum: "true" "false"
     * The state of the league
     */
    private String current;
}
src/main/java/cc/mrbird/febs/dapp/soccer/entity/SoccerLeagues.java
New file
@@ -0,0 +1,25 @@
package cc.mrbird.febs.dapp.soccer.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("soccer_leagues")
public class SoccerLeagues extends BaseEntity {
    private Integer leaguesId;
    private String leaguesName;
    private String leaguesType;
    private String leaguesLogo;
    private Date leaguesStart;
    private Date leaguesEnd;
}
src/main/java/cc/mrbird/febs/dapp/soccer/mapper/SoccerLeaguesMapper.java
New file
@@ -0,0 +1,7 @@
package cc.mrbird.febs.dapp.soccer.mapper;
import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SoccerLeaguesMapper extends BaseMapper<SoccerLeagues> {
}
src/main/resources/application-dev.yml
@@ -15,15 +15,15 @@
      datasource:
        # 数据源-1,名称为 base
        base:
          username: ct_test
          password: 123456
          # 154.91.195.148
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3406/db_speed?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
#          username: ct_test
#          password: 123456
#          # 154.91.195.148
#          driver-class-name: com.mysql.cj.jdbc.Driver
#          url: jdbc:mysql://120.27.238.55:3306/db_bnbweb?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
#          url: jdbc:mysql://120.27.238.55:3406/db_speed?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          username: db_soccer
          password: db_soccer123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://154.91.195.148:3306/db_soccer?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
  redis:
    # Redis数据库索引(默认为 0)
src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -506,4 +506,11 @@
        where a.order_no = #{orderNo}
            limit 1
    </select>
    <select id="selectSoccerLeaguesInPage" resultType="cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues">
        select
        a.*
        from soccer_leagues a
        order by a.id asc
    </select>
</mapper>
src/main/resources/templates/febs/views/dapp/soccerLeagues.html
New file
@@ -0,0 +1,115 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-soccer-leagues" lay-title="联赛列表">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="leagues-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="leaguesTable" lay-data="{id: 'leaguesTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<style>
    .layui-table-cell {
        height: auto !important;
    }
</style>
<script data-th-inline="none" type="text/javascript">
    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
        var $ = layui.jquery,
            laydate = layui.laydate,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            dropdown = layui.dropdown,
            $view = $('#febs-soccer-leagues'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'createTime', type: null},
            tableIns;
        form.render();
        initTable();
        // 初始化表格操作栏各个按钮功能
        table.on('tool(goodsTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'seeImgThumb') {
                var t = $view.find('#seeImgThumb'+data.id+'');
                //页面层
                layer.open({
                    type: 1,
                    title: "图片",
                    skin: 'layui-layer-rim', //加上边框
                    area: ['80%', '80%'], //宽高
                    shadeClose: true, //开启遮罩关闭
                    end: function (index, layero) {
                        return false;
                    },
                    content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
                });
            }
        });
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });
        $reset.on('click', function () {
            $searchForm[0].reset();
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });
        function getQueryParams() {
            return {
                inviteId: $searchForm.find('input[name="inviteId"]').val().trim(),
                accountType: $searchForm.find("select[name='accountType']").val(),
                withdrawAble: $searchForm.find("select[name='withdrawAble']").val(),
                invalidate_ie_cache: new Date()
            };
        }
        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'leaguesTable',
                url: ctx + 'member/leaguesList',
                cols: [[
                    {field: 'leaguesId', title: '联赛ID', minWidth: 100},
                    {field: 'leaguesName', title: '联赛名称', minWidth: 100},
                    {field: 'leaguesType', title: '联赛类型', minWidth: 130},
                    {field: 'leaguesLogo', title: '联赛LOGO',
                        templet: function (d) {
                            return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.leaguesLogo+'" alt=""></a>';
                        }, minWidth: 150,align:'center'},
                    {field: 'leaguesLogo', title: '联赛LOGO', minWidth: 130},
                    {field: 'leaguesStart', title: '开始时间', minWidth: 130},
                    {field: 'leaguesEnd', title: '结束时间', minWidth: 130},
                ]]
            });
        }
    })
</script>