权限控制

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.service.AdvertiserService;
+import com.boot.security.server.service.impl.AdvertiserServiceImpl;
 import com.boot.security.server.utils.UserUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -241,15 +241,34 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             JSONObject resultExposure = sumByKey(exposure);
             Map emap=resultExposure.getObject("map",Map.class);
             Map cmap=resultClick.getObject("map",Map.class);
-            Set keySet = emap.keySet();
-            for (Object o : keySet) {
-                if(!cmap.containsKey(o)){
-                    cmap.put(o,0);
+            List<String> dataTime = getDataTime();
+            for (String s : dataTime) {
+                String hour = s.split(":")[0];
+                String key="";
+                if(hour.equals("0")||hour.equals("1")||hour.equals("2")||hour.equals("3")||hour.equals("4")||hour.equals("5")||hour.equals("6")||hour.equals("7")||hour.equals("8")||hour.equals("9")){
+                    key="0"+hour+":"+s.split(":")[1];
                 }
+                if(cmap.containsKey(key)){
+                    Integer o = (Integer)cmap.get(key);
+                    cmap.remove(key);
+                    cmap.put(s,o);
                 }
-            jsonObject.put("dataTime",resultExposure.get("dataTime"));
+                if(emap.containsKey(key)){
+                    Integer o = (Integer)emap.get(key);
+                    emap.remove(key);
+                    emap.put(s,o);
+                }
+                if(!cmap.containsKey(s)){
+                    cmap.put(s,0);
+                }
+                if(!emap.containsKey(s)){
+                    emap.put(s,0);
+                }
+            }
+            jsonObject.put("dataTime",dataTime);
             jsonObject.put("click",sortMap(cmap));
-            jsonObject.put("exposure",resultExposure.get("sum"));
+            //jsonObject.put("exposure",resultExposure.get("sum"));
+            jsonObject.put("exposure",sortMap(emap));
         }else {
             Map<String, List<String>> click = minutesCodeIdClick.stream().filter(x->x.split(",")[1].equals(advertId)).collect(Collectors.groupingBy(x -> x.split(",")[0]));
             Map<String, List<String>> exposure = minutesCodeIdExposure.stream().filter(x->x.split(",")[1].equals(advertId)).collect(Collectors.groupingBy(x -> x.split(",")[0]));
@@ -257,15 +276,33 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             JSONObject resultExposure = sumByKey(exposure);
             Map emap=resultExposure.getObject("map",Map.class);
             Map cmap=resultClick.getObject("map",Map.class);
-            Set keySet = emap.keySet();
-            for (Object o : keySet) {
-                if(!cmap.containsKey(o)){
-                    cmap.put(o,0);
+            List<String> dataTime = getDataTime();
+            for (String s : dataTime) {
+                String hour = s.split(":")[0];
+                String key="";
+                if(hour.equals("0")||hour.equals("1")||hour.equals("2")||hour.equals("3")||hour.equals("4")||hour.equals("5")||hour.equals("6")||hour.equals("7")||hour.equals("8")||hour.equals("9")){
+                    key="0"+hour+":"+s.split(":")[1];
+                }
+                if(cmap.containsKey(key)){
+                    Integer o = (Integer)cmap.get(key);
+                    cmap.remove(key);
+                    cmap.put(s,o);
+                }
+                if(emap.containsKey(key)){
+                    Integer o = (Integer)emap.get(key);
+                    emap.remove(key);
+                    emap.put(s,o);
+                }
+                if(!cmap.containsKey(s)){
+                    cmap.put(s,0);
                 }
+                if(!emap.containsKey(s)){
+                    emap.put(s,0);
                 }
-            jsonObject.put("dataTime",resultExposure.get("dataTime"));
+            }
+            jsonObject.put("dataTime",dataTime);
             jsonObject.put("click",sortMap(cmap));
-            jsonObject.put("exposure",resultExposure.get("sum"));
+            jsonObject.put("exposure",sortMap(emap));
         }
         return jsonObject;
     }
@@ -338,21 +375,67 @@ public class AdvertiserServiceImpl implements AdvertiserService {
                 }
             });
         }
+        Map<String,Integer> emap=new HashMap<>();
+        Map<String,Integer> cmap=new HashMap<>();
+
         for (AdvertiserData advertiserData : advertExCl) {
             if(advertiserData.getMinutes()!=null){
-                dataTime.add(advertiserData.getMinutes());
+                String hour = advertiserData.getMinutes().split(":")[0];
+                if(hour.equals("00")||hour.equals("01")||hour.equals("02")||hour.equals("03")||hour.equals("04")||hour.equals("05")||hour.equals("06")||hour.equals("07")||hour.equals("08")||hour.equals("09")){
+                    if(hour.equals("00")){
+                        emap.put("0:"+advertiserData.getMinutes().split(":")[1],advertiserData.getExposure());
+                        cmap.put("0:"+advertiserData.getMinutes().split(":")[1],advertiserData.getClick());
+                    }else {
+                        emap.put(hour.split("0")[1]+":"+advertiserData.getMinutes().split(":")[1],advertiserData.getExposure());
+                        cmap.put(hour.split("0")[1]+":"+advertiserData.getMinutes().split(":")[1],advertiserData.getClick());
+                    }
+
+                }else {
+                    emap.put(advertiserData.getMinutes(),advertiserData.getExposure());
+                    cmap.put(advertiserData.getMinutes(),advertiserData.getClick());
+                }
             }else {
                 dataTime.add(advertiserData.getReportDate());
             }
             exposure.add(advertiserData.getExposure());
             click.add(advertiserData.getClick());
         }
