From 7c35e1b961151186e83f876e599b7e3cc155c85e Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 6 Mar 2023 16:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=AD=90=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=AF=B9=E6=8E=A5=E5=AE=9E=E4=BD=93=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ibeetl/jlw/entity/LoginTodo.java   |  8 ++++----
 .../com/ibeetl/jlw/service/LoginTodoService.java     | 10 +++++-----
 .../StudentAccountAssetAllocationService.java        |  4 ++--
 .../java/com/ibeetl/jlw/web/IndexController.java     | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
index f485acec..702aa2f8 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
@@ -47,11 +47,11 @@ public class LoginTodo implements Serializable {
 	/**
 	 * 教师ID
 	 */
-	private String teacherid;
+	private String teacherId;
 	/**
 	 * 学生ID
 	 */
-	private String studentid;
+	private String studentId;
 	/**
 	 * 账号（一般是#{@link CoreUser#getName}）
 	 */
@@ -67,7 +67,7 @@ public class LoginTodo implements Serializable {
 	/**
 	 * 学校（院校ID）
 	 */
-	private String schoolid;
+	private String schoolId;
 	/**
 	 * 应用ID
 	 */
@@ -84,7 +84,7 @@ public class LoginTodo implements Serializable {
 	 * 班级
 	 */
 	@JsonProperty("class")
-	private String schoolclass;
+	private String schoolClass;
 	/**
 	 * 学生学号
 	 */
diff --git a/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java b/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java
index 72c5867f..91088bd2 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java
@@ -64,13 +64,13 @@ public class LoginTodoService {
         LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode())
                 .password(coreUser.getPassword())
                 .roleid(LoginTodo.ThirdRole.STUDENT_ROLE.getCode())
-                .studentid(student.getStudentId().toString())
+                .studentId(student.getStudentId().toString())
                 .name(coreUser.getName()).sex(gender)
                 .school(first.getUniversitiesCollegesName())
-                .schoolid(first.getUniversitiesCollegesId().toString())
+                .schoolId(first.getUniversitiesCollegesId().toString())
                 .college(first.getUniversityFacultyName())
                 .major(first.getUniversitySystemName())
-                .schoolclass(first.getClassName())
+                .schoolClass(first.getClassName())
                 .studentNo(student.getStudentSn())
                 .build();
         consumer.accept(loginTodo);
@@ -104,10 +104,10 @@ public class LoginTodoService {
         LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode())
                 .password(coreUser.getPassword())
                 .roleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode())
-                .teacherid(teacherId.toString())
+                .teacherId(teacherId.toString())
                 .name(coreUser.getName()).sex(gender)
                 .school(first.getUniversitiesCollegesName())
-                .schoolid(first.getUniversitiesCollegesId().toString())
+                .schoolId(first.getUniversitiesCollegesId().toString())
                 .college(first.getUniversityFacultyName())
                 .major(first.getUniversitySystemName())
                 .build();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java
index 7affc452..02157804 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java
@@ -198,14 +198,14 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
         LoginTodo loginTodo = validateAndGetLoginTodo(applicationToken);
 
         // 学生ID
-        final String studentId = loginTodo.getStudentid();
+        final String studentId = loginTodo.getStudentId();
 
         Assert.notEmpty(studentId, "该接口只允许学生访问！");
 
         // 应用ID
         final String applicationId = loginTodo.getApplicationId();
         // 院校ID
-        final String universitiesCollegesId = loginTodo.getSchoolid();
+        final String universitiesCollegesId = loginTodo.getSchoolId();
 
         Assert.isTrue(StrUtil.isAllNotEmpty(studentId, applicationId, universitiesCollegesId), "学生ID、应用ID、院校ID，都不能为空！");
 
diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
index a1758b44..2d9eb784 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
@@ -126,14 +126,14 @@ public class IndexController {
 		loginTodo.setUsername("测试教师");
 		loginTodo.setPassword("123qwe");
 		loginTodo.setRoleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode());
-		loginTodo.setTeacherid("1");
-		loginTodo.setStudentid(null);
+		loginTodo.setTeacherId("1");
+		loginTodo.setStudentId(null);
 		loginTodo.setName("测试教师");
 		loginTodo.setSex("男");
 		loginTodo.setSchool("天蚕一瓶123");
 		loginTodo.setCollege("天蚕一瓶123");
 		loginTodo.setMajor(null);
-		loginTodo.setSchoolclass(null);
+		loginTodo.setSchoolClass(null);
 		loginTodo.setStudentNo(null);
 
 //		LoginTodo loginTodo = new LoginTodo();
@@ -392,8 +392,8 @@ public class IndexController {
 						if("4".equals(loginTodo.getRoleid())){
 							//查相应的班级ID
 							SchoolClass schoolClass = new SchoolClass();
-							if(StringUtils.isNotBlank(loginTodo.getSchoolclass())){
-								schoolClass.setClassName(loginTodo.getSchoolclass());
+							if(StringUtils.isNotBlank(loginTodo.getSchoolClass())){
+								schoolClass.setClassName(loginTodo.getSchoolClass());
 								List<SchoolClass>schoolClassList = schoolClassService.getValues(schoolClass);
 								if(null != schoolClassList && schoolClassList.size()>0){
 									for(int i=0;i<schoolClassList.size();i++){
@@ -409,7 +409,7 @@ public class IndexController {
 								schoolClass.setAddTime(new Date());
 								schoolClass.setClassStatus(1);
 								schoolClass.setUserId(coreUser.getId());
-								schoolClass.setClassName(loginTodo.getSchoolclass());
+								schoolClass.setClassName(loginTodo.getSchoolClass());
 								schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
 								schoolClass.setOrgId(universitiesColleges.getOrgId());