1

web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java

@@ -78,7 +78,7 @@ public class UniversitiesColleges extends BaseEntity{
 //    @Dict(type = "core_user.code.1=1")
     private Long universitiesCollegesDefaultAdminUserId;
 
-    @FetchSql("select `code`, `name`, `password` from core_user where org_id = #orgId# and DEL_FLAG = 0 and STATE = 'S1' order by CREATE_TIME asc limit 1 ")
+    @FetchSql("select `code`, `name` from core_user where org_id = #orgId# and DEL_FLAG = 0 and STATE = 'S1' order by CREATE_TIME asc limit 1 ")
     @UpdateIgnore
     @InsertIgnore
     private Map universitiesCollegesDefaultAdminUserInfo;

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -270,19 +269,13 @@ public class StatisticalAnalysisService {
         if (stime != null && etime != null) {
             logDaoLambdaQuery.andBetween(SysLog::getCreateTime, stime, etime);
         }
-        List<SysLog> sysLogs = logDaoLambdaQuery.andLike(SysLog::getRequestUrl, "%login%").andLike(SysLog::getResult, "%成功%").select();
-        Set<String> set = new HashSet<>();
-        for (SysLog sysLog : sysLogs) {
-            String result = sysLog.getParams();
-            Matcher m = r.matcher(result);
-            if (m.find()) {
-                set.add(m.group());
-            }
-        }
+        long loginCount = logDaoLambdaQuery.andLike(SysLog::getRequestUrl, "%login%").andLike(SysLog::getResult, "%成功%").count();
+        long loginDistinctCount = logDaoLambdaQuery.distinct().andLike("request_url", "%login%").andLike("result", "%成功%").select("user_id").stream().count();
+
         //登录人数
-        data.put("loginNumber", set.size());
+        data.put("loginNumber", loginDistinctCount);
         //登录人次
-        data.put("studentPersonTime", sysLogs.size());
+        data.put("studentPersonTime", loginCount);
         //上线课程数
         Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime);
         data.put("courseNumber", courseInfoCount);
@@ -310,10 +303,14 @@ public class StatisticalAnalysisService {
         List<ResourcesInfo> videoNumber = resourcesInfoService.getValues(resourcesInfoQuery);
         data.put("videoNumber", videoNumber.size());
         //题库数量
-        List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(new ResourcesQuestionQuery());
+        ResourcesQuestionQuery paras1 = new ResourcesQuestionQuery();
+        paras1.setQuestionStatus(1);
+        List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1);
         data.put("questionNumber", questionList.size());
         //院校数量
-        List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(new UniversitiesCollegesQuery());
+        UniversitiesCollegesQuery paras = new UniversitiesCollegesQuery();
+        paras.setUniversitiesCollegesStatus(1);
+        List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras);
         data.put("schoolNumber", schoolList.size());
         return data;
     }