区域应用统计优化

sapi/src/main/java/com/xhkjedu/sapi/mapper/region/RAppAnalyzeMapper.java

@@ -5,12 +5,16 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface RAppAnalyzeMapper {
     //登录次数
-    Integer getLoginNum(@Param("level") Integer level, @Param("begintime") Integer begintime, @Param("endtime") Integer endtime,@Param("year") Integer year);
+    Integer getLoginNum(@Param("schoolIds") String schoolIds, @Param("begintime") Integer begintime, @Param("endtime") Integer endtime,@Param("year") Integer year);
 
     //学校应用时长、次数统计
-    List<RAppVo> listApp(@Param("level") Integer level, @Param("begintime") Integer begintime, @Param("endtime") Integer endtime,@Param("year") Integer year);
+    List<RAppVo> listApp(@Param("schoolIds") String schoolIds, @Param("begintime") Integer begintime, @Param("endtime") Integer endtime,@Param("year") Integer year);
+
+    //获取学校列表
+    List<Map<String, Object>> listSchool(@Param("level") Integer level);
 }

sapi/src/main/java/com/xhkjedu/sapi/service/region/RAppAnalyzeService.java

@@ -21,35 +21,47 @@ public class RAppAnalyzeService {
     @Resource
     private RAppAnalyzeMapper rAppAnalyzeMapper;
 
-    public Map listApp(RegionParam param) {
-        Map map = new HashMap();
+    public Map<String, Object> listApp(RegionParam param) {
+        Map<String, Object> map = new HashMap<>();
+        List<Map<String, Object>> schoolList = rAppAnalyzeMapper.listSchool(param.getLevel());
+        if(N_Utils.isListEmpty(schoolList)) {
+            map.put("dlnum",0);//登录次数
+            map.put("pjdlnum",0);//平均登录次数
+            map.put("dknum",0);//打开次数
+            map.put("pjdknum",0);//平均打开次数
+            map.put("costtime",0);//使用时长
+            map.put("pjcosttime",0);//平均使用时长
+            map.put("rates",new ArrayList<>());
+            map.put("schools",new ArrayList<>());
+            return map;
+        }
+        String schoolIds = schoolList.stream().map(m -> m.get("schoolid").toString()).collect(Collectors.joining(","));
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
-        Integer level = param.getLevel();
         Integer daynum = N_Utils.getTimestampDay(begintime,endtime);//使用天数
-        Integer dlnum = rAppAnalyzeMapper.getLoginNum(level,begintime,endtime,param.getYear());
+        Integer dlnum = rAppAnalyzeMapper.getLoginNum(schoolIds,begintime,endtime,param.getYear());
         map.put("dlnum",dlnum);//登录次数
         map.put("pjdlnum", N_Utils.formatAvg(dlnum,daynum));//平均登录次数
 
         //应用时长、次数统计
-        List<RAppVo> list = rAppAnalyzeMapper.listApp(level,begintime,endtime,param.getYear());
-        Integer dknum = list.stream().collect(Collectors.summingInt(RAppVo::getDknum));
+        List<RAppVo> list = rAppAnalyzeMapper.listApp(schoolIds,begintime,endtime,param.getYear());
+        Integer dknum = list.stream().mapToInt(RAppVo::getDknum).sum();
         map.put("dknum",dknum);//打开次数
         map.put("pjdknum", N_Utils.formatAvg(dknum,daynum));//平均打开次数
-        Integer costtime = list.stream().collect(Collectors.summingInt(RAppVo::getCosttime));
+        Integer costtime = list.stream().mapToInt(RAppVo::getCosttime).sum();
         map.put("costtime",costtime);//使用时长
         map.put("pjcosttime", N_Utils.formatAvg(costtime,daynum));//平均使用时长
 
         //应用统计--应用时长概况（关于率的计算：各应用时长÷总使用时长，排名前5的应用）
         List<RAppVo> list2 = new ArrayList<>();
         Map<String, List<RAppVo>> rcollect = list.stream().collect(Collectors.groupingBy(RAppVo::getModulecode));
-        for(Map.Entry rmap:rcollect.entrySet()) {
-            List<RAppVo> rates2 = (List<RAppVo>) rmap.getValue();
+        for(Map.Entry<String, List<RAppVo>> rmap:rcollect.entrySet()) {
+            List<RAppVo> rates2 = rmap.getValue();
             RAppVo a = new RAppVo();
             RAppVo rate = rates2.get(0);
             a.setModulecode(rate.getModulecode());
             a.setModulename(rate.getModulename());
-            Integer costtime2 = rates2.stream().collect(Collectors.summingInt(RAppVo::getCosttime));
+            Integer costtime2 = rates2.stream().mapToInt(RAppVo::getCosttime).sum();
             a.setCosttime(costtime2);
             a.setTimerate(N_Utils.getIntegerDivideAndMulitiply(costtime2,costtime));
             list2.add(a);
@@ -61,17 +73,14 @@ public class RAppAnalyzeService {
 
         //学校应用时长、次数统计
         Map<Integer, List<RAppVo>> scollect = list.stream().collect(Collectors.groupingBy(RAppVo::getSchoolid));
-        List<Map> schools = new ArrayList<>();
-        for(Map.Entry smap:scollect.entrySet()) {
-            List<RAppVo> schools2 = (List<RAppVo>) smap.getValue();
+        List<Map<String, Object>> schools = new ArrayList<>();
+        for(Map.Entry<Integer, List<RAppVo>> smap:scollect.entrySet()) {
+            List<RAppVo> schools2 = smap.getValue();
             RAppVo school = schools2.get(0);
-            Map s = new HashMap();
-            s.put("schoolid",school.getSchoolid());
-            s.put("schoolname",school.getSchoolname());
-            s.put("shortname",school.getShortname());
-            List<Map> modules = new ArrayList<>();//学校模块列表
+            Map<String, Object> s = schoolList.stream().filter(m -> m.get("schoolid").equals(school.getSchoolid())).findFirst().orElse(new HashMap<>());
+            List<Map<String, Object>> modules = new ArrayList<>();//学校模块列表
             for (RAppVo a : schools2) {
-                Map module = new HashMap();
+                Map<String, Object> module = new HashMap<>();
                 module.put("modulecode",a.getModulecode());
                 module.put("modulename",a.getModulename());
                 module.put("dknum",a.getDknum());

sapi/src/main/resources/mapper/region/RAppAnalyzeMapper.xml

@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sapi.mapper.region.RAppAnalyzeMapper">
+    <!--获取学校列表-->
+    <select id="listSchool" resultType="java.util.Map">
+        select s.schoolid,s.schoolname,s.shortname from t_school s where s.schoollevel=#{level} and s.schoolstate=1
+    </select>
     <!--登录次数-->
     <select id="getLoginNum" resultType="java.lang.Integer">
         select count(ul.ulid)
-        from t_school s right join t_user_log ul on s.schoolid=ul.schoolid
-        where s.schoollevel=#{level} and s.schoolstate=1 and ul.year=#{year}
+        from t_user_log ul
+        where ul.schoolid in(${schoolIds}) and ul.year=#{year}
         <if test="begintime!=null and begintime!=0">
             and ul.logtime between #{begintime} and #{endtime}
         </if>
     </select>
     <!--学校应用时长、次数统计-->
     <select id="listApp" resultType="com.xhkjedu.sapi.vo.region.RAppVo">
-        select m.schoolid,s.schoolname,s.shortname,m.modulecode,count(m.amid)dknum,sum(m.costtime)costtime
+        select m.schoolid,m.modulecode,count(m.amid)dknum,sum(m.costtime)costtime
         ,(select m2.modulename from t_moduledefault m2 where m2.mabbrevname=m.modulecode limit 1)modulename
-        from t_school s right join t_app_monitor m on m.schoolid=s.schoolid
-        where s.schoollevel=#{level} and s.schoolstate=1 and m.year=#{year}
+        from t_app_monitor m
+        where m.schoolid in(${schoolIds}) and m.year=#{year}
         <if test="begintime!=null and begintime!=0">
             and m.createtime between #{begintime} and #{endtime}
         </if>