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

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

@@ -383,7 +383,6 @@ public class UserController extends BaseController {
                     return failed("手机号被占用");
                 }
             }
-            sysUser.setIsSuperAdmin(null);
             sysUserService.updateBaseInfo(sysUser);
             return succeed();
         }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverter.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.common.config;
 import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 
-public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String, T> {
+public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<Object, T> {
 
 	private Class<T> enumType;
 
@@ -12,18 +12,23 @@ public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String
 	}
 
 	@Override
-	public T convert(String source) {
+	public T convert(Object source) {
 		return getEnum(enumType, source);
 	}
 
-	private T getEnum(Class<T> targerType, String source) {
+	private T getEnum(Class<T> targerType, Object source) {
+		if(null == source){
+			return null;
+		}
 		for (T en : targerType.getEnumConstants()) {
 			if (en.getCode() instanceof Integer) {
-				if (en.getCode().equals(Integer.parseInt(source))) {
-					return en;
-				}
+				try {
+					if (en.getCode().equals(Integer.parseInt(source.toString()))) {
+						return en;
+					}
+				}catch (Exception e){}
 			} else {
-				if (source.equals(String.valueOf(en.getCode()))) {
+				if (source.toString().equals(String.valueOf(en.getCode()))) {
 					return en;
 				}
 			}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverterFactory.java

@@ -1,16 +1,27 @@
 package com.yonge.cooleshow.common.config;
 
+import com.google.common.collect.Maps;
 import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 @Component
-public class EnumConverterFactory implements ConverterFactory<String, BaseEnum<?, ?>> {
+public class EnumConverterFactory implements ConverterFactory<Object, BaseEnum<?, ?>> {
+	@SuppressWarnings("rawtypes")
+	private static final Map<Class, Converter> CONVERTERS = Maps.newHashMap();
 
 	@Override
-	public <T extends BaseEnum<?, ?>> Converter<String, T> getConverter(Class<T> targetType) {
-		return new EnumConverter<T>(targetType);
+	public <T extends BaseEnum<?, ?>> Converter<Object, T> getConverter(Class<T> targetType) {
+		Converter<Object, T> converter = CONVERTERS.get(targetType);
+		if (converter == null) {
+			converter = new EnumConverter<>(targetType);
+			CONVERTERS.put(targetType, converter);
+		}
+		return converter;
+
 	}
 
 }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImBaseMessage.java

@@ -1,7 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public abstract class ImBaseMessage {
-    public abstract String getType();
-
-    public abstract String toString();
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImGroupMember.java

@@ -1,45 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public class ImGroupMember {
-    public String id;
-    public String groupId;
-    public Integer munite;
-
-    public ImGroupMember() {
-    }
-
-    public ImGroupMember(String id) {
-        this.id = id;
-    }
-
-    public ImGroupMember(String id, String groupId, Integer munite) {
-        this.id = id;
-        this.groupId = groupId;
-        this.munite = munite;
-    }
-
-    public ImGroupMember setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public String getGroupId() {
-        return this.groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public Integer getMunite() {
-        return this.munite;
-    }
-
-    public void setMunite(Integer munite) {
-        this.munite = munite;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImGroupMessage.java

@@ -1,57 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public class ImGroupMessage extends ImMessageModel {
-    public Integer isIncludeSender;
-    public Integer isPersisted;
-    public Integer contentAvailable;
-    public String[] toUserId;
-    private String type;
-
-    public ImGroupMessage setContent(ImTxtMessage content) {
-        super.setContent(content);
-        return this;
-    }
-
-    public ImGroupMessage() {
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getIsIncludeSender() {
-        return isIncludeSender;
-    }
-
-    public void setIsIncludeSender(Integer isIncludeSender) {
-        this.isIncludeSender = isIncludeSender;
-    }
-
-    public Integer getIsPersisted() {
-        return isPersisted;
-    }
-
-    public void setIsPersisted(Integer isPersisted) {
-        this.isPersisted = isPersisted;
-    }
-
-    public Integer getContentAvailable() {
-        return contentAvailable;
-    }
-
-    public void setContentAvailable(Integer contentAvailable) {
-        this.contentAvailable = contentAvailable;
-    }
-
-    public String[] getToUserId() {
-        return toUserId;
-    }
-
-    public void setToUserId(String[] toUserId) {
-        this.toUserId = toUserId;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImGroupModel.java

@@ -1,163 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-public class ImGroupModel{
-    //群组编号
-    private String id;
-    //用户列表
-    private ImGroupMember[] members;
-    //用户列表
-    private List<ImGroupMember> memberList;
-    //群名称
-    private String name;
-    private String teacherIds;
-    private String img;
-    private String groupName;
-    private Integer minute;
-    private Integer count;
-    private Integer status;
-    private String userRole;
-
-    public ImGroupModel() {
-    }
-
-    public ImGroupModel(String id) {
-        this.id = id;
-    }
-
-    public ImGroupModel(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public ImGroupModel(String id, ImGroupMember[] members, String name) {
-        this.id = id;
-        this.members = members;
-        this.name = name;
-    }
-
-    public String getUserRole() {
-        return userRole;
-    }
-
-    public void setUserRole(String userRole) {
-        this.userRole = userRole;
-    }
-
-    public List<ImGroupMember> getMemberList() {
-        return memberList;
-    }
-
-    public void setMemberList(List<ImGroupMember> memberList) {
-        this.memberList = memberList;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getTeacherIds() {
-        return teacherIds;
-    }
-
-    public void setTeacherIds(String teacherIds) {
-        this.teacherIds = teacherIds;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    public ImGroupModel(String id, ImGroupMember[] members, String name, Integer minute) {
-        this.id = id;
-        this.members = members;
-        this.name = name;
-        this.minute = minute;
-    }
-
-    public ImGroupModel(String id, Integer status) {
-        this.id = id;
-        this.status = status;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public ImGroupModel setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public ImGroupMember[] getMembers() {
-        return this.members;
-    }
-
-    public ImGroupModel setMembers(ImGroupMember[] members) {
-        if(members != null && members.length > 0){
-            this.members = members;
-        }
-        return this;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public ImGroupModel setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public Integer getMinute() {
-        return this.minute;
-    }
-
-    public ImGroupModel setMinute(Integer minute) {
-        this.minute = minute;
-        return this;
-    }
-
-    public Integer getStatus() {
-        return this.status;
-    }
-
-    public ImGroupModel setStatus(Integer status) {
-        this.status = status;
-        return this;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ImGroupModel that = (ImGroupModel) o;
-        return id.equals(that.id) && Arrays.equals(members, that.members) && memberList.equals(that.memberList);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = Objects.hash(id, memberList);
-        result = 31 * result + Arrays.hashCode(members);
-        return result;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImMessageModel.java

@@ -1,81 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public class ImMessageModel {
-    //	发送人 Id  必填
-    private String senderId;
-    //接收人 Id  必填
-    private String[] targetId;
-    //消息类型, 分为两类: 内置消息类型 、自定义消息类型  RC:TxtMsg,RC:ImgMsg,RC:VcMsg,RC:ImgTextMsg,RC:FileMsg,RC:LBSMsg  必填
-    private String objectName;
-    //消息内容  必填
-    private ImBaseMessage content;
-    //push 内容, 分为两类 内置消息 Push 、自定义消息 Push  RC:TxtMsg,RC:ImgMsg,RC:VcMsg,RC:ImgTextMsg,RC:FileMsg,RC:LBSMsg
-    private String pushContent;
-    private String pushData;
-
-    public ImMessageModel() {
-    }
-
-    public ImMessageModel(String senderId, String[] targetId, String objectName, ImBaseMessage content, String pushContent, String pushData) {
-        this.senderId = senderId;
-        this.targetId = targetId;
-        this.objectName = objectName;
-        this.content = content;
-        this.pushContent = pushContent;
-        this.pushData = pushData;
-    }
-
-    public String[] getTargetId() {
-        return this.targetId;
-    }
-
-    public ImMessageModel setTargetId(String[] targetId) {
-        this.targetId = targetId;
-        return this;
-    }
-
-    public String getObjectName() {
-        return this.objectName;
-    }
-
-    public ImMessageModel setObjectName(String objectName) {
-        this.objectName = objectName;
-        return this;
-    }
-
-    public ImBaseMessage getContent() {
-        return this.content;
-    }
-
-    public ImMessageModel setContent(ImBaseMessage content) {
-        this.content = content;
-        return this;
-    }
-
-    public String getPushContent() {
-        return this.pushContent;
-    }
-
-    public ImMessageModel setPushContent(String pushContent) {
-        this.pushContent = pushContent;
-        return this;
-    }
-
-    public String getPushData() {
-        return this.pushData;
-    }
-
-    public ImMessageModel setPushData(String pushData) {
-        this.pushData = pushData;
-        return this;
-    }
-
-    public String getSenderId() {
-        return this.senderId;
-    }
-
-    public ImMessageModel setSenderId(String senderId) {
-        this.senderId = senderId;
-        return this;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImNoticeMessage.java

@@ -1,38 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class ImNoticeMessage extends ImBaseMessage {
-    private String content = "";
-    private String extra = "";
-    private static final transient String TYPE = "DY:NoticeMsg";
-
-    public ImNoticeMessage(String content, String extra) {
-        this.content = content;
-        this.extra = extra;
-    }
-
-    public String getType() {
-        return TYPE;
-    }
-
-    public String getContent() {
-        return this.content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getExtra() {
-        return this.extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-
-    public String toString() {
-        return JSONObject.toJSONString(this);
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImPlayMidiMessage.java

@@ -1,38 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class ImPlayMidiMessage extends ImBaseMessage {
-    private String content = "";
-    private String extra = "";
-    private static final transient String TYPE = "DY:PlayMidiMessage";
-
-    public ImPlayMidiMessage(String content, String extra) {
-        this.content = content;
-        this.extra = extra;
-    }
-
-    public String getType() {
-        return TYPE;
-    }
-
-    public String getContent() {
-        return this.content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getExtra() {
-        return this.extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-
-    public String toString() {
-        return JSONObject.toJSONString(this);
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImPrivateMessage.java

@@ -1,113 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public class ImPrivateMessage extends ImMessageModel {
-    public String count;
-    public String type;
-    //是否在融云服务器存储, 0: 不存储, 1: 存储, 默认: 1
-    public Integer isPersisted;
-    public Integer isCounted;
-    //是否过滤接收用户黑名单列表, 0: 不过滤 、1: 过滤，默认: 0
-    public Integer verifyBlacklist;
-    //发送者自己是否接收此条消息, 0: 不接收, 1: 接收, 默认: 0
-    public Integer isIncludeSender;
-    public Integer contentAvailable;
-
-    public ImPrivateMessage() {
-    }
-
-    public ImPrivateMessage setSenderId(String senderId) {
-        super.setSenderId(senderId);
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String[] getTargetId() {
-        return super.getTargetId();
-    }
-
-    public ImPrivateMessage setTargetId(String[] targetId) {
-        super.setTargetId(targetId);
-        return this;
-    }
-
-    public ImPrivateMessage setContent(ImTxtMessage content) {
-        super.setContent(content);
-        return this;
-    }
-
-    public ImPrivateMessage setPushContent(String pushContent) {
-        super.setPushContent(pushContent);
-        return this;
-    }
-
-    public ImPrivateMessage setPushData(String pushData) {
-        super.setPushData(pushData);
-        return this;
-    }
-
-    public String getCount() {
-        return this.count;
-    }
-
-    public ImPrivateMessage setCount(String count) {
-        this.count = count;
-        return this;
-    }
-
-    public Integer getVerifyBlacklist() {
-        return this.verifyBlacklist;
-    }
-
-    public ImPrivateMessage setVerifyBlacklist(Integer verifyBlacklist) {
-        this.verifyBlacklist = verifyBlacklist;
-        return this;
-    }
-
-    public Integer getIsPersisted() {
-        return this.isPersisted;
-    }
-
-    public ImPrivateMessage setIsPersisted(Integer isPersisted) {
-        this.isPersisted = isPersisted;
-        return this;
-    }
-
-    public Integer getIsCounted() {
-        return this.isCounted;
-    }
-
-    public ImPrivateMessage setIsCounted(Integer isCounted) {
-        this.isCounted = isCounted;
-        return this;
-    }
-
-    public Integer getIsIncludeSender() {
-        return this.isIncludeSender;
-    }
-
-    public ImPrivateMessage setIsIncludeSender(Integer isIncludeSender) {
-        this.isIncludeSender = isIncludeSender;
-        return this;
-    }
-
-    public ImPrivateMessage setObjectName(String objectName) {
-        super.setObjectName(objectName);
-        return this;
-    }
-
-    public Integer getContentAvailable() {
-        return this.contentAvailable;
-    }
-
-    public ImPrivateMessage setContentAvailable(Integer contentAvailable) {
-        this.contentAvailable = contentAvailable;
-        return this;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImSystemMessage.java

@@ -1,57 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-public class ImSystemMessage extends ImMessageModel {
-    public Integer isIncludeSender;
-    public Integer isPersisted;
-    public Integer contentAvailable;
-    public String[] toUserId;
-    private String type;
-
-    public ImSystemMessage setContent(ImTxtMessage content) {
-        super.setContent(content);
-        return this;
-    }
-
-    public ImSystemMessage() {
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getIsIncludeSender() {
-        return isIncludeSender;
-    }
-
-    public void setIsIncludeSender(Integer isIncludeSender) {
-        this.isIncludeSender = isIncludeSender;
-    }
-
-    public Integer getIsPersisted() {
-        return isPersisted;
-    }
-
-    public void setIsPersisted(Integer isPersisted) {
-        this.isPersisted = isPersisted;
-    }
-
-    public Integer getContentAvailable() {
-        return contentAvailable;
-    }
-
-    public void setContentAvailable(Integer contentAvailable) {
-        this.contentAvailable = contentAvailable;
-    }
-
-    public String[] getToUserId() {
-        return toUserId;
-    }
-
-    public void setToUserId(String[] toUserId) {
-        this.toUserId = toUserId;
-    }
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/ImTxtMessage.java

@@ -1,38 +0,0 @@
-package com.yonge.cooleshow.common.entity;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class ImTxtMessage extends ImBaseMessage {
-    private String content = "";
-    private String extra = "";
-    private static final transient String TYPE = "RC:TxtMsg";
-
-    public ImTxtMessage(String content, String extra) {
-        this.content = content;
-        this.extra = extra;
-    }
-
-    public String getType() {
-        return TYPE;
-    }
-
-    public String getContent() {
-        return this.content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getExtra() {
-        return this.extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-
-    public String toString() {
-        return JSONObject.toJSONString(this);
-    }
-}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/config/WebMvcConfig.java

@@ -21,18 +21,19 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Autowired
 	private OperationLogInterceptor operationLogInterceptor;
+	@Autowired
+	private EnumConverterFactory enumConverterFactory;
 
 	/**
 	 * 枚举类的转换器 addConverterFactory
 	 */
 	@Override
 	public void addFormatters(FormatterRegistry registry) {
-		registry.addConverterFactory(new EnumConverterFactory());
+		registry.addConverterFactory(enumConverterFactory);
 	}
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 

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

@@ -11,11 +11,15 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo;
 import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
 
-
+/**
+ * 账户记账规则
+ * 陪练课 每次课程结束 记录入账
+ * 直播课 每次课程结束，对每个学员都记录一次入账
+ * 用户购买老师乐谱后 记录入账
+ */
 public interface UserAccountRecordDao extends BaseMapper<UserAccountRecord> {
 	/**
 	 * 查询详情
-	 *
 	 * @author liweifan
 	 * @date 2022-03-30 13:53:51
 	 * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo

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

@@ -51,16 +51,11 @@ public class EmployeeDto extends Employee{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -68,16 +68,11 @@ public class TeacherApplyDetailReq implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public Date getBirthdate() {
         return birthdate;

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

@@ -45,16 +45,11 @@ public class EmployeeSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getSubjectIdList() {
         return subjectIdList;

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

@@ -45,17 +45,10 @@ public class StudentSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
-
     public String getSubjectId() {
         return subjectId;
     }

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

@@ -33,6 +33,12 @@ public class RoomInfoCache implements Serializable {
     @ApiModelProperty(value = "房间uid")
     private String roomUid;
 
+    @ApiModelProperty(value = "房间标题/最多12个字")
+    private String roomTitle;
+
+    @ApiModelProperty(value = "直播内容/最多200个字")
+    private String liveRemark;
+
     @ApiModelProperty(value = "直播开始时间")
     private Date liveStartTime;
 
@@ -190,4 +196,20 @@ public class RoomInfoCache implements Serializable {
     public void setSpeakerPic(String speakerPic) {
         this.speakerPic = speakerPic;
     }
+
+    public String getRoomTitle() {
+        return roomTitle;
+    }
+
+    public void setRoomTitle(String roomTitle) {
+        this.roomTitle = roomTitle;
+    }
+
+    public String getLiveRemark() {
+        return liveRemark;
+    }
+
+    public void setLiveRemark(String liveRemark) {
+        this.liveRemark = liveRemark;
+    }
 }

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

@@ -113,17 +113,4 @@ public class TeacherAuthMusicianRecord implements Serializable {
         this.updateTime = updateTime;
     }
 
-    @Override
-    public String toString() {
-        return "TeacherAuthMusicianRecord{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
-						",verifyUserId='" + verifyUserId + "'" + 
-						",reason='" + reason + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GenderEnum.java

@@ -11,7 +11,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
     GIRL(0, "女"),
     BOY(1, "男");
-    @EnumValue
+    //@EnumValue
     private Integer code;
     private String msg;
 

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

@@ -245,7 +245,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         Long roomId = customMessage.getRoomId();
         log.info("sendImPlayMidiMessage: roomId={}, userId={}", roomId, userId);
         ImNetworkMetronomeMessage displayMessage = new ImNetworkMetronomeMessage(customMessage);
-        imHelper.publishMessage(userId.toString(), roomId.toString(), displayMessage, 0);
+        imHelper.publishMessage(userId.toString(), roomId.toString(), displayMessage, 1);
         //记录节拍器信息
         courseScheduleStudentPaymentService.getDao().adjustPlayMidi(roomId,customMessage.getUserId(),customMessage.toString());
     }

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

@@ -107,6 +107,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         Integer liveState = WrapperUtil.toInt(param, "liveState");
         Long userId = this.getSysUser().getId();
         Page<LiveRoom> pageInfo = PageUtil.getPageInfo(param);
+        pageInfo.setDesc("id_");
         IPage<LiveRoom> page = this.page(pageInfo, Wrappers.<LiveRoom>lambdaQuery()
                 .eq(WrapperUtil.StrPredicate.test(roomType), LiveRoom::getType, roomType)
                 .eq(WrapperUtil.ObjPredicate.test(liveState), LiveRoom::getLiveState, liveState)
@@ -301,8 +302,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         log.info("createTempLiveRoom>>>>>>room:{}", room.getRoomUid());
         //去融云创建房间及创建房间缓存信息
         this.createLiveRoomInfo(room, sysUser);
-        //临时
-        this.pushLiveCreateRoom(room);
         //写入临时直播间列表
         RMap<Long, String> map = redissonClient.getMap(TEACHER_TEMP_LIVE_ROOM);
         map.put(teacherId, roomUid);
@@ -337,6 +336,8 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         roomCache.setSpeakerPic(sysUser.getAvatar());
         roomCache.setSpeakerState(1);
         roomCache.setRoomUid(room.getRoomUid());
+        roomCache.setRoomTitle(room.getRoomTitle());
+        roomCache.setLiveRemark(room.getLiveRemark());
         roomCache.setLiveStartTime(room.getLiveStartTime());
         roomCache.setLiveEndTime(room.getLiveEndTime());
         roomCache.setCreateRoomTime(new Date());
@@ -621,8 +622,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 
     /**
      * 主讲人
-     *
-     * @return true 是主讲人 false 不是主讲人
      */
     private void opsSpeaker(RBucket<RoomInfoCache> roomInfoCache, ImUserStateSync user, Date now, String userIdStr) {
         RoomInfoCache roomInfo = roomInfoCache.get();

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

@@ -62,7 +62,7 @@ public class LiveRoomVideoServiceImpl extends ServiceImpl<LiveRoomVideoDao, Live
         if (recordNotify.getCode().equals(200)) {
             if (Objects.nonNull(recordNotify.getType())) {
                 //云端录制文件地址
-                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl());
+                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl(),"live-rewind");
                 //房间uid
                 String roomUId = recordNotify.getRoomId();
                 //融云唯一id标识

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

@@ -221,7 +221,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SysUser insertSysUser(TeacherSubmitReq teacherSubmitReq) {
         SysUser sysUser = new SysUser();
         sysUser = getUserDetil(sysUser, teacherSubmitReq);
-        sysUser.setUserType(SysUserType.TEACHER.getCode());
         //初始密码，手机号后6位
         String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
         sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
@@ -309,7 +308,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             sysUser.setRealName(teacherSubmitReq.getRealName());
             sysUser.setIdCardNo(teacherSubmitReq.getIdCardNo());
         }
-
+        if (StringUtil.isEmpty(sysUser.getUserType())) {
+            sysUser.setUserType("TEACHER");
+        } else if (!sysUser.getUserType().contains("TEACHER")) {
+            sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
+        }
         sysUser.setUsername(teacherSubmitReq.getUsername());
         sysUser.setPhone(teacherSubmitReq.getPhone());
         return sysUser;

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

@@ -43,16 +43,11 @@ public class EmployeeVo extends Employee {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "MusicianAuthEntryRecordVo对象", description = "音乐人审核详情")
 public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "真实姓名")
     private String realName;
@@ -98,21 +99,15 @@ public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
         this.verifyUser = verifyUser;
     }
 
-
     public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getSubjectName() {
         return subjectName;

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

@@ -67,14 +67,9 @@ public class MyFens extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 }

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

@@ -90,16 +90,11 @@ public class MyFollow extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public Double getStarGrade() {
         return starGrade;

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

@@ -148,16 +148,11 @@ public class StudentHomeVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -65,16 +65,11 @@ public class StudentVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -51,16 +51,11 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -175,16 +175,11 @@ public class TeacherHomeVo extends Teacher implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -147,16 +147,11 @@ public class TeacherVo extends Teacher {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 
-    public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
-    }
+    
 
     public UserLockFlag getLockFlag() {
         return lockFlag;

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

@@ -15,11 +15,15 @@ import java.math.BigDecimal;
 public class VipCardRecordVo extends VipCardRecord{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(hidden = true)
 	private String phone;
+
 	@ApiModelProperty("原价 ")
 	private BigDecimal originalPrice;
+
 	@ApiModelProperty("销售价 ")
 	private BigDecimal salePrice;
+
 	@ApiModelProperty("周期 ")
 	private PeriodEnum period;
 

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

@@ -41,13 +41,44 @@
                 t.biz_name_,
                 max(t.create_time_) as create_time_
             from user_cash_account_record t
-            where exists(
+            where t.biz_type_ = 'LIVE' and exists(
                 select 1 from user_cash_account_record t1
-                where t1.id_ = #{id} and t1.biz_id_ = t.biz_id_ and t1.biz_type_ = t.biz_type_
+                where t1.biz_id_ = t.biz_id_ and t1.biz_type_ = 'LIVE' and  t1.id_ = #{id}
             )
             group by t.account_id_,t.in_or_out_,t.biz_type_,biz_id_,biz_name_
+            union all
+            select
+                t.id_,
+                t.account_id_,
+                t.trans_amount_,
+                t.account_balance_,
+                t.in_or_out_,
+                t.biz_type_,
+                t.biz_id_,
+                t.biz_name_,
+                t.create_time_
+            from user_cash_account_record t
+            where t.biz_type_ != 'LIVE' and t.id_ = #{id}
         ) t
     </select>
+    
+    <sql id="selectCondition">
+        <if test="null != param.userId">
+            AND t.account_id_ = #{param.userId}
+        </if>
+        <if test="null != param.inOrOut">
+            AND t.in_or_out_ = #{param.inOrOut}
+        </if>
+        <if test="null != param.bizType">
+            AND t.biz_type_ = #{param.bizType}
+        </if>
+        <if test="param.startTime !=null">
+            <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
+        </if>
+        <if test="param.endTime !=null">
+            <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
+        </if>
+    </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo">
         SELECT
@@ -67,24 +98,23 @@
                 t.biz_name_,
                 max(t.create_time_) as create_time_
             from user_cash_account_record t
-            <where>
-                <if test="null != param.userId">
-                    AND t.account_id_ = #{param.userId}
-                </if>
-                <if test="null != param.inOrOut">
-                    AND t.in_or_out_ = #{param.inOrOut}
-                </if>
-                <if test="null != param.bizType">
-                    AND t.biz_type_ = #{param.bizType}
-                </if>
-                <if test="param.startTime !=null">
-                    <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
-                </if>
-                <if test="param.endTime !=null">
-                    <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
-                </if>
-            </where>
+            where t.biz_type_ = 'LIVE'
+            <include refid="selectCondition"/>
             group by t.account_id_,t.in_or_out_,t.biz_type_,biz_id_,biz_name_
+            union all
+            select
+                t.id_,
+                t.account_id_,
+                t.trans_amount_,
+                t.account_balance_,
+                t.in_or_out_,
+                t.biz_type_,
+                t.biz_id_,
+                t.biz_name_,
+                t.create_time_
+            from user_cash_account_record t
+            where t.biz_type_ != 'LIVE'
+            <include refid="selectCondition"/>
         ) t
         left join course_schedule a on t.biz_id_ = a.id_ and t.biz_type_ in ('PRACTICE','LIVE')
         order by t.create_time_ desc

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

@@ -136,8 +136,8 @@
                 AND t.trade_status_ = 'succeeded'
             </if>
             <if test="param.status != null and param.status == 'UNPASS'">
-                AND !(t.auth_status_ = 'DOING' OR t.trade_status_ = 'pending')
-                AND t.trade_status_ != 'succeeded'
+                AND t.auth_status_ != 'DOING'
+                AND t.trade_status_ is null or t.trade_status_ not in('pending','succeeded')
             </if>
         </where>
         order by t.create_time_ desc

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

@@ -57,5 +57,5 @@ public interface StoragePlugin {
      * @param isPublic:
      * @return void
      */
-    void setFileAcl(String fileName,Boolean isPublic);
+    void setFileAcl(String fileName,Boolean isPublic,String bucketName);
 }

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

@@ -39,16 +39,16 @@ public class StoragePluginContext {
         return StoragePlugin.getUploadSign(uploadSign);
     }
 
-    public void setFileAcl(String storagePluginName,String fileName,Boolean isPublic){
+    public void setFileAcl(String storagePluginName,String fileName,Boolean isPublic,String bucketName){
         StoragePlugin storagePlugin = getStoragePlugin(storagePluginName);
-        storagePlugin.setFileAcl(fileName,isPublic);
+        storagePlugin.setFileAcl(fileName,isPublic,bucketName);
     }
 
-    public String getPublicUrl(String fileName){
+    public String getPublicUrl(String fileName,String bucketName){
         try {
             String substring = fileName.substring(0, fileName.lastIndexOf("?"));
             String substring1 = substring.substring(substring.lastIndexOf("/") + 1);
-            this.setFileAcl(KS3StoragePlugin.PLUGIN_NAME,substring1,true);
+            this.setFileAcl(KS3StoragePlugin.PLUGIN_NAME,substring1,true,bucketName);
             return substring;
         }catch (Exception e) {
             e.printStackTrace();

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

@@ -169,7 +169,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
     }
 
     @Override
-    public void setFileAcl(String fileName, Boolean isPublic) {
+    public void setFileAcl(String fileName, Boolean isPublic,String bucketName) {
         return;
     }
 

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

@@ -193,7 +193,7 @@ public class KS3StoragePlugin implements StoragePlugin, InitializingBean, Dispos
     }
 
     @Override
-    public void setFileAcl(String fileName, Boolean isPublic) {
+    public void setFileAcl(String fileName, Boolean isPublic,String bucketName) {
         PutObjectACLRequest request = new PutObjectACLRequest(bucketName,fileName);
         if (isPublic){
             //设为公开读