data

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

@@ -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.PageTableRequest;
 import com.boot.security.server.page.table.PageTableResponse;
+import com.boot.security.server.service.AdvertiserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,6 +22,8 @@ import java.util.Map;
 @RequestMapping("/advertiserController")
 public class AdvertiserController {
 
+    @Autowired
+    private AdvertiserService advertiserService;
     @Autowired
     private AdvertDao advertDao;
 
@@ -65,6 +68,8 @@ public class AdvertiserController {
         System.out.println(request.getAdvertiserId()+"....."+request.getAdvertId());
         List<AdvertiserData> advertDataList = advertDao.getAdvertData(request.getStartTime(), request.getEndTime());
         Integer count = advertDao.getAdvertDataCount(request.getStartTime(), request.getEndTime());
+        JSONObject advertiserData = advertiserService.getAdvertiserData(request);
+        advertiserData.toJSONString();
         return PageTableHandler.getJSONObject(advertDataList,count);
     }
 }

src/main/java/com/boot/security/server/service/AdvertiserService.java

 package com.boot.security.server.service;
 
-import com.boot.security.server.model.AdvertiserData;
+import com.alibaba.fastjson.JSONObject;
 import com.boot.security.server.page.table.PageTableRequest;
 
-import java.util.Map;
 
 public interface AdvertiserService {
     /**
      * 根据请求参数获取广告商信息、广告信息、数据概要信息、图标信息
      *
      */
-     Map<String,Object> getAdvertiserData(PageTableRequest request);
+     JSONObject getAdvertiserData(PageTableRequest request);
 }

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

@@ -9,11 +9,13 @@ import com.boot.security.server.service.AdvertiserService;
 import com.boot.security.server.utils.UserUtil;
 import com.boot.security.server.utils.redis.JedisHelper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Service
 public class AdvertiserServiceImpl implements AdvertiserService {
     @Autowired
     private AdvertDao advertDao;