Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/config/ResourceServerConfig.java

@@ -25,7 +25,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.authorizeRequests()
-				.antMatchers("/v2/api-docs", "/news/list", "/news/query/*")
+				.antMatchers("/v2/api-docs", "/news/list", "/news/query")
 				.permitAll()
 				// 任何人不登录都可以获取的资源
 				// .antMatchers("/ipController/**").hasIpAddress("127.0.0.1") //特定ip可以不登录获取资源

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -48,6 +48,10 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "部门ID",required = false)
 	private Integer organId;
 
+	/** 部门ID */
+	@ApiModelProperty(value = "部门名称",required = false)
+	private String organName;
+
 	/** 创建时间 */
 	private java.util.Date createTime;
 
@@ -101,6 +105,14 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin;
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public String getRealName() {
 		return realName;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -45,4 +45,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByStatus(UserLockFlag status);
+
+	/**
+	 * 获取机构名称
+	 * @param organId
+	 * @return
+	 */
+    String getOrganName(Integer organId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -68,4 +68,11 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param sysUser
 	 */
     void updateBaseInfo(SysUser sysUser);
+
+	/**
+	 * 获取用户基本信息
+	 * @param userId
+	 * @return
+	 */
+	SysUser queryUserInfo(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -128,4 +128,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getUsername(),sysUser.getAvatar()));
 	}
 
+	@Override
+	public SysUser queryUserInfo(Integer userId) {
+		SysUser sysUser = sysUserDao.get(userId);
+		sysUser.setOrganName(sysUserDao.getOrganName(sysUser.getOrganId()));
+		return sysUser;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -68,7 +68,7 @@ public class TokenController extends BaseController {
     public Object apiQueryUserInfo() {
 		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
-			return succeed(userService.get(authUser.getUserId()));
+			return succeed(userService.queryUserInfo(authUser.getUserId()));
 		}
 		return failed("获取用户信息失败");
     }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -183,4 +183,7 @@
     <select id="queryByStatus" resultMap="SysUser">
         select * from sys_user where lock_flag_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+    <select id="getOrganName" resultType="java.lang.String">
+        SELECT name_ FROM organization WHERE id_ = #{organId}
+    </select>
 </mapper>

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

@@ -122,10 +122,9 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     /**
      * 根据教师编号列表，和班级编号列表获取教师签到次数
      * @param teacherIdStr
-     * @param classGroupIdStr
      * @return
      */
-    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr,@Param("classGroupIdStr") String classGroupIdStr);
+    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr,@Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取教师乐团上课记录（乐团管理--乐团详情）

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

@@ -99,7 +99,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     BACKSTAGE_STUDENT_APPEAL("BACKSTAGE_STUDENT_APPEAL", "学员申述"),
     BACKSTAGE_STUDENT_APPLY_QUIT_GROUP("BACKSTAGE_STUDENT_APPLY_QUIT_GROUP", "学员申请退团"),
     BACKSTAGE_STUDENT_APPLY_QUIT_COURSE("BACKSTAGE_STUDENT_APPLY_QUIT_COURSE", "学员申请退课"),
