权限控制

src/main/java/com/boot/security/server/controller/AdvertiserController.java

@@ -39,6 +39,7 @@ public class AdvertiserController {
     @ApiOperation(value = "获取广告数据汇总")
     @ResponseBody
     public String getAdvertiserDataCount(@RequestBody PageTableRequest request) {
+        System.out.println(request.getStartTime()+":"+request.getEndTime());
         List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime());
         Integer count = advertDao.getAdvertDataCount(request.getStartTime(), request.getEndTime());
         return PageTableHandler.getJSONObject(advertDataList,count);

src/main/java/com/boot/security/server/service/impl/AdvertiserServiceImpl.java

@@ -44,6 +44,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
                 jsonObject.put("exposure",chartInfo.get("exposure"));
                 jsonObject.put("click",chartInfo.get("click"));
             }else if(advertiserId!=null&&advertId!=null){
+                advert=advertDao.getAdvertDataById(advertiserId);
                 schema=advertDao.getAdvertiserDataById(advertiserId);
                 JSONObject chartInfo = getRedisChartInfo(advertiserId, advertId);
                 jsonObject.put("dataTime",chartInfo.get("dataTime"));
@@ -61,6 +62,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
                 jsonObject.put("exposure",mysqlChartInfo.get("exposure"));
                 jsonObject.put("click",mysqlChartInfo.get("click"));
             }else if(advertiserId!=null&&advertId!=null){
+                advert=advertDao.getAdvertDataById(advertiserId);
                 schema=advertDao.getAdvertiserDataById(advertiserId);
                 List<AdvertiserData> advertExCl=null;
                 if(advertId.equals("all")){
@@ -75,6 +77,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             }
         }else {
             if(advertId.equals("all")){
+                advert=advertDao.getAdvertDataById(advertiserId);
                 schema=advertDao.getAdvertiserDataById(advertiserId);
                 List<AdvertiserData> advertExClDays = advertDao.getAdvertExClDay(advertiserId, startTime, endTime);
                 JSONObject mysqlChartInfo = getMysqlChartInfo(advertExClDays);
@@ -82,6 +85,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
                 jsonObject.put("exposure",mysqlChartInfo.get("exposure"));
                 jsonObject.put("click",mysqlChartInfo.get("click"));
             }else {
+                advert=advertDao.getAdvertDataById(advertiserId);
                 schema=advertDao.getAdvertiserDataById(advertiserId);
                 List<AdvertiserData> advertExClDays = advertDao.getAdvertExClDays(advertiserId, advertId,startTime, endTime);
                 JSONObject mysqlChartInfo = getMysqlChartInfo(advertExClDays);

src/main/resources/static/pages/advertiserManager/advertiserData.html

@@ -12,7 +12,7 @@
 
     <div class="layui-form">
         <div style="width: 160px">
-            <select name=""  style="" id="advertiser">
+            <select name=""  style="" id="advertiser" lay-filter="advertiser">
                 <!--<option value="12">请选择一个广告商</option>-->
                 <!--<option value="010">北京</option>-->
                 <!--<option value="021">上海</option>-->
@@ -47,7 +47,7 @@
                     <input type="text" class="layui-input" id="date1">
             </div>
             <div class="" style="width: 160px;float: right">
-                <select name=""  style="" id="advert">
+                <select name=""  style="" id="advertId" lay-filter="advert">
                     <option value="all">全部</option>
                     <!--<option value="010">912</option>-->
                     <!--<option value="021">917</option>-->
@@ -71,7 +71,6 @@
 <script src="../../js/libs/jquery.treetable.js"></script>
 <script type="text/javascript" src="../../js/echarts.min.js"></script>
 <script>
-    var tableIns;
     var startTime;
     var endTime;
     var advertiserId;
@@ -80,15 +79,16 @@
     startTime = day.format("yyyy-MM-dd");
     endTime=day.format("yyyy-MM-dd");
     var advertiser=$("#advertiser");
-    var advert=$("#advert");
+    var advert=$("#advertId");
     var table=$("#schema");
     var dataTime;
     var click;
     var exposure;
+    advertiserId=$("#advertiser").val();
+    advertId=$("#advertId").val();
+
 
     function init(){
-        advertiserId=$("#advertiser").val();
-        advertId=$("#advert").val();
         var list={advertiserId:advertiserId,advertId:advertId,startTime:startTime,endTime:endTime};
         $.ajax({
             //请求方式
@@ -121,10 +121,23 @@
         }
     }
 
+    function setOptionRm(advertData){
+        advert.empty();
+        advert.append("<option value="+"all"+">全部</option>");
+        for(j = 0,len=advertData.length; j < len; j++) {
+            advert.append("<option value="+advertData[j].codeId+">"+advertData[j].codeId+"</option>");
+        }
+    }
+
     function setTable(data) {
         table.append("<tr><td>"+data.balance+"</td><td>"+data.income+"</td><td>"+data.exposure+"</td><td>"+data.click+"</td><td>"+data.incomeSeven+"</td><td>"+data.incomeThirty+"</td></tr>");
     }
 
+    function setTableRm(data) {
+        table.empty();
+        table.append("<tr><td>"+data.balance+"</td><td>"+data.income+"</td><td>"+data.exposure+"</td><td>"+data.click+"</td><td>"+data.incomeSeven+"</td><td>"+data.incomeThirty+"</td></tr>");
+    }
+
     layui.use('laydate', function(){
         var laydate = layui.laydate;
         laydate.render({
@@ -134,14 +147,98 @@
             ,done: function(value, date, endDate) {
                 startTime=date.year+'-'+date.month+'-'+date.date
                 endTime=endDate.year+'-'+endDate.month+'-'+endDate.date
-                tableIns.reload({where:{startTime:startTime,endTime:endTime}})
+                var list={advertiserId:advertiserId,advertId:advertId,startTime:startTime,endTime:endTime};
+                $.ajax({
+                    //请求方式
+                    type : "post",
+                    //请求的媒体类型
+                    contentType: "application/json;charset=UTF-8",
+                    //请求地址
+                    url : "/advertiserController/advertiserData",
+                    async:false,
+                    //数据，json字符串
+                    data : JSON.stringify(list),
+                    //请求成功
+                    success : function(result) {
+                        var jsonObj = JSON.parse(result);
+                        setOptionRm(jsonObj.advert);
+                        setTableRm(jsonObj.schema);
+                        dataTime=jsonObj.dataTime;
+                        exposure=jsonObj.exposure;
+                        click=jsonObj.click;
+                        option.xAxis.data=dataTime;
+                        option.series[0].data=exposure;
+                        option.series[1].data=click;
+                        myChart.setOption(option,true);
+                    }
+                });
             }
         });
     });
 
     layui.use('form', function(){
         var form = layui.form;
+        form.on('select(advertiser)', function(data){
+            advertiserId=data.value;
+            var list={advertiserId:advertiserId,advertId:advertId,startTime:startTime,endTime:endTime};
+            $.ajax({
+                //请求方式
+                type : "post",
+                //请求的媒体类型
+                contentType: "application/json;charset=UTF-8",
+                //请求地址
+                url : "/advertiserController/advertiserData",
+                async:false,
+                //数据，json字符串
+                data : JSON.stringify(list),
+                //请求成功
+                success : function(result) {
+                    console.log(result);
+                    var jsonObj = JSON.parse(result);
+                    setOptionRm(jsonObj.advert);
+                    setTableRm(jsonObj.schema);
+                    dataTime=jsonObj.dataTime;
+                    exposure=jsonObj.exposure;
+                    click=jsonObj.click;
+                    option.xAxis.data=dataTime;
+                    option.series[0].data=exposure;
+                    option.series[1].data=click;
+                    myChart.setOption(option,true);
+                    form.render('select');
+                }
             });
+        });
+        form.on('select(advert)', function(data){
+            console.log(data.value); //得到被选中的值
+            advertId=data.value;
+            var list={advertiserId:advertiserId,advertId:advertId,startTime:startTime,endTime:endTime};
+            $.ajax({
+                //请求方式
+                type : "post",
+                //请求的媒体类型
+                contentType: "application/json;charset=UTF-8",
+                //请求地址
+                url : "/advertiserController/advertiserData",
+                async:false,
+                //数据，json字符串
+                data : JSON.stringify(list),
+                //请求成功
+                success : function(result) {
+                    var jsonObj = JSON.parse(result);
+                    setOptionRm(jsonObj.advert);
+                    setTableRm(jsonObj.schema);
+                    dataTime=jsonObj.dataTime;
+                    exposure=jsonObj.exposure;
+                    click=jsonObj.click;
+                    option.xAxis.data=dataTime;
+                    option.series[0].data=exposure;
+                    option.series[1].data=click;
+                    myChart.setOption(option,true);
+                }
+            });
+        });
+    });
+
 
 
     init();

src/main/resources/static/pages/advertiserManager/advertiserDataCount.html

@@ -13,7 +13,7 @@
     <input type="text" class="layui-input" id="date1">
 </div>
 
-<table id="demo" lay-filter="adveriserManagerTable"></table>
+<table id="demo" lay-filter="adveriserDataCount"></table>
 
 </body>
 </html>
@@ -38,8 +38,29 @@
             ,range: true
             ,value:startTime+' - '+endTime
             ,done: function(value, date, endDate) {
-                startTime=date.year+'-'+date.month+'-'+date.date
-                endTime=endDate.year+'-'+endDate.month+'-'+endDate.date
+                var sday=date.date;
+                var smonth=date.month;
+                var eday=endDate.date;
+                var emonth=endDate.month;
+                var snumberd = parseInt(sday);
+                var snumberm = parseInt(smonth);
+                var enumberd = parseInt(eday);
+                var enumberm = parseInt(emonth);
+                if(snumberd<10){
+                    sday='0'+sday;
+
+                }
+                if(snumberm<10){
+                    smonth='0'+smonth
+                }
+                if(enumberd<10){
+                    eday='0'+eday;
+                }
+                if(enumberm<10){
+                    emonth='0'+emonth
+                }
+                startTime=date.year+'-'+smonth+'-'+sday;
+                endTime=endDate.year+'-'+emonth+'-'+eday;
                 tableIns.reload({where:{startTime:startTime,endTime:endTime}})
             }
         });
@@ -74,7 +95,19 @@
                 ,{field: 'income', title: '收入'}
                 ,{field: 'advertiserName', title: '广告主名称'}
             ]]
