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

cms/src/main/java/com/ym/mec/cms/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

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

@@ -16,6 +16,12 @@ public class SysMusicScore {
 	
 	/** 名称 */
 	private String name;
+
+	/** 名称 */
+	private String categoriesName;
+
+	/** 名称 */
+	private Integer categoriesId;
 	
 	/** 类型PERSON 个人,COMMON公用 */
 	private ExamSongTypeEnum type;
@@ -44,6 +50,22 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
+	public String getCategoriesName() {
+		return categoriesName;
+	}
+
+	public void setCategoriesName(String categoriesName) {
+		this.categoriesName = categoriesName;
+	}
+
 	public String getCreateUserName() {
 		return createUserName;
 	}

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

@@ -35,6 +35,12 @@ public class SysMusicScoreAccompaniment {
 	private String examSongName;
 
 	/**  */
+	private String categoriesName;
+
+	/**  */
+	private Integer categoriesId;
+
+	/**  */
 	private String type;
 
 	/**  */
@@ -46,6 +52,22 @@ public class SysMusicScoreAccompaniment {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
+	public String getCategoriesName() {
+		return categoriesName;
+	}
+
+	public void setCategoriesName(String categoriesName) {
+		this.categoriesName = categoriesName;
+	}
+
 	public String getSubjectName() {
 		return subjectName;
 	}

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

@@ -14,6 +14,8 @@
 		<result column="mp3_url_" property="mp3Url" />
 		<result column="xml_url_" property="xmlUrl" />
 		<result column="name_" property="examSongName" />
+		<result column="categories_name_" property="categoriesName" />
+		<result column="categories_id_" property="categoriesId" />
 		<result column="type_" property="type" />
 		<result column="url_" property="url" />
 		<result column="del_flag_" property="delFlag" />
@@ -28,9 +30,10 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_
+		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_
 		WHERE sesa.id_ = #{id}
 	</select>
 	
@@ -111,8 +114,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,s.name_ subject_name_
+		SELECT sesa.*,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		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_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<where>
 			sesa.del_flag_ = 0
@@ -147,16 +152,17 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_
+		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_
 		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
 	</select>
 
 	<select id="findAccCount" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT sesa.id_) FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		<include refid="queryPageSql"/>
 	</select>
 
@@ -166,8 +172,8 @@
 			<if test="search != null and search != ''">
 				AND (sesa.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
-			<if test="sysExamSongId != null">
-				AND sesa.exam_song_id_ = #{sysExamSongId}
+			<if test="sysMusicScoreId != null">
+				AND sesa.exam_song_id_ = #{sysMusicScoreId}
 			</if>
 			<if test="subjectId != null">
 				AND sesa.subject_id_ = #{subjectId}

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

@@ -9,6 +9,8 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.SysMusicScore" id="SysMusicScore">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
+		<result column="categories_name_" property="categoriesName" />
+		<result column="categories_id_" property="categoriesId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="subject_ids_" property="subjectIds" />
 		<result column="speed_" property="speed" />
@@ -42,6 +44,9 @@
 		<if test="delFlag != null">
 			del_flag_ = #{delFlag},
 		</if>
+		<if test="musicScoreCategoriesId != null">
+			music_score_categories_id_ = #{musicScoreCategoriesId},
+		</if>
 		<if test="createUserId != null">
 			create_user_id_ = #{createUserId},
 		</if>
@@ -74,9 +79,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
-		SELECT ses.*,su.real_name_ create_user_name_
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_
 		FROM sys_music_score ses
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
+		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
 		ORDER BY ses.id_ DESC

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/AuditLog.java

@@ -18,6 +18,8 @@ public class AuditLog implements Serializable {
 
 	private String username;
 
+	private Integer userId;
+
 	private String operateName;
 
 	private String interfaceUrl;
@@ -32,6 +34,14 @@ public class AuditLog implements Serializable {
 
 	private String service;
 
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public String getService() {
 		return service;
 	}

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -1,15 +1,12 @@
 package com.yonge.log.interceptor;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
 import com.ym.mec.util.json.JsonUtil;
 import com.ym.mec.util.web.WebUtil;
 import com.yonge.log.dal.model.AuditLog;
@@ -37,6 +33,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
 	private String username;
 
+	private Integer userId;
+
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	private static List<String> ignoreLogUrl;
@@ -80,6 +78,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 				ignoreLogUrl.add("find");
 				ignoreLogUrl.add("list");
 				ignoreLogUrl.add("detail");
+				ignoreLogUrl.add("hasindexerrdata");
+				ignoreLogUrl.add("newindex");
 			}
 			for (String e : ignoreLogUrl) {
 				if(substring.contains(e)){
@@ -108,12 +108,13 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 		}
 		// 操作人
 		auditLog.setUsername(username);
+		auditLog.setUserId(userId);
 		auditLog.setOperateTime(sdf.format(new Date()));
 		auditLogService.insert(auditLog);
 	}
 
-	public void setUsername(String username) {
+	public void setUsername(String username,Integer userId) {
 		this.username = username;
+		this.userId = userId;
 	}
-
 }

mec-student/src/main/java/com/ym/mec/student/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-web/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}