Merge branch 'music_score' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreDao.java

@@ -6,5 +6,4 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
-	
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -45,6 +46,11 @@ public class SysMusicScore {
 	private Integer delFlag;
 
 	private Integer order;
+
+	/**
+	 * 客户端类型
+	 */
+	private ClientTypeEnum clientType;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -52,6 +58,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public ClientTypeEnum getClientType() {
+		return clientType;
+	}
+
+	public void setClientType(ClientTypeEnum clientType) {
+		this.clientType = clientType;
+	}
+
 	public Integer getOrder() {
 		return order;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -57,6 +58,16 @@ public class SysMusicScoreAccompaniment {
 
 	private String memo;
 
+	private ClientTypeEnum clientType;
+
+	public ClientTypeEnum getClientType() {
+		return clientType;
+	}
+
+	public void setClientType(ClientTypeEnum clientType) {
+		this.clientType = clientType;
+	}
+
 	public Boolean getIsShowFingering() {
 		return isShowFingering;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClientTypeEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum ClientTypeEnum implements BaseEnum<String, ClientTypeEnum> {
+	NETWORK_ROOM("NETWORK_ROOM", "网络教师"), SMART_PRACTICE("SMART_PRACTICE", "智能陪练");
+
+	private String code;
+
+	private String msg;
+
+	ClientTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -23,6 +24,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private Boolean isShowFingering;
 
+    private ClientTypeEnum clientType;
+
+    public ClientTypeEnum getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(ClientTypeEnum clientType) {
+        this.clientType = clientType;
+    }
+
     public Boolean getIsShowFingering() {
         return isShowFingering;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreService.java

@@ -12,4 +12,5 @@ public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore
     void add(MusicScoreDto musicScoreDto);
 
     void del(Integer id);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -15,10 +15,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -24,6 +24,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="is_show_fingering_" property="isShowFingering" />
 		<result column="memo_" property="memo" />
+		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -32,7 +33,7 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -46,14 +47,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_)
-		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW())
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_,client_type_)
+		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 	</insert>
     <insert id="batchInsert">
-		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_,is_show_fingering_,memo_)
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,
+		                                           create_time_,update_time_,is_show_fingering_,memo_,client_type_)
 		VALUES
 		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
-			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},#{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo})
+			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},
+			 #{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo},#{item.clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 		</foreach>
 	</insert>
 
@@ -61,6 +64,9 @@
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment">
 		UPDATE sys_music_score_accompaniment
 		<set>
+		<if test="clientType != null">
+			client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
 		<if test="isShowFingering != null">
 			is_show_fingering_ = #{isShowFingering},
 		</if>
@@ -95,6 +101,9 @@
 		<foreach collection="sysMusicScoreAccompaniments" item="item" separator=";">
 			UPDATE sys_music_score_accompaniment
 			<set>
+				<if test="item.clientType != null">
+					client_type_ = #{item.clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+				</if>
 				<if test="item.isShowFingering != null">
 					is_show_fingering_ = #{item.isShowFingering},
 				</if>
@@ -128,7 +137,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -162,7 +171,7 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -184,7 +193,7 @@
 		GROUP BY sesa.subject_id_
 	</select>
 
-    <sql id="queryPageSql">
+	<sql id="queryPageSql">
 		<where>
 			sesa.del_flag_ = 0
 			<if test="search != null and search != ''">
@@ -205,6 +214,9 @@
 			<if test="isShowFingering != null">
 				AND sesa.is_show_fingering_ = #{isShowFingering}
 			</if>
+			<if test="clientType != null">
+				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
 			<if test="type != null and type == 'COMMON'">
 				AND ses.type_ = #{type}
 			</if>

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -19,6 +19,7 @@
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="order_" property="order" />
+		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
@@ -35,13 +36,17 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_)
-		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},#{order},NOW(),NOW())
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_)
+		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 	</insert>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
 		UPDATE sys_music_score <set>
+		<if test="clientType != null">
+			client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
 		<if test="order != null">
 			order_ = #{order},
 		</if>
@@ -98,7 +103,7 @@
 		SELECT COUNT(0) FROM sys_music_score ses
 		<include refid="queryPageSql"/>
 	</select>
-	<sql id="queryPageSql">
+    <sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0
 			<if test="categoriesId != null">
@@ -107,6 +112,9 @@
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="clientType != null">
+				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
 			<if test="type != null and type == 'COMMON'">
 				AND ses.type_ = #{type}
 			</if>

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -1,20 +1,14 @@
 package com.ym.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.ym.common.ApiException;
 import com.ym.common.BaseResponse;
-import com.ym.common.ErrorEnum;
 import com.ym.pojo.*;
 import com.ym.service.MessageService;
 import com.ym.service.RoomService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 @RestController

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
 import com.ym.mec.common.controller.BaseController;
@@ -20,6 +21,9 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
 
@@ -27,6 +31,9 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @GetMapping("/queryPageLimit")
     public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
     }
 

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
@@ -20,6 +21,9 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         return succeed(sysMusicScoreService.queryPage(queryInfo));
     }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -3,6 +3,7 @@ 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.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
 import com.ym.mec.common.controller.BaseController;
@@ -54,6 +55,9 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(sysUser == null){
             throw new BizException("请登录");
         }
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
@@ -69,6 +73,9 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(sysUser == null){
             throw new BizException("请登录");
         }
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
     }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreController.java

@@ -3,6 +3,7 @@ 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.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
@@ -50,6 +51,9 @@ public class SysMusicScoreController extends BaseController {
         if(sysUser == null){
             throw new BizException("请登录");
         }
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreAccompanimentController.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
 import com.ym.mec.common.controller.BaseController;
@@ -39,6 +40,9 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
+        }
         return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
     }