Merge remote-tracking branch 'origin/dev_1_2_20220802' into dev_1_2_20220802

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/UserSetReq.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -17,6 +18,7 @@ public class UserSetReq {
     @ApiModelProperty("头像地址")
     private String avatar;
     @ApiModelProperty("昵称")
+    @Size(max = 7, message = "昵称长度不能超过7个字")
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
     private Integer gender;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -559,7 +559,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/submitSetDetail")
     @ApiOperation(value = "修改设置信息", notes = "传入teacher")
-    public HttpResponseResult<UserSetVo> submitSetDetail(@RequestBody UserSetReq setReq) {
+    public HttpResponseResult<UserSetVo> submitSetDetail(@RequestBody @Valid UserSetReq setReq) {
         AuthUser authUser = SecurityUtils.getUser();
         if (authUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

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

@@ -0,0 +1,49 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-09
+ */
+@ApiModel("参与活动分数")
+public class EvaluationRecordDto {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("活动项目")
+    private Long evaluationId;
+
+    @ApiModelProperty("分数")
+    private BigDecimal score;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getEvaluationId() {
+        return evaluationId;
+    }
+
+    public void setEvaluationId(Long evaluationId) {
+        this.evaluationId = evaluationId;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+}

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

@@ -28,7 +28,7 @@ public class LiveCourseGroupDto implements Serializable {
     private Long teacherId;
 
     @NotNull(message = "课程组名称不能为空")
-    @Size(max = 50, message = "课程组名称长度不能超过50个字")
+    @Size(max = 20, message = "课程组名称长度不能超过20个字")
     @ApiModelProperty(value = "课程组名称")
     private String name;
 

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

@@ -64,6 +64,17 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "是否置顶(0:否;1:是)")
     private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
 
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
     public YesOrNoEnum getTopFlag() {
         return topFlag;
     }

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

@@ -26,8 +26,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     private ClientEnum userType;
 
 
-    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
-    private YesOrNoEnum auditVersion;
 
     @ApiModelProperty(value = "版本号")
     private String version;
@@ -46,15 +44,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     }
 
 
-
-    public YesOrNoEnum getAuditVersion() {
-        return auditVersion;
-    }
-
-    public void setAuditVersion(YesOrNoEnum auditVersion) {
-        this.auditVersion = auditVersion;
-    }
-
     public String getVersion() {
         return version;
     }

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -34,6 +35,7 @@ public class VideoLessonGroup extends BaseEntity {
     @TableField("lesson_name_")
     @ApiModelProperty(value = "课程名称", required = true)
     @NotBlank(message = "课程名称不能为空;", groups = {AddGroup.class, UpdateGroup.class})
+    @Size(max = 20, message = "课程名称长度不能超过20个字")
     private String lessonName;  //课程名称
 
     @TableField("lesson_subject_")

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

@@ -65,6 +65,7 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
                 activityMusicVo.setScore(activityUserList.get(0).getScore());
                 activityMusicVo.setUserAvatar(activityUserList.get(0).getUserAvatar());
                 activityMusicVo.setUsername(activityUserList.get(0).getUsername());
+                activityMusicVo.setUserId(activityUserList.get(0).getUserId());
             }
         }
         return result;

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

@@ -906,6 +906,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     public Boolean top(Long musicSheetId) {
         MusicSheet musicSheet = getById(musicSheetId);
 
+        if (YesOrNoEnum.NO.equals(musicSheet.getState())) {
+            throw new BizException("下架的曲目不能置顶");
+        }
+
         if (YesOrNoEnum.YES.equals(musicSheet.getTopFlag())) {
             musicSheet.setTopFlag(YesOrNoEnum.NO);
             return this.saveOrUpdate(musicSheet);

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

@@ -84,16 +84,6 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		// 保存评测记录
 		long insert = super.insert(bean);
 
-		// 判断是否为活动评测 活动评测 记录活动记录
-		if (bean.getEvaluationId() != null) {
-			try {
-				activityEvaluationRecordService.saveRecord(bean.getEvaluationId(),bean.getUserId(),bean.getScore());
-			} catch (Exception e) {
-				e.printStackTrace();
-				log.error("活动评测记录保存失败，{}",e.fillInStackTrace());
-			}
-		}
-
 		return insert;
 	}
 
@@ -102,6 +92,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	public void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord) {
 		
 		sysMusicCompareRecordDao.update(sysMusicCompareRecord);
+
 	}
 
 	@Override

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

@@ -4,6 +4,7 @@ import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
 @ApiModel
 public class ArrangeCourseVo implements Serializable {
     @ApiModelProperty("课程名称")
+    @Size(max = 20, message = "课程名称长度不能超过20个字")
     private String courseName;
     @ApiModelProperty("声部id")
     private Long subjectId;

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 /**
  * @author: cy
@@ -20,6 +21,7 @@ public class VideoLessonGroupUpVo extends BaseEntity {
     private Long id;
 
     @ApiModelProperty(value = "课程名称")
+    @Size(max = 20, message = "课程名称长度不能超过20个字")
     private String lessonName;
 
     @ApiModelProperty(value = "课程声部")

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

@@ -79,6 +79,9 @@
         <where>
             su.del_flag_ = 0
             <include refid="QueryInfo"/>
+            <if test="param.auditVersion != null ">
+                and #{param.auditVersion} = t.audit_version_
+            </if>
         </where>
         order by
         <if test="param.myself == null or param.myself == false ">

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

@@ -3,20 +3,24 @@ package com.yonge.cooleshow.student.controller;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.ActivityEvaluationRecordDto;
+import com.yonge.cooleshow.biz.dal.dto.EvaluationRecordDto;
+import com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
 import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
 
 
 @Api(tags = "学生活动接口")
@@ -30,6 +34,8 @@ public class StudentActivityController extends BaseController {
     @Autowired
     private ActivityPlanService activityPlanService;
 
+    @Autowired
+    private ActivityEvaluationRecordService activityEvaluationRecordService;
 
     @ApiOperation(value = "评测活动参与项目", notes = "评测项目id")
     @PostMapping(value = "/evaluation/{evaluationId}")
@@ -54,5 +60,21 @@ public class StudentActivityController extends BaseController {
         return succeed(activityPlanService.joinActivity(id, user));
     }
 
+
+    @ApiOperation(value = "保存活动分数")
+    @PostMapping("/evaluationScore")
+    public HttpResponseResult evaluationScore( @RequestBody EvaluationRecordDto record){
+
+        // 判断是否为活动评测 活动评测 记录活动记录
+        if (record.getEvaluationId() != null) {
+            try {
+                activityEvaluationRecordService.saveRecord(record.getEvaluationId(),record.getUserId(),record.getScore());
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("活动评测记录保存失败，{}",e.fillInStackTrace());
+            }
+        }
+        return succeed();
+    }
 }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -95,9 +95,9 @@ public class OpenShareController extends BaseController {
     @ApiOperation(value = "老师活动分享", notes = "活动id")
     @PostMapping(value = "/activity/info/{id}")
     public HttpResponseResult<MusicActivityVo> getDetail(@PathVariable Long id) {
-        SysUser user = sysUserFeignService.queryUserInfo();
+        // SysUser user = sysUserFeignService.queryUserInfo();
 
-        MusicActivityVo activityVo = activityPlanService.getActivityInfo(id, user);
+        MusicActivityVo activityVo = activityPlanService.getActivityInfo(id, null);
 
         return succeed(activityVo);
     }