+        if(advertExCl.get(0).getMinutes()!=null){
+            dataTime=getDataTime();
+            for (String s : dataTime) {
+                if(!cmap.containsKey(s)){
+                    cmap.put(s,0);
+                }
+                if(!emap.containsKey(s)){
+                    emap.put(s,0);
+                }
+            }
+
+            jsonObject.put("dataTime",dataTime);
+            jsonObject.put("exposure",sortMap(emap));
+            jsonObject.put("click",sortMap(cmap));
+        }else {
             jsonObject.put("dataTime",dataTime);
             jsonObject.put("exposure",exposure);
             jsonObject.put("click",click);
+        }
+
         return jsonObject;
     }
 
+    public static List<String> getDataTime(){
+        List<String> list = new ArrayList<>();
+        for (int i=0;i<24;i++){
+            for (int j=0;j<=55;j+=5){
+                if(j==0||j==5){
+                    list.add(i+":"+"0"+j);
+                }
+                list.add(i+":"+j);
+            }
+        }
+        return list;
+    }
+
     public static void bubblingSort(String[] arr) {
         int size = arr.length;
         for(int i = 0; i<size-1; i++) {
@@ -386,20 +469,91 @@ public class AdvertiserServiceImpl implements AdvertiserService {
     public void calculationSchema(){
         //根据advert_data_count计算总收入、昨日收入、七日收入、30日收入插入到advertiser_data_count
         List<AdvertiserData> advertiserDataIncome = advertDao.getAdvertiserDataIncome();
+        List<AdvertiserData> advertiserData = advertDao.getAdvertiserData();
+        List<AdvertiserData> ad0=new ArrayList<>();
+        boolean flag;
+        for (AdvertiserData advertiserDatum : advertiserData) {
+            flag=false;
+            if(advertiserDataIncome.size()==0){
+                ad0=advertiserData;
+                break;
+            }else {
+                for (AdvertiserData data : advertiserDataIncome) {
+                    if(data.getAdvertiserId().equals(advertiserDatum.getAdvertiserId())){
+                        flag=true;
+                    }
+                }
+                if(flag==false){
+                    advertiserDatum.setIncome(0.0);
+                    ad0.add(advertiserDatum);
+                }
+            }
+        }
         if(advertiserDataIncome.size()>0){
             advertDao.insertAdvertiserDataIncome(advertiserDataIncome);
         }
+        if(ad0.size()>0){
+            advertDao.insertAdvertiserDataIncome(ad0);
+        }
+
+
         List<AdvertiserData> advertiserDataTotalIncome = advertDao.getAdvertiserDataTotalIncome();
         if(advertiserDataTotalIncome.size()>0){
             advertDao.insertAdvertiserDataTotalIncome(advertiserDataTotalIncome);
         }
+
         List<AdvertiserData> advertiserDataSevenIncome = advertDao.getAdvertiserDataSevenIncome();
         if(advertiserDataSevenIncome.size()>0){
             advertDao.insertAdvertiserDataSevenIncome(advertiserDataSevenIncome);
         }
+        ad0.clear();
+        for (AdvertiserData advertiserDatum : advertiserData) {
+            flag=false;
+            if(advertiserDataSevenIncome.size()==0){
+                ad0=advertiserData;
+                break;
+            }else {
+                for (AdvertiserData data : advertiserDataSevenIncome) {
+                    if(data.getAdvertiserId().equals(advertiserDatum.getAdvertiserId())){
+                        flag=true;
+                    }
+                }
+                if(flag==false){
+                    advertiserDatum.setIncomeSeven(0.0);
+                    ad0.add(advertiserDatum);
+                }
+            }
+        }
+        if(ad0.size()>0){
+            advertDao.insertAdvertiserDataSevenIncome(ad0);
+        }
+
+
         List<AdvertiserData> advertiserDataThirtyIncome = advertDao.getAdvertiserDataThirtyIncome();
         if(advertiserDataThirtyIncome.size()>0){
             advertDao.insertAdvertiserDataThirtyIncome(advertiserDataThirtyIncome);
         }
+        ad0.clear();
+        for (AdvertiserData advertiserDatum : advertiserData) {
+            flag=false;
+            if(advertiserDataThirtyIncome.size()==0){
+                ad0=advertiserData;
+                break;
+            }else {
+                for (AdvertiserData data : advertiserDataThirtyIncome) {
+                    if(data.getAdvertiserId().equals(advertiserDatum.getAdvertiserId())){
+                        flag=true;
+                    }
+                }
+                if(flag==false){
+                    advertiserDatum.setIncomeThirty(0.0);
+                    ad0.add(advertiserDatum);
+                }
+            }
+        }
+        if(ad0.size()>0){
+            advertDao.insertAdvertiserDataThirtyIncome(ad0);
+        }
+
     }
 }