新增realname

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

@@ -14,6 +14,8 @@ public class CourseRepliedVo extends CourseScheduleReplied {
     @ApiModelProperty("用户名")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty("头像地址")
     private String avatar;
 
@@ -35,6 +37,14 @@ public class CourseRepliedVo extends CourseScheduleReplied {
     @ApiModelProperty("声部名称")
     private String subjectName;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getUserName() {
         return userName;
     }

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

@@ -39,6 +39,8 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "陪练课:用户名,直播课:课程名")
     private String name;
 
+    private String realName;
+
     @ApiModelProperty(value = "陪练课:用户头像,直播课:直播背景图")
     private String cover;
 
@@ -57,6 +59,14 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "直播课成课后生成的im群id")
     private String imGroupId;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public Integer getCourseId() {
         return courseId;
     }

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

@@ -42,12 +42,22 @@ public class LessonGroupVo extends BaseEntity {
     @ApiModelProperty(value = "用户昵称")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty(value = "头像")
     private String avatar;
 
     @ApiModelProperty("购买人数")
     private Integer countStudent;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -21,6 +21,8 @@ public class MyCourseVo implements Serializable {
     @ApiModelProperty(value = "用户姓名")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty(value = "头像地址")
     private String avatar;
 
@@ -51,6 +53,14 @@ public class MyCourseVo implements Serializable {
     @ApiModelProperty(value = "签到时间")
     private String signInTime;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getSignInTime() {
         return signInTime;
     }

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

@@ -24,6 +24,8 @@ public class MyRepliedVo implements Serializable {
     @ApiModelProperty(value = "用户姓名")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty(value = "头像地址")
     private String avatar;
 
@@ -48,6 +50,14 @@ public class MyRepliedVo implements Serializable {
     @ApiModelProperty(value = "学员课后评价")
     private String studentReplied;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public Long getCourseId() {
         return courseId;
     }

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

@@ -17,6 +17,8 @@ public class PracticeTeacherVo implements Serializable {
     @ApiModelProperty(value = "用户姓名")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty(value = "头像地址")
     private String avatar;
 
@@ -47,6 +49,14 @@ public class PracticeTeacherVo implements Serializable {
     @ApiModelProperty(value = "课程时长(分钟)")
     private String courseMinutes;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -21,6 +21,8 @@ public class PracticeVo implements Serializable {
     @ApiModelProperty(value = "用户名")
     private String userName;
 
+    private String realName;
+
     @ApiModelProperty(value = "用户手机号")
     private String phone;
 
@@ -54,6 +56,14 @@ public class PracticeVo implements Serializable {
     @ApiModelProperty(value = "课程状态")
     private String status;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public Long getUserId() {
         return userId;
     }

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

@@ -26,6 +26,7 @@ public class StudentHomePage implements Serializable {
         private Long teacherId;
         @ApiModelProperty(value = "老师姓名")
         private String teacherName;
+        private String realName;
         @ApiModelProperty(value = "老师头像")
         private String avatar;
 
@@ -42,6 +43,14 @@ public class StudentHomePage implements Serializable {
         @ApiModelProperty(value = "开课时间")
         private Date courseStartTime;
 
+        public String getRealName() {
+            return realName;
+        }
+
+        public void setRealName(String realName) {
+            this.realName = realName;
+        }
+
         public Long getTeacherId() {
             return teacherId;
         }
@@ -120,6 +129,7 @@ public class StudentHomePage implements Serializable {
         private Long teacherId;
         @ApiModelProperty(value = "老师姓名")
         private String teacherName;
+        private String realName;
         @ApiModelProperty(value = "老师头像")
         private String avatar;
 
@@ -138,6 +148,14 @@ public class StudentHomePage implements Serializable {
         @ApiModelProperty(value = "购买人数")
         private Integer buyCount;
 
+        public String getRealName() {
+            return realName;
+        }
+
+        public void setRealName(String realName) {
+            this.realName = realName;
+        }
+
         public Integer getBuyCount() {
             return buyCount;
         }
@@ -224,6 +242,7 @@ public class StudentHomePage implements Serializable {
         private Long teacherId;
         @ApiModelProperty(value = "老师姓名")
         private String teacherName;
+        private String realName;
         @ApiModelProperty(value = "老师头像")
         private String avatar;
 
@@ -246,6 +265,14 @@ public class StudentHomePage implements Serializable {
         @ApiModelProperty(value = "购买人数")
         private Integer buyCount;
 
+        public String getRealName() {
+            return realName;
+        }
+
+        public void setRealName(String realName) {
+            this.realName = realName;
+        }
+
         public Integer getBuyCount() {
             return buyCount;
         }

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

@@ -13,12 +13,22 @@ public class VideoLessonAuthGroup extends VideoLessonGroup {
     @ApiModelProperty(value = "老师姓名")
     private String teacherName;
 
+    private String realName;
+
     @ApiModelProperty(value = "老师手机号")
     private String teacherPhone;
 
     @ApiModelProperty(value = "课程名称")
     private String subjectName;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getTeacherPhone() {
         return teacherPhone;
     }

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

@@ -13,6 +13,7 @@ import java.util.Date;
  */
 @ApiModel(value = "VideoLessonEvaluateVo-视频课学员评价")
 public class VideoLessonEvaluateVo extends BaseEntity {
+	private String realName;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
@@ -35,6 +36,14 @@ public class VideoLessonEvaluateVo extends BaseEntity {
     @ApiModelProperty(value = "评论时间")
     private Date evaluateTime;
 
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
 	public Long getUserId() {
 		return userId;
 	}

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

@@ -12,11 +12,21 @@ import io.swagger.annotations.ApiModelProperty;
 public class VideoLessonGroupDetailVo extends VideoLessonGroupDetail {
 
     @ApiModelProperty(value = "老师姓名")
-    private String teacherName;  //主键ID
+    private String teacherName;
+
+    private String realName;
 
     @ApiModelProperty(value = "老师手机号")
     private String teacherPhone;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getTeacherName() {
         return teacherName;
     }

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "VideoLessonGroupVo对象", description = "视频课组列表")
 public class VideoLessonGroupVo extends VideoLessonGroup {
+    private String realName;
 
     @ApiModelProperty(value = "用户名")
     private String username;
@@ -20,6 +21,14 @@ public class VideoLessonGroupVo extends VideoLessonGroup {
     @ApiModelProperty("购买人数")
     private Integer countStudent;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getUsername() {
         return username;
     }

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

@@ -16,6 +16,8 @@ public class VideoLessonPurchaseVo extends BaseEntity {
     @ApiModelProperty("学员姓名")
     private String username;
 
+    private String realName;
+
     @ApiModelProperty(value = "支付金额")
     private String payMoney;
 
@@ -25,6 +27,14 @@ public class VideoLessonPurchaseVo extends BaseEntity {
     @ApiModelProperty(value = "购买时间")
     private String purchaseTime;
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getStudentId() {
         return studentId;
     }

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

@@ -143,6 +143,7 @@
         SELECT
             u.id_ AS userId,
             u.username_ AS userName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
             cs.class_date_ AS classDate,
             cs.start_time_ AS startTime,
@@ -236,6 +237,7 @@
             s.teacher_id_ AS teacherId,
             u.id_ AS userId,
             u.username_ AS userName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
             g.subject_id_ AS subjectId,
             b.name_ AS subjectName
@@ -273,6 +275,7 @@
             cs.type_ AS courseType,
             NULL AS userId,
             CONCAT(g.name_,'-第',cs.class_num_,'课') AS name,
+            NULL AS realName,
             p.payCount AS payCount,
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,
@@ -303,6 +306,7 @@
             cs.type_ AS courseType,
             u.id_ AS userId,
             u.username_ AS name,
+            u.real_name_ AS realName,
             NULL AS payCount,
             u.avatar_ AS cover,
             g.subject_id_ AS subjectId,
@@ -329,6 +333,7 @@
         SELECT
         t.user_id_ AS teacherId,
         u.username_ AS userName,
+        u.real_name_ AS realName,
         u.avatar_ AS avatar,
 
         tt.star_grade_ AS starGrade,
@@ -373,6 +378,7 @@
             s.status_ AS `status`,
             u.id_ AS userId,
             u.username_ AS name,
+            u.real_name_ AS realName,
             u.avatar_ AS cover,
             g.subject_id_ AS subjectId,
             b.name_ AS subjectName
@@ -394,6 +400,7 @@
             s.status_ AS `status`,
             NULL AS userId,
             CONCAT(g.name_,'-第',s.class_num_,'课') AS name,
+            NULL AS realName,
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName
@@ -467,6 +474,7 @@
         SELECT
             u.id_ AS teacherId,
             u.username_ AS teacherName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
             g.id_ AS courseGroupId,
             g.name_ AS courseGroupName,
@@ -484,6 +492,7 @@
         SELECT
             u.id_ AS teacherId,
             u.username_ AS teacherName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
             g.id_ AS videoGroupId,
             g.lesson_name_ AS videoGroupName,
@@ -505,6 +514,7 @@
         SELECT
             u.id_ AS teacherId,
             u.username_ AS teacherName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
             p.course_group_id_ AS courseGroupId,
             p.course_id_ AS courseId,

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

@@ -117,6 +117,7 @@
             s.start_time_ AS startTime,
             s.end_time_ AS endTime,
             u.id_ AS studentId,
+            u.real_name_ AS realName,
             u.username_ AS userName,
             u.avatar_ AS avatar
         FROM course_schedule_replied r
@@ -138,6 +139,7 @@
         SELECT
             <include refid="baseColumns"/>,
             u.username_ AS userName,
+            u.real_name_ AS realName,
             u.avatar_ AS avatar,
 
             s.class_date_ AS classDate,

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

@@ -6,6 +6,7 @@
 		SELECT
 			u.id_ AS userId,
 			u.username_ AS userName,
+			u.real_name_ AS realName,
 			u.phone_ AS phone,
 			s.name_ AS subjectName,
 			p.course_id_ AS courseId,
@@ -51,6 +52,7 @@
 		SELECT
 			u.id_ AS userId,
 			u.username_ AS userName,
+			u.real_name_ AS realName,
 			u.phone_ AS phone,
 			s.name_ AS subjectName,
 			p.course_id_ AS courseId,

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

@@ -19,6 +19,7 @@
 		SELECT
 			u.id_ AS userId,
 			u.username_ AS userName,
+			u.real_name_ AS realName,
 			u.avatar_ AS avatar,
 			e.is_teacher_ AS isTeacher,
 			e.id_	AS evaluateId,

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

@@ -85,6 +85,7 @@
 			d.sort_number_ AS sortNumber,
 			d.teacher_id_ AS teacherId,
 			u.username_ AS teacherName,
+			u.real_name_ AS realName,
 			u.phone_ AS teacherPhone,
 			d.create_time_ AS createTime,
 			d.update_by_ AS updateBy,

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

@@ -94,6 +94,7 @@
 			<include refid="baseColumns"/>
 			s.username_ AS username,
 			s.avatar_ AS avatar,
+		    s.real_name_ AS realName,
 			(SELECT COUNT(1) FROM video_lesson_purchase_record r WHERE r.video_lesson_group_id_=g.id_) AS countStudent
 		FROM video_lesson_group g
 		LEFT JOIN sys_user s ON g.teacher_id_ = s.id_
@@ -188,6 +189,7 @@
 		SELECT
 			p.student_id_ AS studentId,
 			u.username_ AS username,
+			u.real_name_ AS realName,
 			p.pay_money_ AS payMoney,
 			p.order_no_ AS orderNo,
 			p.purchase_time_ AS purchaseTime
@@ -227,6 +229,7 @@
 			g.lesson_count_ AS lessonCount,
 			g.teacher_id_ AS teacherId,
 			u.username_ AS userName,
+			u.real_name_ AS realName,
 			u.avatar_ AS avatar,
 			(SELECT COUNT(1) FROM video_lesson_purchase_record r WHERE r.video_lesson_group_id_=g.id_) AS countStudent
 		FROM video_lesson_group g
@@ -255,6 +258,7 @@
 		r.audit_status_ AS auditStatus,
 		s.name_ AS subjectName,
 		t.username_ AS teacherName,
+		t.real_name_ AS realName,
 		t.phone_ AS teacherPhone
 		FROM video_lesson_group g
 		LEFT JOIN `subject` s ON g.lesson_subject_=s.id_

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/entity/UploadSign.java

@@ -9,18 +9,18 @@ import java.util.Map;
  * @Date: 2022/4/27
  */
 public class UploadSign implements Serializable {
-    private String fileName;
+    private String filename;
     
     private Map<String, String> postData;
     
     private List<String> unknowValueField;
 
-    public String getFileName() {
-        return fileName;
+    public String getFilename() {
+        return filename;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
+    public void setFilename(String filename) {
+        this.filename = filename;
     }
 
     public Map<String, String> getPostData() {

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -131,7 +131,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
     @Override
     public PostObjectFormFields getUploadSign(UploadSign uploadSign) {
         //要上传的文件名称,不包含路径信息
-        String fileName = uploadSign.getFileName();
+        String fileName = uploadSign.getFilename();
         //可以确定值得表单项
         Map<String, String> postData = uploadSign.getPostData();
         //无法确定值得表单项

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -147,7 +147,7 @@ public class KS3StoragePlugin implements StoragePlugin, InitializingBean, Dispos
     @Override
     public PostObjectFormFields getUploadSign(UploadSign uploadSign) {
         //要上传的文件名称,不包含路径信息
-        String fileName = uploadSign.getFileName();
+        String fileName = uploadSign.getFilename();
         //可以确定值得表单项
         Map<String, String> postData = uploadSign.getPostData();
         //无法确定值得表单项