update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.core.handler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserLogin;
+import com.ym.mec.auth.api.enums.UserLockFlag;
 import com.ym.mec.auth.config.constant.SecurityConstants;
 import com.ym.mec.auth.service.SysUserLoginService;
 import com.ym.mec.auth.service.SysUserService;
@@ -58,7 +59,7 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
                 if(userLogin.getFailCount() >= 5){
                     userLogin.setLockTime(30);
                     userLogin.setLockDate(date);
-                    sysUser.setLockFlag("9");
+                    sysUser.setLockFlag(UserLockFlag.NORMAL);
                     sysUser.setUpdateTime(date);
                     sysUserService.update(sysUser);
                 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.core.provider.service;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ym.mec.auth.api.enums.UserLockFlag;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.LockedException;
@@ -50,7 +51,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 		}
 		if (userInfo == null) {
 			throw new UsernameNotFoundException("账户不存在");
-		} else if (StringUtils.equals(userInfo.getSysUser().getLockFlag(), "9")) {
+		} else if (userInfo.getSysUser().getLockFlag() == UserLockFlag.NORMAL) {
 			throw new LockedException("账户被锁定");
 		}
 
@@ -67,7 +68,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		SysUser sysUser = userInfo.getSysUser();
 
-		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), StringUtils.equals(sysUser.getLockFlag(), "0"),
+		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == UserLockFlag.NOACTIVATED,
 				true, true, true, authorities);
 	}
 

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

@@ -3,6 +3,8 @@ package com.ym.mec.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.ym.mec.auth.api.enums.UserLockFlag;
+import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -82,7 +84,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		}
 
 		user.setUpdateTime(new Date());
-		user.setDelFlag("1");
+		user.setDelFlag(YesOrNoEnum.YES);
 
 		update(user);
 

mec-client-api/pom.xml

@@ -16,11 +16,5 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

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

@@ -1,7 +1,9 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.web.dal.entity.Teacher;
+import com.ym.mec.web.dal.page.TeacherCourseQueryInfo;
 import com.ym.mec.web.dal.page.TeacherQueryInfo;
 import com.ym.mec.web.service.ClassGroupService;
 import com.ym.mec.web.service.TeacherService;
@@ -63,4 +65,10 @@ public class TeacherController extends BaseController {
     public Object getClassGroup(@PathVariable("id") Integer id) {
         return succeed(classGroupService.findClassGroup4Teacher(id));
     }
+
+    @ApiOperation(value = "获取老师课程信息列表")
+    @GetMapping("/getTeaCourseInfos")
+    public Object getTeaCourseInfos(QueryInfo queryInfo){
+        return succeed(classGroupService.getTeaCourseInfos(queryInfo));
+    }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/ClassGroupDao.java

@@ -54,4 +54,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ClassGroup> findClassGroupByIds(@Param("ids") String ids);
+
+    void queryGroupCourses();
+
 }

mec-web/src/main/java/com/ym/mec/web/dal/page/TeacherCourseQueryInfo.java

@@ -0,0 +1,19 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TeacherCourseQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "课程类型")
+    private ClassGroupTypeEnum type;
+
+    public ClassGroupTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(ClassGroupTypeEnum type) {
+        this.type = type;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/service/ClassGroupService.java

@@ -1,10 +1,13 @@
 package com.ym.mec.web.service;
 
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.dto.HighClassGroup;
 import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.dal.entity.ClassGroupRelation;
+import com.ym.mec.web.dal.page.TeacherCourseQueryInfo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -77,5 +80,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     List<HighClassGroup> addHighClassGroup(List<HighClassGroup> highClassGroupList) throws Exception;
 
-
+    /**
+     * 获取老师课程信息列表
+     * @param queryInfo
+     * @return
+     */
+    Object getTeaCourseInfos(QueryInfo queryInfo);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/ClassGroupServiceImpl.java

@@ -1,12 +1,17 @@
 package com.ym.mec.web.service.impl;
 
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dto.HighClassGroup;
 import com.ym.mec.web.dal.entity.*;
 import com.ym.mec.web.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.web.dal.enums.TeachTypeEnum;
+import com.ym.mec.web.dal.page.TeacherCourseQueryInfo;
 import com.ym.mec.web.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.common.dal.BaseDAO;
@@ -169,4 +174,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         return highClassGroupList;
     }
 
+    @Override
+    public Object getTeaCourseInfos(QueryInfo queryInfo) {
+        classGroupDao.queryGroupCourses();
+        return null;
+    }
+
 }

mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -175,4 +175,7 @@
     <select id="findClassGroupByIds" resultMap="ClassGroup">
         SELECT * FROM class_group WHERE FIND_IN_SET(id_,#{ids})
     </select>
+    <select id="queryGroupCourses">
+
+    </select>
 </mapper>