update user type api

eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/controller/StatisticsController.java

@@ -218,7 +218,7 @@ public class StatisticsController {
      */
     @RequestMapping("auth_user_type")
     @ResponseBody
-    public MapMessage authUserTypes(@RequestParam(value = "clientId", required = false) String clientId, @RequestParam(value = "startDay") Integer startDay, @RequestParam(value = "endDay") Integer endDay) {
+    public MapMessage authUserTypes(@RequestParam(value = "clientId", required = false) String clientId, @RequestParam(value = "latestDays", defaultValue = "7") Integer latestDays) {
 
         Map<String,Object> param = new HashMap<>();
         param.put("loginSuccessFlag", true);
@@ -226,21 +226,42 @@ public class StatisticsController {
             param.put("clientId",clientId);
         }
 
+        int type = 1;   // 1: 日数据   2： 月数据
+        if(latestDays > 30){
+            type = 2;
+        }
+        Date startDate = getStartDay(latestDays);
+
         List<Map<String,Object>> dataList = new ArrayList<>();
-        Date startDate = DateUtils.stringToDate(String.valueOf(startDay), "yyyyMMdd");
-        Date endDate = DateUtils.stringToDate(String.valueOf(endDay), "yyyyMMdd");
+        Date endDate = new Date();
         while(startDate.before(endDate)){
-            String yearMonthDay = DateUtils.dateToString(startDate, "yyyy-MM-dd");
-            param.put("yearMonthDay", yearMonthDay);
+            String dateStr = "";
+            if(Objects.equals(type, 1)){  // 日数据
+                String yearMonthDay = DateUtils.dateToString(startDate, "yyyy-MM-dd");
+                param.put("yearMonthDay", yearMonthDay);
+                dateStr = DateUtils.dateToString(startDate, "M月dd日");
+            }else {   // 月数据
+                String yearMonth = DateUtils.dateToString(startDate, "yyyy-MM");
+                param.put("yearMonth", yearMonth);
+                dateStr = DateUtils.dateToString(startDate, "M月");
+            }
+
             long all_auth = authLogService.count(param);
             param.put("logUserInfo.userType","TEACHER");
             long teacherCount = authLogService.count(param);
             param.put("logUserInfo.userType","STUDENT");
             long studentCount = authLogService.count(param);
-            startDate = DateUtils.calculateDateDay(startDate, 1);
+            if(Objects.equals(type, 1)){  // 日数据
+                startDate = DateUtils.calculateDateDay(startDate, 1);
+            }else {   // 月数据
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(startDate);
+                calendar.add(Calendar.MONTH, 1);
+                startDate = calendar.getTime();
+            }
 
             Map<String,Object> data = new HashMap<>();
-            data.put("date", yearMonthDay);
+            data.put("date", dateStr);
             data.put("teacherCount", teacherCount);
             data.put("studentCount", studentCount);
             data.put("otherCount", all_auth - teacherCount - studentCount);

eden-authcenter-log/src/main/java/com/chineseall/eden/authcenter/log/model/AuthLog.java

@@ -79,6 +79,8 @@ public class AuthLog  implements CacheDimensionDocument {
     @DocumentField
     private String yearMonthDay;
 
+    private Integer hour;
+
     @Override
     public String[] generateCacheDimensions() {
         return new String[0];