1、swagger接口文档

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

@@ -45,9 +45,14 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
 
     Map<String, Object> getTeacherByNo(String username);
 
+    Map<String, Object> getTeacherByNoOfNet(String username);
+
     Map<String, Object> getStudentByNo(String username);
 
+    Map<String, Object> getStudentByNoOfNet(String username);
+
     Map<String, Object> getAdminByNo(String username);
+
     void updateUserId(Long newId, Long oldId);
 
     List<CoreUser> getCoreUserListAndOldIdIsNull();

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

@@ -272,6 +272,14 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 		return coreUserDao.getStudentByNo(username);
 	}
 
+	public Map<String,Object> getStudentByNoOfNet(String username){
+		return coreUserDao.getStudentByNoOfNet(username);
+	}
+
+	public Map<String,Object> getTeacherByNoOfNet(String username){
+		return coreUserDao.getTeacherByNoOfNet(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

@@ -62,6 +62,35 @@ getStudentByNo
     WHERE
     core_user.CODE = #username#
 
+
+getStudentByNoOfNet
+===
+    SELECT
+    core_user.old_id AS userId,
+    core_user.NAME AS NAME,
+    core_role.NAME AS roleName,
+    universities_colleges.old_school_id AS schoolId,
+    school_class.class_id AS classId,
+    university_system.university_system_id AS majorId,
+    university_system.university_system_name AS majorName,
+    school_class.class_name AS className,
+    universities_colleges.universities_colleges_name AS schoolName,
+    university_faculty.university_faculty_id AS collegeId,
+    university_faculty.university_faculty_name AS collegeName,
+    student.student_id AS studentId
+    FROM
+    core_user
+    JOIN student ON core_user.CODE = student.student_sn
+    JOIN universities_colleges ON core_user.ORG_ID = universities_colleges.org_id
+    JOIN school_class ON student.class_id = school_class.class_id
+    JOIN university_faculty ON school_class.university_faculty_id = university_faculty.university_faculty_id
+    JOIN university_system ON school_class.university_system_id = university_system.university_system_id
+    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#
+
+
 getTeacherByNo
 ===
     SELECT
@@ -87,6 +116,32 @@ getTeacherByNo
     WHERE
     teacher.teacher_job_number = #username#
 
+getTeacherByNoOfNet
+===
+    SELECT
+	core_user.old_id AS userId,
+	core_user.NAME AS NAME,
+	core_role.NAME AS roleName,
+	universities_colleges.old_school_id AS schoolId,
+	university_system.university_system_id AS majorId,
+	university_system.university_system_name AS majorName,
+	universities_colleges.universities_colleges_name AS schoolName,
+	university_faculty.university_faculty_id AS collegeId,
+	university_faculty.university_faculty_name AS collegeName,
+    teacher.teacher_id AS teacherId
+    FROM
+    core_user
+    JOIN teacher ON core_user.CODE = teacher.teacher_job_number
+    JOIN universities_colleges ON core_user.ORG_ID = universities_colleges.org_id
+   
+    JOIN university_faculty ON teacher.university_faculty_id = university_faculty.university_faculty_id
+    JOIN university_system ON teacher.university_system_id = university_system.university_system_id
+    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#
+
+
 updateUserId
 ===
   update core_user set old_Id= #newId# where ID = #oldId#

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

@@ -118,6 +118,27 @@ public class AccountController {
         return JsonResult.success(objectMap);
     }
 
+    @ApiOperation("对外提供接口--该接口返回的id都是2.0的id。供.NET系统调用（防止用户历史数据无法取值）")
+    @PostMapping("findByUsernameAndByNet.json")
+    public JsonResult<Map<String, Object>> findByUsernameAndByNet(String username, String password) {
+        Map<String, Object> objectMap = userService.getUserByUsernameAndPwd(username, password);
+        if (objectMap != null && objectMap.size() > 0) {
+            String roleName = objectMap.get("name").toString();
+            if (roleName.equals("学生")) {
+                return JsonResult.success(userService.getStudentByNoOfNet(username));
+            } else if (roleName.equals("教师")) {
+                return JsonResult.success(userService.getTeacherByNoOfNet(username));
+            } else if (roleName.equals("超级管理员")) {
+                return JsonResult.success(userService.getAdminByNo(username));
+            } else {
+                return null;
+            }
+        }
+        return JsonResult.success(objectMap);
+    }
+
+
+
     @ApiOperation("为学生账号创建基础资金表")
     @PostMapping("createFund.json")
     public void createFund() throws SQLException {