Commit 09fd9910 authored by maliang's avatar maliang

权限控制

parent e373a3c9
...@@ -8,6 +8,7 @@ import com.boot.security.server.model.AdvertiserData; ...@@ -8,6 +8,7 @@ import com.boot.security.server.model.AdvertiserData;
import com.boot.security.server.page.table.PageTableHandler; import com.boot.security.server.page.table.PageTableHandler;
import com.boot.security.server.page.table.PageTableRequest; import com.boot.security.server.page.table.PageTableRequest;
import com.boot.security.server.service.AdvertiserService; import com.boot.security.server.service.AdvertiserService;
import com.boot.security.server.utils.UserUtil;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -39,8 +40,9 @@ public class AdvertiserController { ...@@ -39,8 +40,9 @@ public class AdvertiserController {
@ApiOperation(value = "获取广告数据汇总") @ApiOperation(value = "获取广告数据汇总")
@ResponseBody @ResponseBody
public String getAdvertiserDataCount(@RequestBody PageTableRequest request) { public String getAdvertiserDataCount(@RequestBody PageTableRequest request) {
List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime()); Long id = UserUtil.getLoginUser().getId();
Integer count = advertDao.getAdvertDataCount(request.getStartTime(), request.getEndTime()); List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime(),id);
Integer count = advertDao.getAdvertDataCount(request.getStartTime(), request.getEndTime(),id);
return PageTableHandler.getJSONObject(advertDataList,count); return PageTableHandler.getJSONObject(advertDataList,count);
} }
...@@ -50,8 +52,6 @@ public class AdvertiserController { ...@@ -50,8 +52,6 @@ public class AdvertiserController {
@ApiOperation(value = "获取广告主数据") @ApiOperation(value = "获取广告主数据")
@ResponseBody @ResponseBody
public String getAdvertiserData(@RequestBody PageTableRequest request) { public String getAdvertiserData(@RequestBody PageTableRequest request) {
List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime());
Integer count = advertDao.getAdvertDataCount(request.getStartTime(), request.getEndTime());
JSONObject advertiserData = advertiserService.getAdvertiserData(request); JSONObject advertiserData = advertiserService.getAdvertiserData(request);
return advertiserData.toJSONString(); return advertiserData.toJSONString();
} }
......
...@@ -7,11 +7,11 @@ import java.util.List; ...@@ -7,11 +7,11 @@ import java.util.List;
@Mapper @Mapper
public interface AdvertDao { public interface AdvertDao {
@Select("select report_date reportDate,advertiser_id advertiserId,advertiser_name advertiserName,code_id codeId,ecpm,cpc,exposure,click,income from advert_data_count t where report_date>= #{startTime} and report_date<=#{endTime}") @Select("select report_date reportDate,t.advertiser_id advertiserId,advertiser_name advertiserName,code_id codeId,ecpm,cpc,exposure,click,income from advert_data_count t inner join (select advertiser_id from advertiser_user_map where user_id=#{userId} and status=1) t1 on t.advertiser_id=t1.advertiser_id where report_date>= #{startTime} and report_date<=#{endTime}")
List<AdvertiserData> getAdvertData(@Param("startTime") String startTime, @Param("endTime") String endTime); List<AdvertiserData> getAdvertData(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
@Select("select count(*) from advert_data_count t where report_date>= #{startTime} and report_date<=#{endTime}") @Select("select count(*) from advert_data_count t inner join (select advertiser_id from advertiser_user_map where user_id=#{userId} and status=1) t1 on t.advertiser_id=t1.advertiser_id where report_date>= #{startTime} and report_date<=#{endTime}")
Integer getAdvertDataCount(@Param("startTime") String startTime, @Param("endTime") String endTime); Integer getAdvertDataCount(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
@Select("select advertiser_id advertiserId,advertiser_name advertiserName from advertiser_user_map t where user_id=#{userId} and status=1") @Select("select advertiser_id advertiserId,advertiser_name advertiserName from advertiser_user_map t where user_id=#{userId} and status=1")
List<AdvertiserData> getAdvertiserByUserId(@Param("userId") Long userId); List<AdvertiserData> getAdvertiserByUserId(@Param("userId") Long userId);
......
...@@ -71,12 +71,6 @@ ...@@ -71,12 +71,6 @@
}); });
}); });
$.ajax({
type : 'post',
url : '/advertiserController/advertCount',
success : function(data) {
}
});
layui.use('table', function(){ layui.use('table', function(){
var table = layui.table; var table = layui.table;
......
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