代码提交

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HomeController.java

@@ -0,0 +1,36 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.service.HomeService;
+import com.yonge.cooleshow.biz.dal.vo.HomeTotalVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/home")
+@Api(value = "首页", tags = "首页")
+public class HomeController extends BaseController {
+    @Autowired
+    private HomeService homeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "查询用户待办事项数")
+    @GetMapping("/getUserToDoNum ")
+    @PreAuthorize("@pcs.hasPermissions('home/getUserToDoNum')")
+    public HttpResponseResult<HomeTotalVo> getUserToDoNum() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(homeService.getUserToDoNum(user.getId()));
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/constant/SysConfigConstant.java

@@ -66,4 +66,21 @@ public interface SysConfigConstant {
      */
     String COURSE_SETTLEMENT_TIME_DAY = "course_settlement_time_day";
 
+    /**
+     * 管理端默认头像
+     */
+    String DEFAULT_HEARD_ADMIN = "default_heard_admin";
+    /**
+     * 老师默认头像
+     */
+    String DEFAULT_HEARD_TEACHER = "default_heard_teacher";
+    /**
+     * 学生默认头像-男
+     */
+    String DEFAULT_HEARD_STUDENT_BOY = "default_heard_student_boy";
+    /**
+     * 学生默认头像-女
+     */
+    String DEFAULT_HEARD_STUDENT_GIRL = "default_heard_student_girl";
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -42,4 +42,11 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
 	 */
 	TeacherAuthEntryRecordVo getLastRecordByUserId(@Param("userId") Long userId);
+	/***
+	 * 查询待处理的记录数
+	 * @author liweifan
+	 * @updateTime 2022/3/30 18:35
+	 * @return: java.lang.Integer
+	 */
+	Integer getUserToDoNum();
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthMusicianRecordDao.java

@@ -29,4 +29,11 @@ public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusi
 	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
 
     TeacherAuthMusicianRecord getLastRecordByUserId(@Param("userId") Long userId);
+	/***
+	 * 查询待处理的记录数
+	 * @author liweifan
+	 * @updateTime 2022/3/30 18:45
+	 * @return: java.lang.Integer
+	 */
+    Integer getUserToDoNum();
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/HomeService.java

@@ -0,0 +1,18 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.vo.HomeTotalVo;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/30 18:07
+ */
+public interface HomeService {
+    /***
+     * 查询首页待办事项
+     * @author liweifan
+     * @param: id
+     * @updateTime 2022/3/30 18:10
+     * @return: com.yonge.cooleshow.biz.dal.vo.HomeTotalVo
+     */
+    HomeTotalVo getUserToDoNum(Long id);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherAuthEntryRecordService.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.models.auth.In;
 
 /**
  * 老师入驻审核表 服务类
@@ -56,5 +57,11 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
      */
     TeacherAuthEntryRecordVo getLastRecordByUserId(Long userId);
-
+    /***
+     * 查询待处理的记录数
+     * @author liweifan
+     * @updateTime 2022/3/30 18:33
+     * @return: java.lang.Integer
+     */
+    Integer getUserToDoNum();
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherAuthMusicianRecordService.java

@@ -66,5 +66,11 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord
      */
     TeacherAuthMusicianRecord getLastRecordByUserId(Long userId);
-
+    /***
+     * 查询待处理的记录数
+     * @author liweifan
+     * @updateTime 2022/3/30 18:41
+     * @return: java.lang.Integer
+     */
+    Integer getUserToDoNum();
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.biz.dal.service.HomeService;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
+import com.yonge.cooleshow.biz.dal.vo.HomeTotalVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/30 18:08
+ */
+@Service
+public class HomeServiceImpl implements HomeService {
+    @Autowired
+    private TeacherAuthEntryRecordService entryRecordService;
+    @Autowired
+    private TeacherAuthMusicianRecordService musicianRecordService;
+    @Autowired
+    private MusicSheetService musicSheetService;
+    @Override
+    public HomeTotalVo getUserToDoNum(Long id) {
+        Integer entryNum = entryRecordService.getUserToDoNum();
+        Integer musicianNum = musicianRecordService.getUserToDoNum();
+
+        HomeTotalVo homeTotalVo = new HomeTotalVo();
+        homeTotalVo.setEntryNum(entryNum);
+        homeTotalVo.setMusicianNum(musicianNum);
+        //todo 待审乐谱
+        homeTotalVo.setMusicNum(0);
+        return homeTotalVo;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.constant.SysConfigConstant;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
 import com.yonge.cooleshow.biz.dal.dao.StudentStarDao;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.enums.CacheNameEnum;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import com.yonge.toolset.utils.date.DateUtil;
+import com.yonge.toolset.utils.string.StringUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +35,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     @Autowired
     private CourseScheduleDao courseScheduleDao;
     @Autowired
+    private SysConfigService sysConfigService;
+    @Autowired
     private RedissonClient redissonClient;
 
     @Override
@@ -93,20 +99,28 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         } catch (InvocationTargetException e) {
             e.printStackTrace();
         }
+        String avatar = "";
+        if (StringUtil.isEmpty(avatar)) {
+            if (UserGenderEnum.WOMAN.getCode().equals(user.getGender())) {
+                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_STUDENT_GIRL);
+            } else {
+                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_STUDENT_BOY);
+            }
+        }
+        studentHomeVo.setHeardUrl(avatar);
 
-        studentHomeVo.setHeardUrl(user.getAvatar());
         studentHomeVo.setUsername(user.getUsername());
         int num = DateUtil.daysBetween(new Date(), student.getMembershipEndTime());
         studentHomeVo.setMembershipDays(num < 0 ? 0 : num);
-        StudentTotalVo totalVo = (StudentTotalVo)redissonClient.getBucket(CacheNameEnum.STUDENT_HOME_TOTAL.getRedisKey(user.getId()))
+        StudentTotalVo totalVo = (StudentTotalVo) redissonClient.getBucket(CacheNameEnum.STUDENT_HOME_TOTAL.getRedisKey(user.getId()))
                 .get();
         if (null == totalVo) {
             totalVo = new StudentTotalVo();
         }
         studentHomeVo.setExerciseDays(null == totalVo.getExerciseDays() ? 0 : totalVo.getExerciseDays());
-        studentHomeVo.setExerciseHours(null == totalVo.getExerciseHours() ? 0 :totalVo.getExerciseHours());
+        studentHomeVo.setExerciseHours(null == totalVo.getExerciseHours() ? 0 : totalVo.getExerciseHours());
         studentHomeVo.setTestingNum(null == totalVo.getTestingNum() ? 0 : totalVo.getTestingNum());
-        studentHomeVo.setFinshClassHours(null == totalVo.getFinshClassHours() ? 0 :totalVo.getFinshClassHours());
+        studentHomeVo.setFinshClassHours(null == totalVo.getFinshClassHours() ? 0 : totalVo.getFinshClassHours());
         studentHomeVo.setUnfinshClassHours(null == totalVo.getUnfinshClassHours() ? 0 : totalVo.getUnfinshClassHours());
         studentHomeVo.setStarTeacherNum(null == totalVo.getStarTeacherNum() ? 0 : totalVo.getStarTeacherNum());
         return studentHomeVo;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -84,6 +84,11 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         return baseMapper.getLastRecordByUserId(userId);
     }
 
