1

src/main/java/com/fdkankan/manage/service/IDataService.java

@@ -12,7 +12,7 @@ public interface IDataService {
 
     SceneTotalVo sceneTotal(SceneTotalParam param);
 
-    List<SceneTrendVoList>  sceneTrend(SceneTotalParam param);
+    List<SceneTrendVo>  sceneTrend(SceneTotalParam param);
 
     Object districtScatter(SceneTotalParam param);
 

src/main/java/com/fdkankan/manage/service/impl/DataService.java

@@ -95,7 +95,7 @@ public class DataService implements IDataService {
     }
 
     @Override
-    public  List<SceneTrendVoList>  sceneTrend(SceneTotalParam param) {
+    public  List<SceneTrendVo>  sceneTrend(SceneTotalParam param) {
         commonSetParam(param);
 
         List<String> datesStr = new ArrayList<>();
@@ -106,33 +106,23 @@ public class DataService implements IDataService {
         }
         HashMap<String,Long> sceneMap = new HashMap<>();
         HashMap<String,Long> userMap = new HashMap<>();
-        datesStr.forEach(e ->sceneMap.put(e,0L));
-        datesStr.forEach(e ->userMap.put(e,0L));
 
         List<GroupByCountVo> groupByCounts = dataMapper.getSceneGroupByDay(param);
         groupByCounts.forEach(e ->sceneMap.put(e.getGroupKey(),e.getTotalCount()));
 
         List<GroupByCountVo> userCount = dataMapper.getUserGroupByDay(param);
-        userCount.forEach(e ->userMap.put(e.getGroupKey(),userMap.get(e.getGroupKey() +1)));
-
-        List<GroupByCountVo> sceneList = new ArrayList<>();
-        for (String key : sceneMap.keySet()) {
-            sceneList.add(new GroupByCountVo(key,sceneMap.get(key)));
+        for (GroupByCountVo groupByCountVo : userCount) {
+            if(userMap.get(groupByCountVo.getGroupKey()) != null){
+                userMap.put(groupByCountVo.getGroupKey(), userMap.get(groupByCountVo.getGroupKey()) +1);
+            }else {
+                userMap.put(groupByCountVo.getGroupKey(),1L);
+            }
         }
-        List<GroupByCountVo> userList = new ArrayList<>();
-        for (String key : userMap.keySet()) {
-            userList.add(new GroupByCountVo(key,userMap.get(key)));
+        List<SceneTrendVo> reList = new ArrayList<>();
+        for (String key : datesStr) {
+            reList.add(new SceneTrendVo(key,userMap.get(key),sceneMap.get(key)));
         }
 
-        List<SceneTrendVoList> reList = new ArrayList<>();
-        SceneTrendVoList sceneTrendVoList = new SceneTrendVoList();
-        sceneTrendVoList.setType("scene");
-        sceneTrendVoList.setList(sceneList);
-        reList.add(sceneTrendVoList);
-        SceneTrendVoList sceneTrendVoList2 = new SceneTrendVoList();
-        sceneTrendVoList2.setType("user");
-        sceneTrendVoList2.setList(userList);
-        reList.add(sceneTrendVoList2);
         return reList;
     }
 

src/main/java/com/fdkankan/manage/service/impl/SysRoleServiceImpl.java

@@ -102,7 +102,7 @@ public class SysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> imp
     public Boolean isSuperAdmin() {
         List<String> roleList = StpUtil.getRoleList();
         for (String roleType : roleList) {
-            if(roleType.contains("super-admin")){
+            if(roleType.contains("super-admin") || "admin".equals(roleType)){
                 return true;
             }
         }

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -61,6 +61,15 @@ public class Dateutils {
             }
             datesStr.add(day);
         }
+        if(!datesStr.contains( getDayDate(dEnd))){
+            datesStr.add(getDayDate(dEnd));
+        }
+        if(!datesStr.contains( getDayDate(dBegin))){
+            List<String> datesStr2 = new ArrayList<>();
+            datesStr2.add(getDayDate(dBegin));
+            datesStr2.addAll(datesStr);
+            return datesStr2;
+        }
         return datesStr;
     }
     public static Date getDate(String date) {
@@ -174,6 +183,7 @@ public class Dateutils {
         return getDaysAgo(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
     }
     public static void main(String[] args) {
-        System.out.println();
+
+        System.out.println(Dateutils.findDatesStr(Dateutils.getAddTime(-30, Dateutils.DAY), new Date(), Dateutils.DAY));
     }
 }

src/main/java/com/fdkankan/manage/vo/response/SceneTrendVo.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.vo.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SceneTrendVo {
+    private String groupKey;
+    private Long userCount;
+    private Long sceneCount;
+
+
+    public SceneTrendVo(String groupKey, Long userCount, Long sceneCount) {
+        this.groupKey = groupKey;
+        this.userCount = userCount == null ? 0L :userCount;
+        this.sceneCount = sceneCount == null ? 0L :sceneCount;
+    }
+}

src/main/java/com/fdkankan/manage/vo/response/SceneTrendVoList.java

@@ -1,11 +0,0 @@
-package com.fdkankan.manage.vo.response;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SceneTrendVoList {
-    private String type;
-    private List<GroupByCountVo> list;
-}