Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -0,0 +1,87 @@
+package com.yonge.cooleshow.admin.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+
+@RestController
+@RequestMapping("/MusicTag")
+@Api(value = "音乐标签表", tags = "音乐标签表")
+public class MusicTagController extends BaseController {
+
+    @Autowired
+    private MusicTagService musicTagService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入musicTag")
+    public HttpResponseResult<MusicTagVo> detail(@PathVariable("id") Long id) {
+    	return succeed(musicTagService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入musicTag")
+    public HttpResponseResult<PageInfo<MusicTagVo>> page(MusicTagSearch query) {
+		IPage<MusicTagVo> pages = musicTagService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入musicTag")
+	public HttpResponseResult save(@Valid @RequestBody MusicTag musicTag) {
+    	return status(musicTagService.save(musicTag));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入musicTag")
+	public HttpResponseResult update(@Valid @RequestBody MusicTag musicTag) {
+        return status(musicTagService.updateById(musicTag));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入musicTag")
+	public HttpResponseResult submit(@RequestBody MusicTag musicTag) {
+        return status(musicTagService.saveOrUpdate(musicTag));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(musicTagService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -1,26 +1,17 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
-import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.List;
-
 @RestController
 @RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
@@ -30,13 +21,13 @@ public class StudentController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail/{userId}")
-    @ApiOperation(value = "详情", notes = "传入student")
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
+            @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<StudentVo> detail(Long userId){
-		StudentVo detail = studentService.detail(userId);
+    public HttpResponseResult<StudentVo> detail(@PathVariable("id") Long id){
+		StudentVo detail = studentService.detail(id);
 		return succeed(detail);
 	}
 
@@ -45,8 +36,8 @@ public class StudentController extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入student")
-    public HttpResponseResult<PageInfo<StudentVo>> page(StudentSearch studentSearch, Query query) {
-		IPage<StudentVo> pages = studentService.selectPage(Condition.getPage(query), studentSearch);
+    public HttpResponseResult<PageInfo<StudentVo>> page(StudentSearch query) {
+		IPage<StudentVo> pages = studentService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
 

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

@@ -49,8 +49,8 @@ public class TeacherController extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacher")
-    public HttpResponseResult<IPage<TeacherVo>> page(TeacherSearch teacher, Query query) {
-        IPage<TeacherVo> pages = teacherService.selectPage(Condition.getPage(query), teacher);
+    public HttpResponseResult<IPage<TeacherVo>> page(TeacherSearch query) {
+        IPage<TeacherVo> pages = teacherService.selectPage(Condition.getPage(query), query);
         return succeed(pages);
     }
 

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

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+
+
+public interface MusicTagDao extends BaseMapper<MusicTag>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-29 17:47:57
+     * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
+	 */
+	MusicTagVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-29 17:47:57
+     * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
+	 */
+	List<MusicTagVo> selectPage(@Param("page") IPage page, @Param("param") MusicTagSearch musicTag);
+	
+}

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

@@ -6,12 +6,10 @@ import java.util.Set;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.BasicUserInfo;
-import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
-import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
 import org.apache.ibatis.annotations.Param;
 
 public interface TeacherDao extends BaseMapper<Teacher> {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicTagSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-29 17:47:57
+ */
+@ApiModel(value = "MusicTagSearch对象", description = "音乐标签表查询对象")
+public class MusicTagSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class StudentSearch {
+public class StudentSearch extends Query {
     @ApiModelProperty(value = "学员编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherSearch.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "TeacherSearch", description = "老师管理查询")
-public class TeacherSearch {
+public class TeacherSearch extends Query {
     @ApiModelProperty(value = "老师编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "老师类型")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicTag.java

@@ -0,0 +1,90 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 音乐标签表
+ */
+@TableName("music_tag")
+@ApiModel(value = "MusicTag对象", description = "音乐标签表")
+public class MusicTag implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("标签id ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @ApiModelProperty("父级标签id ")
+	@TableField(value = "parent_tag_id_")
+    private Integer parentTagId;
+    @ApiModelProperty("标签名称 ")
+	@TableField(value = "name_")
+    private String name;
+	@TableField(value = "del_flag_")
+    private Byte delFlag;
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+	public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    
+	public Integer getParentTagId() {
+        return parentTagId;
+    }
+
+    public void setParentTagId(Integer parentTagId) {
+        this.parentTagId = parentTagId;
+    }
+    
+	public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+
+/**
+ * 音乐标签表 服务类
+ * @author liweifan
+ * @date 2022-03-29
+ */
+public interface MusicTagService extends IService<MusicTag>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-29
+     */
+	MusicTagVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-03-29
+     */
+    IPage<MusicTagVo> selectPage(IPage<MusicTagVo> page, MusicTagSearch query);
+}

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

@@ -2,11 +2,12 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 
 import java.util.List;
 
@@ -37,4 +38,13 @@ public interface StudentService extends IService<Student>  {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.StudentTotalVo>
      */
     List<StudentTotalVo> queryStudentHomeTotal();
+    /***
+     * 查询学生端首页用户信息
+     * @author liweifan
+     * @param: user
+     * @updateTime 2022/3/29 15:00
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentHomeVo
+     */
+    StudentHomeVo queryUserInfo(SysUser user);
+
 }

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

@@ -27,10 +27,6 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	 */
 	void upSetSubject(Subject subject);
 
-	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
-
-	List<Subject> findBySubjectByIdList(String subjectIdList);
-
 	/***
 	 * 查询科目选择框
 	 * @author liweifan
@@ -38,4 +34,10 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>
 	 */
 	List<SubjectSelectVo> subjectSelect();
+
+	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
+
+	List<Subject> findBySubjectByIdList(String subjectIdList);
+
+
 }

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

@@ -0,0 +1,27 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+
+
+@Service
+public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> implements MusicTagService {
+
+	@Override
+    public MusicTagVo detail(Long id) {
+        MusicTagVo detail = baseMapper.detail(id);
+        return detail;
+    }
+    
+     @Override
+    public IPage<MusicTagVo> selectPage(IPage<MusicTagVo> page, MusicTagSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -3,16 +3,14 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 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.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.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.CacheNameEnum;
-import com.yonge.cooleshow.biz.dal.vo.StudentTotalVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.toolset.utils.date.DateUtil;
+import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,10 +19,8 @@ import com.yonge.cooleshow.biz.dal.dao.StudentDao;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -71,17 +67,48 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             totalVo.setUserId(student.getUserId());
             StudentTotalVo starTotal = studentStarMap.get(student.getUserId());
             if (null != starTotal) {
-                totalVo.setStarNum(starTotal.getStarNum());
+                totalVo.setStarTeacherNum(starTotal.getStarTeacherNum());
             }
             StudentTotalVo courseTotal = studentCourseMap.get(student.getUserId());
             if (null != courseTotal) {
-                totalVo.setExpTime(courseTotal.getExpTime());
-                totalVo.setUnExpTime(courseTotal.getUnExpTime());
+                totalVo.setFinshClassHours(courseTotal.getFinshClassHours());
+                totalVo.setUnfinshClassHours(courseTotal.getUnfinshClassHours());
             }
+            //todo 缺少累计练习天数 累计练习时长 累计评测次数
             resultList.add(totalVo);
             redissonClient.getBucket(CacheNameEnum.STUDENT_HOME_TOTAL.getRedisKey(totalVo.getUserId()))
                     .set(totalVo);
         }
         return resultList;
     }
+
+    @Override
+    public StudentHomeVo queryUserInfo(SysUser user) {
+        Student student = getById(user.getId());
+        StudentHomeVo studentHomeVo = new StudentHomeVo();
+        try {
+            BeanUtils.copyProperties(studentHomeVo, student);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+
+        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()))
+                .get();
+        if (null == totalVo) {
+            totalVo = new StudentTotalVo();
+        }
+        studentHomeVo.setExerciseDays(null == totalVo.getExerciseDays() ? 0 : totalVo.getExerciseDays());
+        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.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/support/Query.java

@@ -3,13 +3,15 @@ package com.yonge.cooleshow.biz.dal.support;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * 分页工具
  *
  * @author Chill
  */
 @ApiModel(description = "查询条件")
-public class Query {
+public class Query implements Serializable {
 
 	/**
 	 * 当前页

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-29 17:47:57
+ */
+@ApiModel(value = "MusicTagVo对象", description = "音乐标签表查询视图对象")
+public class MusicTagVo extends MusicTag{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -14,17 +14,17 @@ public class StudentTotalVo implements Serializable {
     @ApiModelProperty("对应user表用户编号")
     private Long userId;
     @ApiModelProperty("累计练习天数")
-    private Integer totalExerciseDays;
+    private Integer exerciseDays;
     @ApiModelProperty("累计练习时长")
-    private Double totalExerciseTimes;
+    private Double exerciseHours;
     @ApiModelProperty("累计评测次数")
-    private Integer totalTestNum;
+    private Integer testingNum;
     @ApiModelProperty("已完成课时数")
-    private Integer expTime;
-    @ApiModelProperty("剩余课时")
-    private Integer unExpTime;
+    private Integer finshClassHours;
+    @ApiModelProperty("剩余课时数")
+    private Integer unfinshClassHours;
     @ApiModelProperty("关注老师数")
-    private Integer starNum;
+    private Integer starTeacherNum;
 
     public Long getUserId() {
         return userId;
@@ -34,51 +34,51 @@ public class StudentTotalVo implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getTotalExerciseDays() {
-        return totalExerciseDays;
+    public Integer getExerciseDays() {
+        return exerciseDays;
     }
 
-    public void setTotalExerciseDays(Integer totalExerciseDays) {
-        this.totalExerciseDays = totalExerciseDays;
+    public void setExerciseDays(Integer exerciseDays) {
+        this.exerciseDays = exerciseDays;
     }
 
-    public Double getTotalExerciseTimes() {
-        return totalExerciseTimes;
+    public Double getExerciseHours() {
+        return exerciseHours;
     }
 
-    public void setTotalExerciseTimes(Double totalExerciseTimes) {
-        this.totalExerciseTimes = totalExerciseTimes;
+    public void setExerciseHours(Double exerciseHours) {
+        this.exerciseHours = exerciseHours;
     }
 
-    public Integer getTotalTestNum() {
-        return totalTestNum;
+    public Integer getTestingNum() {
+        return testingNum;
     }
 
-    public void setTotalTestNum(Integer totalTestNum) {
-        this.totalTestNum = totalTestNum;
+    public void setTestingNum(Integer testingNum) {
+        this.testingNum = testingNum;
     }
 
-    public Integer getExpTime() {
-        return expTime;
+    public Integer getFinshClassHours() {
+        return finshClassHours;
     }
 
-    public void setExpTime(Integer expTime) {
-        this.expTime = expTime;
+    public void setFinshClassHours(Integer finshClassHours) {
+        this.finshClassHours = finshClassHours;
     }
 
-    public Integer getUnExpTime() {
-        return unExpTime;
+    public Integer getUnfinshClassHours() {
+        return unfinshClassHours;
     }
 
-    public void setUnExpTime(Integer unExpTime) {
-        this.unExpTime = unExpTime;
+    public void setUnfinshClassHours(Integer unfinshClassHours) {
+        this.unfinshClassHours = unfinshClassHours;
     }
 
-    public Integer getStarNum() {
-        return starNum;
+    public Integer getStarTeacherNum() {
+        return starTeacherNum;
     }
 
-    public void setStarNum(Integer starNum) {
-        this.starNum = starNum;
+    public void setStarTeacherNum(Integer starTeacherNum) {
+        this.starTeacherNum = starTeacherNum;
     }
 }

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

@@ -64,8 +64,8 @@
     <select id="queryStudentHomeTotal" resultType="com.yonge.cooleshow.biz.dal.vo.StudentTotalVo">
         select
             b.user_id_ as userId,
-            sum(if(a.end_time_ &lt;= now(),1,0)) as expTime,
-            sum(if(a.end_time_ &gt; now(),1,0)) as unExpTime
+            sum(if(a.end_time_ &lt;= now(),1,0)) as finshClassHours,
+            sum(if(a.end_time_ &gt; now(),1,0)) as unfinshClassHours
         from course_schedule a
         join course_schedule_student_payment b on a.id_ = b.course_id_
         where a.lock_ = 0 and a.type_ = 'PRACTICE'

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

@@ -0,0 +1,35 @@
+<?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.MusicTagDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicTag">
+            <result column="id_" property="id" />
+	        <result column="parent_tag_id_" property="parentTagId" />
+	        <result column="name_" property="name" />
+	        <result column="del_flag_" property="delFlag" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.parent_tag_id_
+        , t.name_
+        , t.del_flag_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MusicTagVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM music_tag t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_tag t
+	</select>
+</mapper>

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

@@ -24,7 +24,7 @@
     <select id="queryStudentHomeTotal" resultType="com.yonge.cooleshow.biz.dal.vo.StudentTotalVo">
 		select
 			student_id_ as userId,
-			count(1) as starNum
+			count(1) as starTeacherNum
 		from student_star
 		group by student_id_
 	</select>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -1,34 +1,16 @@
 package com.yonge.cooleshow.student.controller;
 
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.date.DateUtil;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 
@@ -59,18 +41,7 @@ public class StudentController extends BaseController {
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        Student student = studentService.getById(user.getId());
-        StudentHomeVo studentHomeVo = new StudentHomeVo();
-        BeanUtils.copyProperties(studentHomeVo, student);
-
-        studentHomeVo.setHeardUrl(user.getAvatar());
-        studentHomeVo.setUsername(user.getUsername());
-        int num = DateUtil.daysBetween(new Date(), student.getMembershipEndTime());
-        studentHomeVo.setMembershipDays(num < 0 ? 0 : num);
-        //todo 学员我的-统计数据
-
-
-        return succeed(studentHomeVo);
+        return succeed(studentService.queryUserInfo(user));
     }
 
 }