-    BACKSTAGE_STUDENT_APPLY_WITHDRAW("BACKSTAGE_STUDNET_APPLY_WITHDRAW", "学员申请提现");
+    BACKSTAGE_STUDENT_APPLY_WITHDRAW("BACKSTAGE_STUDENT_APPLY_WITHDRAW", "学员申请提现");
 
     MessageTypeEnum(String code, String msg) {
         this.code = code;

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

@@ -5,47 +5,47 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class MusicGroupStudentQueryInfo extends QueryInfo {
 
-    @ApiModelProperty(value = "科目编号")
-    private Integer subjectId;
+  @ApiModelProperty(value = "科目编号")
+  private Integer subjectId;
 
-    @ApiModelProperty(value = "乐团编号")
-    private String musicGroupId;
+  @ApiModelProperty(value = "乐团编号")
+  private String musicGroupId;
 
-    @ApiModelProperty(value = "学员状态 NORMAL(NORMAL, 在读), LEAVE(LEAVE, 请假), QUIT(QUIT, 退班)",required = false)
-    private String studentStatus;
+  @ApiModelProperty(value = "学员状态 NORMAL(NORMAL, 在读), LEAVE(LEAVE, 请假), QUIT(QUIT, 退班)",required = false)
+  private Integer studentStatus;
 
-    @ApiModelProperty(value = "缴费状态  PAID_COMPLETED(完成缴费), NON_PAYMENT(未缴费), PROCESSING(缴费中)",required = false)
-    private String paymentStatus;
+  @ApiModelProperty(value = "缴费状态  PAID_COMPLETED(完成缴费), NON_PAYMENT(未缴费), PROCESSING(缴费中)",required = false)
+  private Integer paymentStatus;
 
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
+  public String getMusicGroupId() {
+    return musicGroupId;
+  }
 
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
+  public void setMusicGroupId(String musicGroupId) {
+    this.musicGroupId = musicGroupId;
+  }
 
-    public Integer getSubjectId() {
-        return subjectId;
-    }
+  public Integer getSubjectId() {
+    return subjectId;
+  }
 
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
+  public void setSubjectId(Integer subjectId) {
+    this.subjectId = subjectId;
+  }
 
-    public String getStudentStatus() {
-        return studentStatus;
-    }
+  public Integer getStudentStatus() {
+    return studentStatus;
+  }
 
-    public void setStudentStatus(String studentStatus) {
-        this.studentStatus = studentStatus;
-    }
+  public void setStudentStatus(Integer studentStatus) {
+    this.studentStatus = studentStatus;
+  }
 
-    public String getPaymentStatus() {
-        return paymentStatus;
-    }
+  public Integer getPaymentStatus() {
+    return paymentStatus;
+  }
 
-    public void setPaymentStatus(String paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
+  public void setPaymentStatus(Integer paymentStatus) {
+    this.paymentStatus = paymentStatus;
+  }
 }

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

@@ -117,7 +117,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param queryInfo
      * @return
      */
-    PageInfo<MusicGroupTeachersDto> queryMusicGroupTeachers(QueryInfo queryInfo);
+    PageInfo<MusicGroupTeachersDto> queryMusicGroupTeachers(MusicGroupTeachersQueryInfo queryInfo);
 
     /**
      * 获取教师上课记录列表（乐团管理--乐团详情）

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
@@ -7,10 +8,7 @@ import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherQueryInfo;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
+import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -231,7 +229,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
-	public PageInfo<MusicGroupTeachersDto> queryMusicGroupTeachers(QueryInfo queryInfo) {
+	public PageInfo<MusicGroupTeachersDto> queryMusicGroupTeachers(MusicGroupTeachersQueryInfo queryInfo) {
 		PageInfo<MusicGroupTeachersDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
@@ -243,22 +241,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			params.put("offset", pageInfo.getOffset());
 			dataList = teacherDao.queryMusicGroupTeachers(params);
 			//获取合奏班id列表
-			Set<Integer> classGroupIds = dataList.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
-			String classGroupIdStr = StringUtils.join(classGroupIds,",");
+//			Set<Integer> classGroupIds = dataList.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
+//			String classGroupIdStr = StringUtils.join(classGroupIds,",");
 			//获取教师id列表
-			Set<Integer> teacherIds = dataList.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
-			String teacherIdStr = StringUtils.join(teacherIds,",");
+			Set<Integer> teacherIds = dataList.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet());
+//			String teacherIdStr = StringUtils.join(teacherIds,",");
 
 			//根据教师编号和班级编号，获取老师签到次数
-			List<Map<Integer,Integer>> signNum =  teacherDao.findSignNum(teacherIdStr,classGroupIdStr);
-			Map<Integer,Integer> signNumMap = MapUtil.convertMybatisMap(signNum);
+			Map<Integer,Integer> signNumMap =  JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(teacherDao.findSignNum(StringUtils.join(teacherIds,","),queryInfo.getMusicGroupId()))),HashMap.class);
+//			Map<Integer,Integer> signNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(signNum)),HashMap.class);
 
 			//根据合奏班编号，获取子班级名称列表
-			List<Map<Integer,String>> classNames =  classGroupDao.queryNamesByClassId(classGroupIdStr);
-			Map<Integer,String> classNameMap = MapUtil.convertMybatisMap(classNames);
+//			List<Map<Integer,String>> classNames =  classGroupDao.queryNamesByClassId(classGroupIdStr);
+//			Map<Integer,String> classNameMap = MapUtil.convertMybatisMap(classNames);
 
 			dataList.forEach(e->{
-				e.setCourseScheduleName(classNameMap.get(e.getClassGroupId()));
+//				e.setCourseScheduleName(classNameMap.get(e.getClassGroupId()));
 				e.setNum(signNumMap.get(e.getTeacherId()));
 			});
 		}

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

@@ -356,7 +356,7 @@
                 AND sr.music_group_status_ = #{studentStatus}
             </if>
             <if test="paymentStatus != null">
-                AND mgsf.payment_status_ = #{paymentStatus}
+                AND sr.payment_status_ = #{paymentStatus}
             </if>
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND sr.music_group_id_ = #{musicGroupId}
@@ -378,12 +378,11 @@
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
         SELECT sr.user_id_,su.username_ real_name_,su.gender_,sr.parents_phone_,sr.current_grade_,
-        sr.current_class_,sr.music_group_status_,IF(mgsf.payment_status_ IS NULL,'NON_PAYMENT',mgsf.payment_status_) payment_status_,
+        sr.current_class_,sr.music_group_status_,sr.payment_status_,
         s.name_ subject_name_,sr.music_group_id_,
         IF(sr.create_time_ > mg.payment_expire_date_,1,0) is_new_student_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
-        LEFT JOIN music_group_student_fee_ mgsf ON (mgsf.music_group_id_ = sr.music_group_id_ AND mgsf.user_id_ = sr.user_id_)
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         <include refid="queryMusicGroupStudentSql"/>
@@ -394,7 +393,6 @@
         SELECT COUNT(sr.user_id_)
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
-        LEFT JOIN music_group_student_fee_ mgsf ON (mgsf.music_group_id_ = sr.music_group_id_ AND mgsf.user_id_ = sr.user_id_)
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         <include refid="queryMusicGroupStudentSql"/>
     </select>

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

@@ -268,7 +268,7 @@
 
     <select id="countPayNum" resultType="map">
         SELECT COUNT(DISTINCT user_id_) `value`,subject_id_ `key` FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 1 GROUP BY subject_id_
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 GROUP BY subject_id_
     </select>
 
     <resultMap id="queryFeeDetailMap" type="com.ym.mec.biz.dal.dto.StudentFeeDetailDto">

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

@@ -326,13 +326,13 @@
         <result property="teacherId" column="teacher_id_"/>
     </resultMap>
     <select id="queryMusicGroupTeachers" resultMap="MusicGroupTeachersDto">
-        SELECT su.real_name_,su.phone_,t.job_nature_,GROUP_CONCAT(cg.name_) class_group_name_,cgtm.class_group_id_,t.id_ teacher_id_
+        SELECT su.real_name_,su.phone_,t.job_nature_,GROUP_CONCAT(cg.name_) class_group_name_,t.id_ teacher_id_
         FROM teacher t
         LEFT JOIN class_group_teacher_mapper cgtm ON t.id_ = cgtm.user_id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN sys_user su ON t.id_ = su.id_
         <include refid="queryMusicGroupTeachersSql"/>
-        GROUP BY t.id_,cgtm.class_group_id_
+        GROUP BY t.id_
         <include refid="global.limit"/>
     </select>
     <select id="countMusicGroupTeachers" resultType="java.lang.Integer">
@@ -345,7 +345,6 @@
     </select>
     <sql id="queryMusicGroupTeachersSql">
         <where>
-                cg.type_ = 'MIX'
             <if test="search != null and search != ''">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>
@@ -360,8 +359,8 @@
 
     <select id="findSignNum" resultType="java.util.Map">
         SELECT ta.teacher_id_ 'key',COUNT(ta.id_) 'value' FROM teacher_attendance ta
-        WHERE FIND_IN_SET(ta.teacher_id_,#{teacherIdStr}) AND FIND_IN_SET(ta.class_group_id_,#{classGroupIdStr})
-        GROUP BY ta.teacher_id_,ta.class_group_id_
+        WHERE FIND_IN_SET(ta.teacher_id_,#{teacherIdStr}) AND ta.music_group_id_ = #{musicGroupId}
+        GROUP BY ta.teacher_id_
     </select>
 
     <sql id="queryTeacherAttendanceSql">

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

@@ -46,7 +46,7 @@ public class CourseController extends BaseController {
     }
 
     @ApiOperation(value = "根据群编号，获取群组基本信息")
-    @GetMapping("/course/findGroupById")
+    @GetMapping("/findGroupById")
     public Object findGroupById(Integer groupId){
         if(null == groupId){
             return failed("参数校验错误");

mec-student/src/main/resources/logback-spring.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="10 seconds">
+
+	<property name="LOG_HOME" value="/var/logs/student-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="CONSOLE_LOG_PATTERN"
+		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+
+	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder charset="UTF-8">
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="file"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<FileNamePattern>${LOG_HOME}</FileNamePattern>
+			<MaxHistory>90</MaxHistory>
+			<TimeBasedFileNamingAndTriggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<MaxFileSize>20MB</MaxFileSize>
+			</TimeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="com.ym.mec" level="INFO" />
+
+	<!--开发环境:打印控制台 -->
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<!--生产环境:输出到文件 -->
+	<springProfile name="pro">
+		<root level="WARN">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+</configuration>