From 1d5cc4be0aa420166be9d0d180c8d9d41c8fc566 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 16 Apr 2024 16:38:43 +0800
Subject: [PATCH] 滑点页面查询
---
src/main/java/cc/mrbird/febs/dapp/entity/DappHdRecord.java | 9 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java | 14 +++
src/main/resources/templates/febs/views/modules/banner/coinPrice.html | 163 +++++++++++++++++++---------------------
src/main/resources/templates/febs/views/modules/banner/coinSet.html | 2
src/main/resources/mapper/dapp/DappHdRecordMapper.xml | 11 ++
5 files changed, 113 insertions(+), 86 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappHdRecord.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappHdRecord.java
index 68db672..fb7e7dd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappHdRecord.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappHdRecord.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -15,4 +16,12 @@
private BigDecimal usdtAmount;//滑点累计
private BigDecimal coinEvery;//币量新增
private BigDecimal coinAmount;//币量累计
+
+
+ @TableField(exist = false)
+ private String startTime;
+
+
+ @TableField(exist = false)
+ private String endTime;
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
index 48a465a..7dc4088 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.DataDicEnum;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.dapp.entity.DappCoinPrice;
import cc.mrbird.febs.dapp.entity.DappHdRecord;
import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
@@ -13,6 +14,9 @@
import cc.mrbird.febs.dapp.mapper.PlatformBannerMapper;
import cc.mrbird.febs.dapp.service.AsyncCjService;
import cc.mrbird.febs.dapp.service.IAdminBannerService;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -108,6 +112,16 @@
@Override
public IPage<DappHdRecord> findHdRecordInPage(DappHdRecord dappHdRecord, QueryRequest request) {
+ String startTime = dappHdRecord.getStartTime();
+ String endTime = dappHdRecord.getEndTime();
+ if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+ DateTime dateStartTime= DateUtil.parseDate(startTime);
+ DateTime dateEndTime = DateUtil.parseDate(endTime);
+ int compare = DateUtil.compare(dateStartTime, dateEndTime);
+ if(compare >= 0){
+ throw new FebsException("请输入正确的开始时间和结束时间");
+ }
+ }
Page<DappHdRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<DappHdRecord> dappHdRecordIPage = dappHdRecordMapper.findHdRecordInPage(page, dappHdRecord);
return dappHdRecordIPage;
diff --git a/src/main/resources/mapper/dapp/DappHdRecordMapper.xml b/src/main/resources/mapper/dapp/DappHdRecordMapper.xml
index dd1d7e7..1f86353 100644
--- a/src/main/resources/mapper/dapp/DappHdRecordMapper.xml
+++ b/src/main/resources/mapper/dapp/DappHdRecordMapper.xml
@@ -21,6 +21,17 @@
*
FROM
dapp_hd_record
+
+ <where>
+ <if test="record != null">
+ <if test="record.startTime != null and record.startTime != ''">
+ and create_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and create_time <= #{record.endTime}
+ </if>
+ </if>
+ </where>
order by CREATE_TIME desc
</select>
diff --git a/src/main/resources/templates/febs/views/modules/banner/coinPrice.html b/src/main/resources/templates/febs/views/modules/banner/coinPrice.html
index a9baad5..7bd1bc9 100644
--- a/src/main/resources/templates/febs/views/modules/banner/coinPrice.html
+++ b/src/main/resources/templates/febs/views/modules/banner/coinPrice.html
@@ -4,21 +4,31 @@
<div class="layui-card">
<div class="layui-card-body febs-table-full">
<form class="layui-form layui-table-form" lay-filter="user-table-form">
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <span></span>
-<!-- <span>点击刷新获取最新价格：</span>-->
+ <div class="layui-form-item">
+ <div class="layui-col-md10">
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
+ placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
+ </div>
</div>
- <div class="layui-input-inline">
- <span id="countdown"></span>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">结束时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
+ placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
+ </div>
</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-green-plain table-action" id="reset">
- <i class="layui-icon"></i>
- </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"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
</div>
</form>
<table lay-filter="coinPriceTable" lay-data="{id: 'coinPriceTable'}"></table>
@@ -27,61 +37,10 @@
</div>
</div>
</div>
-
-<script type="text/html" id="isJump">
- {{#
- var isJump = {
- 2: {title: '否', color: 'red' },
- 1: {title: '是' , color: 'green'}
- }[d.isJump];
- }}
- <span class="layui-badge febs-bg-{{isJump.color}}">{{ isJump.title }}</span>
-</script>
-<script type="text/html" id="isInside">
- {{#
- var isInside = {
- 2: {title: '外' , color: 'green'},
- 1: {title: '内', color: 'red'}
- }[d.isInside];
- }}
- <span class="layui-badge febs-bg-{{isInside.color}}">{{ isInside.title }}</span>
-</script>
-<script type="text/html" id="showPort">
- {{#
- var showPort = {
- 2: {title: '手机' , color: 'green'},
- 1: {title: 'pc', color: 'red'}
- }[d.showPort];
- }}
- <span class="layui-badge febs-bg-{{showPort.color}}">{{ showPort.title }}</span>
-</script>
-<script type="text/html" id="isTop">
- {{#
- var isTop = {
- 2: {title: '否', color: 'red' },
- 1: {title: '是' , color: 'green'}
- }[d.isTop];
- }}
- <span class="layui-badge febs-bg-{{isTop.color}}">{{ isTop.title }}</span>
-</script>
-<!-- 表格操作栏 start -->
-<script type="text/html" id="user-option">
-<!-- <span shiro:lacksPermission="user:view,user:update,user:delete">-->
-<!-- <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
-<!-- </span>-->
-<!-- <a lay-event="edit" shiro:hasPermission="user:update">编辑-->
- <a lay-event="edit">编辑
- <i class="layui-icon febs-edit-area febs-blue"></i>
- </a>
-<!-- <a lay-event="delete" shiro:hasPermission="user:update">删除-->
- <a lay-event="delete">删除
- <i class="layui-icon febs-edit-area febs-blue"></i>
- </a>
-</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs'], function () {
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs','laydate'], function () {
var $ = layui.jquery,
laydate = layui.laydate,
febs = layui.febs,
@@ -89,13 +48,23 @@
table = layui.table,
dropdown = layui.dropdown,
$view = $('#febs-coin-price'),
+ $query = $view.find('#query'),
$reset = $view.find('#reset'),
$add = $view.find('#add'),
$searchForm = $view.find('form'),
sortObject = {field: 'spread', type: null},
+ laydate = layui.laydate,
tableIns
;
+ //日期范围
+ laydate.render({
+ elem: '#febs-form-group-date-start',type: 'datetime'
+ });
+
+ laydate.render({
+ elem: '#febs-form-group-date-end',type: 'datetime'
+ });
form.render();
// 表格初始化
@@ -106,43 +75,67 @@
var data = obj.data,
layEvent = obj.event;
});
+
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: null}});
+ });
+
+ // 刷新按钮
$reset.on('click', function () {
- // getBalanceOf("0xf5807B8F3691bFfDf155daFdF2f0449e9F6fE423").then(amount => {
- // console.log("余额："+amount);
- // // coinPriceAdd(amount);
- // document.getElementById('countdownBalance').innerHTML = "余额："+amount;
- // });
- // getPrice().then(amount => {
- // console.log("价格："+amount);
- //
- // document.getElementById('countdownPrice').innerHTML = "价格："+amount ;
- // // coinPriceAdd(amount);
- // });
$searchForm[0].reset();
sortObject.type = 'null';
tableIns.reload({where: getQueryParams(), page: {curr: null}, initSort: sortObject});
-
- // getPrice(tokens.tokenA,tokens.tokenB).then(price => {
- // coinPriceAdd(amount);
- // });
});
+ // $reset.on('click', function () {
+ // // getBalanceOf("0xf5807B8F3691bFfDf155daFdF2f0449e9F6fE423").then(amount => {
+ // // console.log("余额："+amount);
+ // // // coinPriceAdd(amount);
+ // // document.getElementById('countdownBalance').innerHTML = "余额："+amount;
+ // // });
+ // // getPrice().then(amount => {
+ // // console.log("价格："+amount);
+ // //
+ // // document.getElementById('countdownPrice').innerHTML = "价格："+amount ;
+ // // // coinPriceAdd(amount);
+ // // });
+ // $searchForm[0].reset();
+ // sortObject.type = 'null';
+ // tableIns.reload({where: getQueryParams(), page: {curr: null}, initSort: sortObject});
+ //
+ // // getPrice(tokens.tokenA,tokens.tokenB).then(price => {
+ // // coinPriceAdd(amount);
+ // // });
+ // });
// 获取查询参数
function getQueryParams() {
- return {};
+ let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
+ let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
+ if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
+ febs.alert.warn('开始时间需要小于结束时间');
+ return{};
+ }
+ return {
+ startTime: $searchForm.find('input[name="startTime"]').val().trim(),
+ endTime: $searchForm.find('input[name="endTime"]').val().trim()
+ };
}
function initTable() {
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'coinPriceTable',
+ totalRow : true,
url: ctx + 'admin/banner/hdRecord',
cols: [[
- // {field: 'id', title: '', minWidth: 10,align:'left'},
- {field: 'coinAmount', title: '滑点累计币量', minWidth: 120,align:'center'},
- {field: 'coinEvery', title: '新增滑点', minWidth: 120,align:'center'},
- {field: 'price', title: '价格', minWidth: 120,align:'center'},
- {field: 'usdtEvery', title: '新增USDT', minWidth: 120,align:'center'},
+ {field: 'id', title: '', minWidth: 10,align:'left',totalRowText:"合计"},
+ {field: 'coinAmount', title: '滑点累计币量', minWidth: 120,align:'center', totalRow:true},
+ {field: 'coinEvery', title: '新增滑点', minWidth: 120,align:'center', totalRow:true},
+ {field: 'price', title: '价格', minWidth: 120,align:'center', totalRow:true},
+ {field: 'usdtEvery', title: '新增USDT', minWidth: 120,align:'center', totalRow:true},
{field: 'createTime', title: '时间', minWidth: 120,align:'center'},
]]
});
diff --git a/src/main/resources/templates/febs/views/modules/banner/coinSet.html b/src/main/resources/templates/febs/views/modules/banner/coinSet.html
index 8b10403..0342850 100644
--- a/src/main/resources/templates/febs/views/modules/banner/coinSet.html
+++ b/src/main/resources/templates/febs/views/modules/banner/coinSet.html
@@ -135,7 +135,7 @@
<!-- </div>-->
<!-- </div>-->
-<!-- <blockquote class="layui-elem-quote blue-border">滑点设置</blockquote>-->
+ <blockquote class="layui-elem-quote blue-border">滑点设置</blockquote>
<!-- <div class="layui-row layui-col-space10 layui-form-item">-->
<!--<!– <div class="layui-col-lg6">–>-->
<!--<!– <label class="layui-form-label febs-form-item-require">钱包GFA：</label>–>-->
--
Gitblit v1.9.1