管乐迷12月20号需求变更

mec-application/src/main/java/com/ym/mec/teacher/controller/CourseHomeworkController.java

@@ -12,10 +12,7 @@ import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
-import com.ym.mec.biz.service.CourseHomeworkService;
-import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
-import com.ym.mec.biz.service.StudentCourseHomeworkService;
-import com.ym.mec.biz.service.StudentLessonTrainingDetailService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -47,7 +44,7 @@ public class CourseHomeworkController extends BaseController {
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @Autowired
     private StudentLessonTrainingDetailService studentLessonTrainingDetailService;
@@ -66,11 +63,7 @@ public class CourseHomeworkController extends BaseController {
     @ApiOperation(value = "根据班级获取教师布置的作业")
     @GetMapping("/findTeacherCourseHomeworkByClassGroup")
     public Object findTeacherCourseHomeworkByClassGroup(CourseHomeworkQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        queryInfo.setUserId(sysUser.getId().longValue());
+        queryInfo.setUserId(sysUserService.getUserId().longValue());
         return succeed(courseHomeworkService.findTeacherCourseHomeworkByClassGroup(queryInfo));
     }
 

mec-application/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -1,9 +1,6 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
@@ -26,7 +23,6 @@ import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomework.java

@@ -10,6 +10,7 @@ import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -18,6 +19,7 @@ import java.util.List;
 /**
  * 对应数据库表(student_course_homework):
  */
+@Data
 public class StudentCourseHomework extends BaseEntity {
 
 	/**  */
@@ -101,126 +103,6 @@ public class StudentCourseHomework extends BaseEntity {
     @ApiModelProperty(value = "练习内容")
     private List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetail;
 
-    public List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> getStudentLessonTrainingDetail() {
-        return studentLessonTrainingDetail;
-    }
-
-    public void setStudentLessonTrainingDetail(List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetail) {
-        this.studentLessonTrainingDetail = studentLessonTrainingDetail;
-    }
-
-    public ELessonTrainingType getType() {
-        return type;
-    }
-
-    public void setType(ELessonTrainingType type) {
-        this.type = type;
-    }
-
-    public Boolean getFinishFlag() {
-        return finishFlag;
-    }
-
-    public void setFinishFlag(Boolean finishFlag) {
-        this.finishFlag = finishFlag;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public Boolean getVipFlag() {
-        return vipFlag;
-    }
-
-    public void setVipFlag(Boolean vipFlag) {
-        this.vipFlag = vipFlag;
-    }
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public StandardEnum getStandardFlag() {
-		return standardFlag;
-	}
-
-	public void setStandardFlag(StandardEnum standardFlag) {
-		this.standardFlag = standardFlag;
-	}
-
-	public String getMusicScoreContent() {
-		return musicScoreContent;
-	}
-
-	public void setMusicScoreContent(String musicScoreContent) {
-		this.musicScoreContent = musicScoreContent;
-	}
-
-	public String getMusicScoreName() {
-		return musicScoreName;
-	}
-
-	public void setMusicScoreName(String musicScoreName) {
-		this.musicScoreName = musicScoreName;
-	}
-
-	public String getMusicScoreId() {
-		return musicScoreId;
-	}
-
-	public void setMusicScoreId(String musicScoreId) {
-		this.musicScoreId = musicScoreId;
-	}
-
-	public ImSendTypeEnum getMsgType() {
-		return msgType;
-	}
-
-	public void setMsgType(ImSendTypeEnum msgType) {
-		this.msgType = msgType;
-	}
-
-	public Date getSubmitTime() {
-		return submitTime;
-	}
-
-	public void setSubmitTime(Date submitTime) {
-		this.submitTime = submitTime;
-	}
-
-	public boolean isExtra() {
-		return extra;
-	}
-
-	public void setExtra(boolean extra) {
-		this.extra = extra;
-	}
-
-	public String getAvatar() {
-		return avatar;
-	}
-
-	public void setAvatar(String avatar) {
-		this.avatar = avatar;
-	}
-
 	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 
@@ -243,30 +125,6 @@ public class StudentCourseHomework extends BaseEntity {
 		this.isRepliedTimely = isRepliedTimely;
 	}
 
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public Long getCourseScheduleId() {
-		return courseScheduleId;
-	}
-
-	public void setCourseScheduleId(Long courseScheduleId) {
-		this.courseScheduleId = courseScheduleId;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
 	public YesOrNoEnum getIsView() {
 		return isView;
 	}
@@ -282,87 +140,6 @@ public class StudentCourseHomework extends BaseEntity {
 	public void setIsReplied(YesOrNoEnum isReplied) {
 		this.isReplied = isReplied;
 	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public YesOrNoEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(YesOrNoEnum status) {
-		this.status = status;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public void setCourseHomeworkId(Long courseHomeworkId){
-		this.courseHomeworkId = courseHomeworkId;
-	}
-	
-	public Long getCourseHomeworkId(){
-		return this.courseHomeworkId;
-	}
-			
-	public void setAttachments(String attachments){
-		this.attachments = attachments;
-	}
-	
-	public String getAttachments(){
-		return this.attachments;
-	}
-			
-	public void setScore(Integer score){
-		this.score = score;
-	}
-	
-	public Integer getScore(){
-		return this.score;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public CourseHomework getCourseHomework() {
-		return courseHomework;
-	}
-
-	public void setCourseHomework(CourseHomework courseHomework) {
-		this.courseHomework = courseHomework;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);