+    @Override
+    public Integer getUserToDoNum() {
+        return baseMapper.getUserToDoNum();
+    }
+
     /***
      * 判断用户是否已经提交申请
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthMusicianRecordServiceImpl.java

@@ -68,6 +68,11 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
     }
 
     @Override
+    public Integer getUserToDoNum() {
+        return baseMapper.getUserToDoNum();
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
         TeacherAuthMusicianRecord build = baseMapper.selectById(authOperaReq.getId());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -24,8 +24,10 @@ import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
+import com.yonge.toolset.utils.string.StringUtil;
 import org.apache.poi.ss.formula.functions.T;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,7 +99,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
         teacherHomeVo.setUserId(user.getId());
-        teacherHomeVo.setHeardUrl(user.getAvatar());
+
+        String avatar = user.getAvatar();
+        if (StringUtil.isEmpty(avatar)) {
+            avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_TEACHER);
+        }
+        teacherHomeVo.setHeardUrl(avatar);
+
         teacherHomeVo.setUsername(user.getUsername());
         teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/HomeTotalVo.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/30 17:53
+ */
+@ApiModel(value = "HomeVo对象", description = "后台首页统计查询对象")
+public class HomeTotalVo {
+    @ApiModelProperty("待审核老师认证数 ")
+    private Integer entryNum;
+    @ApiModelProperty("待审核音乐认证人数 ")
+    private Integer musicianNum;
+    @ApiModelProperty("待审核乐谱 ")
+    private Integer musicNum;
+
+    public Integer getEntryNum() {
+        return entryNum;
+    }
+
+    public void setEntryNum(Integer entryNum) {
+        this.entryNum = entryNum;
+    }
+
+    public Integer getMusicianNum() {
+        return musicianNum;
+    }
+
+    public void setMusicianNum(Integer musicianNum) {
+        this.musicianNum = musicianNum;
+    }
+
+    public Integer getMusicNum() {
+        return musicNum;
+    }
+
+    public void setMusicNum(Integer musicNum) {
+        this.musicNum = musicNum;
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -122,4 +122,7 @@
         where t.user_id_ = #{userId}
 		order by t.create_time_ desc limit 1
     </select>
+    <select id="getUserToDoNum" resultType="java.lang.Integer">
+        select count(1) from teacher_auth_entry_record where teacher_auth_status_ = 1
+    </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthMusicianRecordMapper.xml

@@ -1,18 +1,18 @@
 <?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.yonge.cooleshow.biz.dal.dao.TeacherAuthMusicianRecordDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">
-            <result column="id_" property="id" />
-	        <result column="user_id_" property="userId" />
-	        <result column="teacher_auth_status_" property="teacherAuthStatus" />
-	        <result column="verify_user_id_" property="verifyUserId" />
-	        <result column="reason_" property="reason" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="update_time_" property="updateTime" />
-		</resultMap>
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="teacher_auth_status_" property="teacherAuthStatus"/>
+        <result column="verify_user_id_" property="verifyUserId"/>
+        <result column="reason_" property="reason"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
 
-	<!-- 表字段 -->
-	<sql id="baseColumns">
+    <!-- 表字段 -->
+    <sql id="baseColumns">
          t.id_ as "id"
         , t.user_id_ as "userId"
         , t.teacher_auth_status_ as "teacherAuthStatus"
@@ -22,54 +22,57 @@
         , t.update_time_ as "updateTime"
         </sql>
 
-	<select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
-		select
-			<include refid="baseColumns"/>,
-			u.real_name_ as realName,
-			u.id_card_no_ as idCardNo,
-			(
-			SELECT u.username_ FROM sys_user u WHERE u.id_ = t.verify_user_id_
-			) as verifyUser
-		from teacher_auth_entry_record t
-		left join sys_user u on t.user_id_ = u.id_
-		where t.id_ = #{id}
-	</select>
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
+        select
+        <include refid="baseColumns"/>,
+        u.real_name_ as realName,
+        u.id_card_no_ as idCardNo,
+        (
+        SELECT u.username_ FROM sys_user u WHERE u.id_ = t.verify_user_id_
+        ) as verifyUser
+        from teacher_auth_entry_record t
+        left join sys_user u on t.user_id_ = u.id_
+        where t.id_ = #{id}
+    </select>
 
-	<!-- 分页查询 -->
-	<select id="selectPage" resultType = "com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
-		SELECT
-		<include refid="baseColumns"/>,
-		u.real_name_ as realName,
-		u.id_card_no_ as idCardNo,
-		u.phone_ as phone
-		FROM teacher_auth_musician_record t
-		left join sys_user u on t.user_id_ = u.id_
-		left join sys_user v on t.verify_user_id_ = u.id_
-		<where>
-			<if test="null != param.search and '' != param.search">
-				AND (
-				t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
-				u.username_ LIKE CONCAT('%', #{param.search}, '%') or
-				u.phone_ LIKE CONCAT('%', #{param.search}, '%')
-				)
-			</if>
-			<if test="null != param.verifyUser and '' != param.verifyUser">
-				AND v.username_ LIKE CONCAT('%', #{param.verifyUser}, '%')
-			</if>
-			<if test="param.startTime !=null">
-				<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
-			</if>
-			<if test="param.endTime !=null">
-				<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
-			</if>
-			<if test="param.authStatus !=null">
-				AND t.teacher_auth_status_ = #{param.authStatus}
-			</if>
-		</where>
-	</select>
+    <!-- 分页查询 -->
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
+        SELECT
+        <include refid="baseColumns"/>,
+        u.real_name_ as realName,
+        u.id_card_no_ as idCardNo,
+        u.phone_ as phone
+        FROM teacher_auth_musician_record t
+        left join sys_user u on t.user_id_ = u.id_
+        left join sys_user v on t.verify_user_id_ = u.id_
+        <where>
+            <if test="null != param.search and '' != param.search">
+                AND (
+                t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
+                u.username_ LIKE CONCAT('%', #{param.search}, '%') or
+                u.phone_ LIKE CONCAT('%', #{param.search}, '%')
+                )
+            </if>
+            <if test="null != param.verifyUser and '' != param.verifyUser">
+                AND v.username_ LIKE CONCAT('%', #{param.verifyUser}, '%')
+            </if>
+            <if test="param.startTime !=null">
+                <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
+            </if>
+            <if test="param.endTime !=null">
+                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+            </if>
+            <if test="param.authStatus !=null">
+                AND t.teacher_auth_status_ = #{param.authStatus}
+            </if>
+        </where>
+    </select>
     <select id="getLastRecordByUserId"
             resultType="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">
 		select * from teacher_auth_musician_record where user_id_ = #{userId}
 		order by create_time_ desc limit 1
 	</select>
+    <select id="getUserToDoNum" resultType="java.lang.Integer">
+		select count(1) from teacher_auth_musician_record where teacher_auth_status_ = 1
+	</select>
 </mapper>