1、swagger接口文档

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java

@@ -1,6 +1,7 @@
 package com.ibeetl.admin.core.dao;
 
 import com.ibeetl.admin.core.entity.CoreUser;
+import org.apache.commons.logging.Log;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.springframework.stereotype.Repository;
@@ -45,4 +46,7 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
     Map<String,Object> getTeacherByNo(String username);
 
     Map<String,Object> getStudentByNo(String username);
+
+    Map<String,Object> getAdminByNo(String username);
+    void updateUserId(Long newId,Long oldId);
 }

admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java

@@ -80,6 +80,8 @@ public class CoreUser extends BaseEntity implements AbstractToken {
 	 */
 	private Long loginCount;
 
+	private Long oldId;
+
 	public String getCode() {
 		return code;
 	}
@@ -249,4 +251,16 @@ public class CoreUser extends BaseEntity implements AbstractToken {
 	public void setLoginCount(Long loginCount) {
 		this.loginCount = loginCount;
 	}
+
+	public Long getOldId() {
+		return oldId;
+	}
+
+	public void setOldId(Long oldId) {
+		if(oldId==null){
+			this.oldId=id;
+		}else{
+			this.oldId = oldId;
+		}
+	}
 }

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java

@@ -261,4 +261,9 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 	public Map<String,Object> getStudentByNo(String username){
 		return coreUserDao.getStudentByNo(username);
 	}
+
+	public Map<String,Object> getAdminByNo(String username){return coreUserDao.getAdminByNo(username);}
+	public void updateUserId(Long newId,Long oldId){
+		coreUserDao.updateUserId(newId, oldId);
+	}
 }

admin-core/src/main/resources/sql/core/coreUser.md

@@ -38,7 +38,7 @@ getUserByUsernameAndPwd
 getStudentByNo
 ===
      SELECT
-	core_user.ID AS userId,
+	core_user.old_id AS userId,
 	core_user.NAME AS NAME,
 	core_role.NAME AS roleName,
 	universities_colleges.universities_colleges_id AS schoolId,
@@ -64,7 +64,7 @@ getStudentByNo
 getTeacherByNo
 ===
     SELECT
-	core_user.ID AS userId,
+	core_user.old_id AS userId,
 	core_user.NAME AS NAME,
 	core_role.NAME AS roleName,
 	universities_colleges.universities_colleges_id AS schoolId,
@@ -83,4 +83,15 @@ getTeacherByNo
     JOIN core_user_role ON core_user_role.USER_ID = core_user.ID
     JOIN core_role ON core_user_role.ROLE_ID = core_role.ID
     WHERE
-    teacher.teacher_job_number = #username#
+    teacher.teacher_job_number = #username#
+
+updateUserId
+===
+  update core_user set old_Id= #newId# where ID = #oldId#
+
+getAdminByNo
+===
+select core_user.old_id AS userId,
+core_user.NAME AS NAME,
+core_role.NAME AS roleName from core_user  JOIN core_user_role ON core_user_role.USER_ID = core_user.ID
+JOIN core_role ON core_user_role.ROLE_ID = core_role.ID where core_user.CODE = #username#

web/src/main/java/com/ibeetl/jlw/web/AccountController.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.web;
 
 
+import com.ibeetl.admin.console.web.query.UserQuery;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.admin.core.web.JsonResult;
@@ -101,8 +102,12 @@ public class AccountController {
             String roleName = objectMap.get("name").toString();
             if (roleName.equals("学生")) {
                 return JsonResult.success(userService.getStudentByNo(username));
-            } else {
+            } else if (roleName.equals("教师")) {
                 return JsonResult.success(userService.getTeacherByNo(username));
+            }else if (roleName.equals("超级管理员")) {
+                return JsonResult.success(userService.getAdminByNo(username));
+            }else{
+                return null;
             }
         }
         return JsonResult.success(objectMap);
@@ -795,31 +800,54 @@ public class AccountController {
 
     @ApiOperation("根据专业id获取班级列表")
     @GetMapping("getClassListByMajorId.json")
-    public JsonResult<List<Map<String,Object>>> getClassListByMajorId(String majorId){
-         return JsonResult.success(schoolClassService.getClassListByMajorId(majorId));
+    public JsonResult<List<Map<String, Object>>> getClassListByMajorId(String majorId) {
+        return JsonResult.success(schoolClassService.getClassListByMajorId(majorId));
     }
 
     @ApiOperation("根据关键字查询学生信息")
     @GetMapping("getStudentByKeyword.json")
-    public JsonResult<List<Map<String, Object>>> getStudentByKeyword(String keyword,Integer schoolId){
-        return JsonResult.success(studentService.getStudentInfoByKeyword(keyword,Long.valueOf(schoolId)));
+    public JsonResult<List<Map<String, Object>>> getStudentByKeyword(String keyword, Integer schoolId) {
+        return JsonResult.success(studentService.getStudentInfoByKeyword(keyword, Long.valueOf(schoolId)));
     }
 
     @ApiOperation("根据班级id分页展示学生数据")
     @GetMapping("pagedListStudentByClassId.json")
-    public Map<String, Object> pagedListStudentByClassId(String classList,Integer page,Integer size){
-        if(page==null||page<1){
-            page=1;
+    public Map<String, Object> pagedListStudentByClassId(String classList, Integer page, Integer size) {
+        if (page == null || page < 1) {
+            page = 1;
         }
-        if(size==null){
-            size=10;
+        if (size == null) {
+            size = 10;
         }
-        PageQuery<Map<String, Object>> mapPageQuery = studentService.pagedListStudentInfoByClassId(classList,page,size);
-        Map<String,Object> map = new HashMap<>();
-        map.put("code",0);
-        map.put("msg","成功");
-        map.put("count",mapPageQuery.getTotalRow());
-        map.put("content",mapPageQuery);
+        PageQuery<Map<String, Object>> mapPageQuery = studentService.pagedListStudentInfoByClassId(classList, page, size);
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", 0);
+        map.put("msg", "成功");
+        map.put("count", mapPageQuery.getTotalRow());
+        map.put("content", mapPageQuery);
         return map;
     }
+
+    @ApiOperation("修改用户表userid")
+    @PostMapping("updateUserId.json")
+    public JsonResult updateUserId() throws SQLException {
+        CoreUser coreUser = new CoreUser();
+        List<CoreUser> coreUsers = userService.getCoreUserList(coreUser);
+        int i = 0;
+        for (CoreUser user : coreUsers) {
+            Connection conn = openConn();
+            PreparedStatement ps = conn.prepareStatement("select * from EduUsers where username = '" + user.getCode() + "' and IsDeleted = 0");
+
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                Long userId = rs.getLong("id");
+                user.setOldId(userId);
+                userService.updateTemplate(user);
+            }
+            closeConn(conn);
+            ps.close();
+            System.out.println("已完成："+i++);
+        }
+        return JsonResult.success();
+    }
 }