Skip to content

L
lwby_copyright_book_data
Commit c8f7d317 authored by maliang's avatar maliang
Browse files
Options

Merge branch 'master' of http://gitlab.ibreader.com/maliang/lwby_ad_data into lwby_advert_1

parents a41e97a3 edf5ac65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 9 deletions
src/main/java/com/boot/security/server/controller/AdvertiserManagerController.java → src/main/java/com/boot/security/server/controller/AdvertiserController.java
View file @ c8f7d317
......@@ -18,8 +18,8 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/advertiserManagerController")
public class AdvertiserManagerController {
@RequestMapping("/advertiserController")
public class AdvertiserController {
@Autowired
private AdvertDao advertDao;
......@@ -45,10 +45,10 @@ public class AdvertiserManagerController {
jsonObject.put("data",array);
return jsonObject.toJSONString();
}
//返回根据日期返回所有广告商数据
//返回根据日期返回所有广告汇总数据
@PreAuthorize("hasAuthority('advert:data:count')")
@PostMapping("/advertCount")
@ApiOperation(value = "获取广告商汇总数据")
@ApiOperation(value = "获取广告汇总数据")
@ResponseBody
public String getAdvertiserDataCount(@RequestBody PageTableRequest request) {
List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime());
......@@ -56,10 +56,10 @@ public class AdvertiserManagerController {
return PageTableHandler.getJSONObject(advertDataList,count);
}
//返回根据日期返回所有广告商数据
//返回根据日期返回所有广告主数据
@PreAuthorize("hasAuthority('advertiser:data')")
@PostMapping("/advertiserData")
@ApiOperation(value = "获取广告商汇总数据")
@ApiOperation(value = "获取广告主数据")
@ResponseBody
public String getAdvertiserData(@RequestBody PageTableRequest request) {
List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime());
......
src/main/resources/static/js/echarts.min.js 0 → 100644
View file @ c8f7d317
This diff is collapsed.
src/main/resources/static/pages/advertiserManager/advertiserData.html
View file @ c8f7d317
......@@ -14,7 +14,11 @@
<input type="text" class="layui-input" id="date1">
</div>
<table class="layui-table"><tr><td>投放概要</td></tr><tr><td><table id="demo" lay-filter="adveriserManagerTable"></table></td></tr></table>
<table class="layui-table"><tr><td style="font-size:16px;font-weight:bold">投放概要</td></tr><tr><td><table id="demo" lay-filter="adveriserManagerTable"></table></td></tr></table>
<!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
<div id="main" style="width: 100%;height:800px;"></div>
</div>
</body>
......@@ -25,6 +29,7 @@
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/my/permission.js"></script>
<script src="../../js/libs/jquery.treetable.js"></script>
<script type="text/javascript" src="../../js/echarts.min.js"></script>
<script>
var tableIns;
......@@ -52,7 +57,7 @@
//第一个实例
tableIns=table.render({
elem: '#demo'
,url: '/advertiserManagerController/advertiserData' //数据接口
,url: '/advertiserController/advertiserData' //数据接口
,contentType: 'application/json'
,method:'post'
//,toolbar:'true'
......@@ -74,6 +79,110 @@
});
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById('main'));
// 指定图表的配置项和数据
var option = {
title: {
text: '广告数据'
},
tooltip: {
trigger: 'axis' // axis item none三个值
},
legend: {
type:'scroll',
bottom:'0%',
data:['曝光','点击']
},
xAxis: {
type: 'category',
name: '时间',
data: ["2020-04-16","2020-04-17","2020-04-18","2020-04-19","2020-04-20","2020-04-21","2020-04-22","2020-04-23"]
},
yAxis: {name: '曝光/点击量'},
series: [{
name: '曝光',
type: 'line',
smooth: true , //true 为平滑曲线
itemStyle: {
// 线性渐变，前四个参数分别是 x0, y0, x2, y2, 范围从 0 - 1，相当于在图形包围盒中的百分比，如果 globalCoord 为 `true`，则该四个值是绝对的像素位置
color: {
type: 'linear',
x: 0,
y: 0.4,
x2: 0.7,
y2: 1,
colorStops: [{
offset: 0, color: 'rgb(198,226,255)' // 0% 处的颜色
}, {
offset: 1, color: 'rgb(58,95,205)' // 100% 处的颜色
},{
offset: 0.4, color: 'rgb(67,110,238)' // 40% 处的颜色
}],
global: false // 缺省为 false
}
},//线条样式
areaStyle:{
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: 'rgb(67,110,238,0.7)'// 0% 处的颜色
}, {
offset: 1, color: 'rgb(198,226,255,0.4)' // 100% 处的颜色
}],
global: false // 缺省为 false
}
},
data: [551, 2002, 3651, 1007, 1989, 2014,2789,455]
},{
name: '点击',
type: 'line',
smooth: true , //true 为平滑曲线
itemStyle: {
// 线性渐变，前四个参数分别是 x0, y0, x2, y2, 范围从 0 - 1，相当于在图形包围盒中的百分比，如果 globalCoord 为 `true`，则该四个值是绝对的像素位置
color: {
type: 'linear',
x: 0,
y: 0.4,
x2: 0.7,
y2: 1,
colorStops: [{
offset: 0, color: 'rgb(255,99,71)' // 0% 处的颜色
}, {
offset: 1, color: 'rgb(205,55,0)' // 100% 处的颜色
},{
offset: 0.4, color: 'rgb(255,69,0)' // 40% 处的颜色
}],
global: false // 缺省为 false
}
},//线条样式
areaStyle:{
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: 'rgb(255,48,48,0.7)' // 0% 处的颜色
}, {
offset: 1, color: 'rgb(255,106,106,0.4)'// 100% 处的颜色
}],
global: false // 缺省为 false
}
},
data: [402, 1001, 2347, 771, 1110, 1556,2554,277]
}]
};
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option);
</script>
......
src/main/resources/static/pages/advertiserManager/advertiserManager.html
View file @ c8f7d317
......@@ -30,7 +30,7 @@
var tableIns=table.render({
id: 'idTest'
,elem: '#demo'
,url: '/advertiserManagerController/table' //数据接口
,url: '/advertiserController/table' //数据接口
,toolbar:'true'
,page: true //开启分页
,cols: [[ //表头
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment