权限控制

src/main/java/com/boot/security/server/model/AdvertiserData.java

 package com.boot.security.server.model;
 
-public class AdvertiserData {
+public class AdvertiserData implements Comparable<AdvertiserData>{
     public String reportDate;
     public Integer advertiserId;
     public String advertiserName;
@@ -172,4 +172,23 @@ public class AdvertiserData {
     public void setIncome(Double income) {
         this.income = income;
     }
+
+    @Override
+    public int compareTo(AdvertiserData o) {
+        String s1 = this.getMinutes();
+        String s2 = o.getMinutes();
+        Integer hour= Integer.valueOf(s1.split(":")[0]);
+        Integer minute= Integer.valueOf(s1.split(":")[1]);
+        Integer hour1= Integer.valueOf(s2.split(":")[0]);
+        Integer minute1= Integer.valueOf(s2.split(":")[1]);
+        if(hour>hour1){
+            return 1;
+        }else if(hour<hour1){
+            return -1;
+        }else if(hour==hour1&&minute>minute1){
+            return 1;
+        }else {
+            return -1;
+        }
+    }
 }

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

@@ -282,9 +282,11 @@ public class AdvertiserServiceImpl implements AdvertiserService {
 
     public static List<Integer> sortMap(Map map){
         Object[] objects = map.keySet().toArray();
-        Arrays.sort(objects);
+        String[] stringArray = Arrays.copyOf(objects,objects.length, String[].class);
+        bubblingSort(stringArray);
+        //Arrays.sort(objects);
         List<Integer> sum=new ArrayList<>();
-        for(Object obj:objects){
+        for(String obj:stringArray){
             String key=obj.toString();
             Integer count=0;
             sum.add(Integer.valueOf(map.get(key).toString()));
@@ -294,14 +296,16 @@ public class AdvertiserServiceImpl implements AdvertiserService {
 
     public static JSONObject sumByKey(Map<String, List<String>> map){
         Object[] objects = map.keySet().toArray();
-        Arrays.sort(objects);
+        String[] stringArray = Arrays.copyOf(objects,objects.length, String[].class);
+        bubblingSort(stringArray);
+        //Arrays.sort(stringArray);
         JSONObject jsonObject = new JSONObject();
         List<String> dataTime=new ArrayList<>();
         List<Integer> sum=new ArrayList<>();
         //Iterator it=map.keySet().iterator();
-        for(Object obj:objects){
-            String key=obj.toString();
-            dataTime.add(key.split(",")[0]);
+        for(String obj:stringArray){
+            String key=obj;
+            dataTime.add(key);
             Integer count=0;
             List<String> list = map.get(key);
             for (String s : list) {
@@ -325,6 +329,14 @@ public class AdvertiserServiceImpl implements AdvertiserService {
         List<String> dataTime=new ArrayList<>();
         List<Integer> exposure=new ArrayList<>();
         List<Integer> click=new ArrayList<>();
+        if(advertExCl.get(0).getMinutes()!=null){
+            advertExCl.sort(new Comparator<AdvertiserData>() {
+                @Override
+                public int compare(AdvertiserData o1, AdvertiserData o2) {
+                    return o1.compareTo(o2);
+                }
+            });
+        }
         for (AdvertiserData advertiserData : advertExCl) {
             if(advertiserData.getMinutes()!=null){
                 dataTime.add(advertiserData.getMinutes());
@@ -339,4 +351,34 @@ public class AdvertiserServiceImpl implements AdvertiserService {
         jsonObject.put("click",click);
         return jsonObject;
     }
+
+    public static void bubblingSort(String[] arr) {
+        int size = arr.length;
+        for(int i = 0; i<size-1; i++) {
+            for (int j = i+1; j<arr.length; j++) {
+                if(compare(arr[i],arr[j])) {
+                    String temp = arr[i];
+                    arr[i] = arr[j];
+                    arr[j] = temp;
+                }
+            }
+        }
+    }
+
+    public static boolean compare(String s1,String s2){
+        Integer hour= Integer.valueOf(s1.split(":")[0]);
+        Integer minute= Integer.valueOf(s1.split(":")[1]);
+        Integer hour1= Integer.valueOf(s2.split(":")[0]);
+        Integer minute1= Integer.valueOf(s2.split(":")[1]);
+        if(hour>hour1){
+            return true;
+        }else if(hour<hour1){
+            return false;
+        }else if(hour==hour1&&minute>minute1){
+            return true;
+        }else {
+            return false;
+        }
+
+    }
 }