权限控制

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

 package com.boot.security.server.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.boot.security.server.dao.AdvertDao;
 import com.boot.security.server.dto.LoginUser;
@@ -236,7 +237,15 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             Map<String, List<String>> exposure = minutesCodeIdExposure.stream().collect(Collectors.groupingBy(x -> x.split(",")[0]));
             JSONObject resultClick = sumByKey(click);
             JSONObject resultExposure = sumByKey(exposure);
-            jsonObject.put("dataTime",resultClick.get("dataTime"));
+            Map emap=JSON.parseObject(resultExposure.getString("map"));
+            Map cmap=JSON.parseObject(resultClick.getString("map"));
+            Set keySet = emap.keySet();
+            for (Object o : keySet) {
+                if(!cmap.containsKey(o)){
+                    cmap.put(o,0);
+                }
+            }
+            jsonObject.put("dataTime",resultExposure.get("dataTime"));
             jsonObject.put("click",resultClick.get("sum"));
             jsonObject.put("exposure",resultExposure.get("sum"));
         }else {
@@ -244,7 +253,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             Map<String, List<String>> exposure = minutesCodeIdExposure.stream().filter(x->x.split(",")[1].equals(advertId)).collect(Collectors.groupingBy(x -> x.split(",")[0]));
             JSONObject resultClick = sumByKey(click);
             JSONObject resultExposure = sumByKey(exposure);
-            jsonObject.put("dataTime",resultClick.get("dataTime"));
+            jsonObject.put("dataTime",resultExposure.get("dataTime"));
             jsonObject.put("click",resultClick.get("sum"));
             jsonObject.put("exposure",resultExposure.get("sum"));
         }
@@ -280,8 +289,13 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             }
             sum.add(count);
         }
+        HashMap<String, Integer> hashMap = new HashMap<>();
+        for (int i=0;i<dataTime.size();i++){
+            hashMap.put(dataTime.get(i),sum.get(i));
+        }
         jsonObject.put("dataTime",dataTime);
         jsonObject.put("sum",sum);
+        jsonObject.put("map",hashMap);
         return jsonObject;
     }