Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into feature/1219_opt

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysMusicCompareRecordController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SysMusicCompareRecordService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
@@ -31,18 +33,15 @@ import java.util.Objects;
 @RestController
 public class SysMusicCompareRecordController extends BaseController {
 
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
+    @Resource
+    private SysUserService sysUserService;
+    @Resource
     private SysMusicCompareRecordService sysMusicCompareRecordService;
 
     @ApiOperation(value = "添加记录")
     @PostMapping("add")
     public HttpResponseResult add(SysMusicCompareRecord record){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         if(Objects.isNull(record.getFeature())){
             return failed("请设置功能点");
         }
@@ -55,21 +54,13 @@ public class SysMusicCompareRecordController extends BaseController {
     @ApiOperation(value = "用户最后一次评测数据")
     @GetMapping("getLastEvaluationMusicalNotesPlayStats")
     public HttpResponseResult getLastEvaluationMusicalNotesPlayStats(Long recordId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
-        return succeed(sysMusicCompareRecordService.getLastEvaluationMusicalNotesPlayStats(sysUser.getId(), recordId));
+        return succeed(sysMusicCompareRecordService.getLastEvaluationMusicalNotesPlayStats(sysUserService.getUserId(), recordId));
     }
 
     @ApiOperation("老师训练数据统计")
     @GetMapping("studentTrainData")
     public HttpResponseResult studentTrainData(SysMusicCompareRecordQueryInfo.TeacherCompareRecordQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("获取用户信息失败");
-        }
-        queryInfo.setUserId(sysUser.getId());
+        queryInfo.setUserId(sysUserService.getUserId());
         queryInfo.setClientId("teacher");
         if (StringUtils.isEmpty(queryInfo.getStartTime())) {
             return failed("时间不能为空");

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dao.SysMusicCompareRecordDao;
 import com.yonge.cooleshow.biz.dal.dto.*;
@@ -13,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.enums.IndexDataType;
 import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
@@ -56,6 +58,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Resource
 	private StudentService studentService;
 	@Resource
+	private SubjectService subjectService;
+	@Resource
 	private SysUserService sysUserService;
 	@Resource
 	private SysMusicCompareWeekDataService sysMusicCompareWeekDataService;
@@ -371,9 +375,20 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 		userTrainChartResult.add(new IndexBaseDto(IndexDataType.CLOUD_STUDY_TRAIN_TIME, trainTimeData));
 		userTrainChartResult.add(new IndexBaseDto(IndexDataType.CLOUD_STUDY_TRAIN_NUM, trainNumData));
+		//获取学员基本信息
+		SysUser sysUser = sysUserService.findUserById(queryInfo.getUserId());
+		StudentWrapper.BasicUserInfo basicUserInfo = new StudentWrapper.BasicUserInfo();
+		basicUserInfo.setUsername(sysUser.getUsername());
+		basicUserInfo.setAvatar(sysUser.getAvatar());
+		Student student = studentService.getById(queryInfo.getUserId());
+		if(Objects.nonNull(student) && StringUtils.isNotEmpty(student.getSubjectId())){
+			Subject subject = subjectService.get(Long.parseLong(student.getSubjectId()));
+			basicUserInfo.setSubjectName(subject.getName());
+		}
 
 		result.put("userTrainChartData", userTrainChartResult);
 		result.put("detail",pageInfo);
+		result.put("userInfo",basicUserInfo);
 		return result;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

@@ -230,4 +230,19 @@ public class StudentWrapper {
         private Long tenantGroupId;
         private Integer count;
     }
+
+    //用户基本信息
+    @Data
+    @ApiModel("用户基本信息")
+    public static class BasicUserInfo implements Serializable {
+
+        @ApiModelProperty("用户名")
+        private String username;
+
+        @ApiModelProperty("用户头像")
+        private String avatar;
+
+        @ApiModelProperty("声部")
+        private String subjectName;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/UserInfoWrapper.java

@@ -32,4 +32,5 @@ public class UserInfoWrapper {
         private ClientEnum client;
 
     }
+
 }