-            ,defaultToolbar: ['filter', 'exports']
+            ,defaultToolbar: ['filter', 'exports',{
+                title: '上传' //标题
+                ,layEvent: 'upload' //事件名，用于 toolbar 事件中使用
+                ,icon: 'layui-icon-addition' //图标类名
+            }]
+        });
+
+        table.on('toolbar(adveriserDataCount)', function(obj){
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('idTest');
+            if(layEvent === 'upload'){ //上传
+                layer.msg('upload');
+            }
         });
 
 

src/main/resources/static/pages/advertiserManager/advertiserManager.html

@@ -47,20 +47,9 @@
                 ,{field: 'clickView', title: '点击系数',edit:'text'}
                 // ,{fixed: 'right', align:'center', toolbar: '#viewData'}
             ]]
-            ,defaultToolbar: ['filter', 'exports', {
-                title: '上传' //标题
-                ,layEvent: 'upload' //事件名，用于 toolbar 事件中使用
-                ,icon: 'layui-icon-addition' //图标类名
-            }]
+            ,defaultToolbar: ['filter', 'exports']
         });
 
-        table.on('toolbar(adveriserManagerTable)', function(obj){
-            var layEvent = obj.event;
-            var checkStatus = table.checkStatus('idTest');
-            if(layEvent === 'upload'){ //查看
-                layer.msg('upload');
-            }
-        });
 
         /*
         table.on('tool(adveriserManagerTable)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"