Merge remote-tracking branch 'origin/master'

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

@@ -72,4 +72,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userId
 	 */
     void insertSysTenantAccount(Integer userId);
+
+	/**
+	 * 刷新用户token
+	 * @param userId
+	 * @param imToken
+	 */
+	void refreshImToken(@Param("userId") Integer userId, @Param("imToken") String imToken);
 }

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

@@ -91,4 +91,10 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @return
 	 */
 	void retrieveUser(String phone, Authentication authentication);
+
+	/**
+	 * 刷新token
+	 * @param sysUser
+	 */
+    void refreshImToken(SysUser sysUser);
 }

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

@@ -199,4 +199,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		if(!b) throw new BadCredentialsException("验证码校验失败");
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void refreshImToken(SysUser sysUser) {
+		sysUserDao.refreshImToken(sysUser.getId(),sysUser.getImToken());
+	}
+
 }

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

@@ -231,6 +231,33 @@ public class UserController extends BaseController {
 		return failed();
 	}
 
+	@ApiOperation(value = "刷新token")
+	@PostMapping(value = "/refreshImToken")
+	public Object refreshImToken() {
+		AuthUser user = SecurityUtils.getUser();
+		if (user != null) {
+			SysUser sysUser = sysUserService.get(user.getUserId());
+			String username;
+			if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
+				username = sysUser.getRealName();
+			}else {
+				username = sysUser.getUsername();
+			}
+			if(StringUtils.isEmpty(username)){
+				return failed("获取Token失败: 用户名为空");
+			}else {
+				ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
+				if(StringUtils.isEmpty(register.getToken())){
+					return failed("获取Token失败: 请联系教务老师");
+				}
+				sysUser.setImToken(register.getToken());
+				sysUserService.refreshImToken(sysUser);
+				return succeed(register.getToken());
+			}
+		}
+		return failed();
+	}
+
 	@ApiOperation(value = "校验用户手机号和密码")
 	@GetMapping(value = "/checkUser")
 	public Object checkUser(String phone,String password) {

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

@@ -154,6 +154,9 @@
     <update id="updatePassword">
         UPDATE sys_user SET password_ = #{password} WHERE phone_ = #{mobile}
     </update>
+    <update id="refreshImToken">
+        UPDATE sys_user SET im_token_ = #{imToken},update_time_ = NOW() WHERE id_ = #{userId}
+    </update>
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">

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

@@ -3752,6 +3752,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
     }
 
+	/**
+	 * 课程调整后清除课程相关信息
+	 */
+	@Transactional(rollbackFor = Exception.class)
+    private void cleanCourseMapper(){
+
+	}
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void practiceCourseTeacherAdjust(Long courseScheduleId,Integer teacherId) {

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

@@ -2223,6 +2223,7 @@
 
     <sql id="endFindCourseSchedulesCondition">
         <where>
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <include refid="queryVipCourseScheduleIds"/>
             <if test="classGroupIds != null">
                 AND cs.class_group_id_ IN
@@ -2252,7 +2253,7 @@
         course_schedule cs
         LEFT JOIN school s ON cs.schoole_id_=s.id_
         <include refid="endFindCourseSchedulesCondition"/>
-        ORDER BY course_start_time_
+        ORDER BY course_start_time_,cs.id_
         <include refid="global.limit"/>
     </select>
     <select id="endCountCourseSchedules" resultType="int">

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

@@ -444,7 +444,7 @@
                 AND c.firstBuyTime IS NOT NULL
             </if>
             <if test="organId != null">
-                AND FIND_IN_SET(a.organ_id_`,#{organId})
+                AND FIND_IN_SET(a.organ_id_,#{organId})
             </if>
         </where>
     </sql>