控制台班级数

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ConsoleController.java

@@ -44,4 +44,11 @@ public class ConsoleController extends BaseController {
         Map<String,Object> numMap = iConsoleService.getOrderData(bo);
         return AjaxResult.success(numMap);
     }
+
+    @ApiOperation("控制台班级数据")
+    @GetMapping("/gradeData")
+    public AjaxResult<Map<String,Object>> gradeData(ConsoleQueryBo bo) {
+        Map<String,Object> numMap = iConsoleService.getGradeData(bo);
+        return AjaxResult.success(numMap);
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -38,18 +38,6 @@ public class CommonController
     private ServerConfig serverConfig;
 
 
-    @Autowired
-    private ISysUserService iSysUserService;
-
-
-   /* @ApiOperation("登录")
-    @PostMapping("/testlogin")
-    public AjaxResult login()
-    {
-        iSysUserService.updateLoginTimeIp(1L);
-        return AjaxResult.success();
-    }*/
-
     /**
      * 通用下载请求
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IConsoleService.java

@@ -14,4 +14,6 @@ public interface IConsoleService {
     Map<String,Object> getStudentData(ConsoleQueryBo bo);
 
     Map<String,Object> getOrderData(ConsoleQueryBo bo);
+
+    Map<String,Object> getGradeData(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ConsoleServiceImpl.java

@@ -1,9 +1,12 @@
 package com.zhongzheng.modules.base.service.impl;
 
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IConsoleService;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -24,6 +27,9 @@ public class ConsoleServiceImpl implements IConsoleService {
     @Autowired
     private IUserUpdateService iUserUpdateService;
 
+    @Autowired
+    private IClassGradeService iClassGradeService;
+
     @Override
     public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
         Integer allNum = iOrderService.getConsoleStudentNum(bo); //总人数
@@ -99,6 +105,38 @@ public class ConsoleServiceImpl implements IConsoleService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> getGradeData(ConsoleQueryBo bo) {
+        Map<String, Object> map = new HashMap<>();
+        List<ClassGradeVo> allList = iClassGradeService.getConsoleGradeList(bo);
+        countGradeNum(map,"all",allList); //所有
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        Long todZero = cal.getTimeInMillis() / 1000;  //今天凌晨
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)-1, 0, 0, 0);
+        Long ytdZero = cal.getTimeInMillis() / 1000;   //昨天凌晨
+        Calendar cal7 = new GregorianCalendar();
+        cal7.add(Calendar.DATE,-6); //7天内
+        cal7.set(cal7.get(Calendar.YEAR), cal7.get(Calendar.MONTH), cal7.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        Long sevenZero = cal7.getTimeInMillis() / 1000;   //7日内凌晨
+
+        bo.setStartTime(todZero);
+        bo.setEndTime(DateUtils.getNowTime());
+        List<ClassGradeVo> todList = iClassGradeService.getConsoleGradeList(bo);
+        countGradeNum(map,"tod",todList); //今天
+
+        bo.setStartTime(ytdZero);
+        bo.setEndTime(todZero);
+        List<ClassGradeVo> ytdList = iClassGradeService.getConsoleGradeList(bo);
+        countGradeNum(map,"ytd",ytdList); //昨天
+
+        bo.setEndTime(DateUtils.getNowTime());
+        bo.setStartTime(sevenZero);
+        List<ClassGradeVo> sevenList = iClassGradeService.getConsoleGradeList(bo);
+        countGradeNum(map,"sev",sevenList); //7天
+        return map;
+    }
+
     private void countNum(Map<String, Object> map,String tag,List<OrderListVo> allList){
         Integer allNum = allList.size();
         map.put(tag+"Num",allNum);
@@ -129,4 +167,22 @@ public class ConsoleServiceImpl implements IConsoleService {
         map.put(tag+"OffBankNum",offBankNum);
 
     }
+
+    private void countGradeNum(Map<String, Object> map,String tag,List<ClassGradeVo> allList){
+        Integer allNum = allList.size();
+        map.put(tag+"Num",allNum);
+        Integer openNum = 0;
+        Integer preNum = 0;
+        for(ClassGradeVo vo : allList){
+            if(Validator.isNotEmpty(vo.getClassStatus())){
+                if(vo.getClassStatus()==0){
+                    preNum++;
+                }else{
+                    openNum++;
+                }
+            }
+        }
+        map.put(tag+"OpenNum",openNum);
+        map.put(tag+"PreNum",preNum);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.grade.mapper;
 
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
@@ -37,4 +38,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     Long querClassSMS(@Param("gradeId") Long gradeId,@Param("businessId") Long businessId);
 
     List<Long> queryUser(Long gradeId);
+
+    List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.grade.service;
 
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.course.vo.CourseUserEducationTypeVo;
 import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
@@ -60,4 +61,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	List<ClassGradeStudentVo> listGradeStudy(ClassGradeQueryBo bo);
 
     List<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo);
+
+	List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
@@ -476,6 +477,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return courseUserEducationTypeVos;
     }
 
+    @Override
+    public List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo) {
+        return baseMapper.getConsoleGradeList(bo);
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserServiceImpl.java

@@ -487,7 +487,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         user.setLoginDate(DateUtils.getNowDate());
         user.setUpdateTime(DateUtils.getNowDate());
-        updateById(user);
+        user.setUpdateBy("sys");
+        baseMapper.updateById(user);
         return user;
     }
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -532,4 +532,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             grade_id = #{gradeId}
           and `status` = 1
     </select>
+
+    <select id="getConsoleGradeList" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="ClassGradeVoResult">
+        SELECT
+        cg.grade_id,cg.class_status
+        FROM
+        class_grade cg LEFT JOIN class_grade_goods cgg ON cg.grade_id = cgg.grade_id
+        LEFT JOIN goods g ON cgg.goods_id = g.goods_id
+        WHERE
+        1 = 1
+        <if test="businessId != null">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="startTime != null">
+            AND cg.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND #{endTime} >= cg.create_time
+        </if>
+    </select>
 </mapper>