修改下子系统对接实体的属性名

beetlsql3-dev
Mlxa0324 2 years ago
parent 00f639b12e
commit 7c35e1b961

@ -47,11 +47,11 @@ public class LoginTodo implements Serializable {
/** /**
* ID * ID
*/ */
private String teacherid; private String teacherId;
/** /**
* ID * ID
*/ */
private String studentid; private String studentId;
/** /**
* #{@link CoreUser#getName} * #{@link CoreUser#getName}
*/ */
@ -67,7 +67,7 @@ public class LoginTodo implements Serializable {
/** /**
* ID * ID
*/ */
private String schoolid; private String schoolId;
/** /**
* ID * ID
*/ */
@ -84,7 +84,7 @@ public class LoginTodo implements Serializable {
* *
*/ */
@JsonProperty("class") @JsonProperty("class")
private String schoolclass; private String schoolClass;
/** /**
* *
*/ */

@ -64,13 +64,13 @@ public class LoginTodoService {
LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode()) LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode())
.password(coreUser.getPassword()) .password(coreUser.getPassword())
.roleid(LoginTodo.ThirdRole.STUDENT_ROLE.getCode()) .roleid(LoginTodo.ThirdRole.STUDENT_ROLE.getCode())
.studentid(student.getStudentId().toString()) .studentId(student.getStudentId().toString())
.name(coreUser.getName()).sex(gender) .name(coreUser.getName()).sex(gender)
.school(first.getUniversitiesCollegesName()) .school(first.getUniversitiesCollegesName())
.schoolid(first.getUniversitiesCollegesId().toString()) .schoolId(first.getUniversitiesCollegesId().toString())
.college(first.getUniversityFacultyName()) .college(first.getUniversityFacultyName())
.major(first.getUniversitySystemName()) .major(first.getUniversitySystemName())
.schoolclass(first.getClassName()) .schoolClass(first.getClassName())
.studentNo(student.getStudentSn()) .studentNo(student.getStudentSn())
.build(); .build();
consumer.accept(loginTodo); consumer.accept(loginTodo);
@ -104,10 +104,10 @@ public class LoginTodoService {
LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode()) LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode())
.password(coreUser.getPassword()) .password(coreUser.getPassword())
.roleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode()) .roleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode())
.teacherid(teacherId.toString()) .teacherId(teacherId.toString())
.name(coreUser.getName()).sex(gender) .name(coreUser.getName()).sex(gender)
.school(first.getUniversitiesCollegesName()) .school(first.getUniversitiesCollegesName())
.schoolid(first.getUniversitiesCollegesId().toString()) .schoolId(first.getUniversitiesCollegesId().toString())
.college(first.getUniversityFacultyName()) .college(first.getUniversityFacultyName())
.major(first.getUniversitySystemName()) .major(first.getUniversitySystemName())
.build(); .build();

@ -198,14 +198,14 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
LoginTodo loginTodo = validateAndGetLoginTodo(applicationToken); LoginTodo loginTodo = validateAndGetLoginTodo(applicationToken);
// 学生ID // 学生ID
final String studentId = loginTodo.getStudentid(); final String studentId = loginTodo.getStudentId();
Assert.notEmpty(studentId, "该接口只允许学生访问!"); Assert.notEmpty(studentId, "该接口只允许学生访问!");
// 应用ID // 应用ID
final String applicationId = loginTodo.getApplicationId(); final String applicationId = loginTodo.getApplicationId();
// 院校ID // 院校ID
final String universitiesCollegesId = loginTodo.getSchoolid(); final String universitiesCollegesId = loginTodo.getSchoolId();
Assert.isTrue(StrUtil.isAllNotEmpty(studentId, applicationId, universitiesCollegesId), "学生ID、应用ID、院校ID都不能为空"); Assert.isTrue(StrUtil.isAllNotEmpty(studentId, applicationId, universitiesCollegesId), "学生ID、应用ID、院校ID都不能为空");

@ -126,14 +126,14 @@ public class IndexController {
loginTodo.setUsername("测试教师"); loginTodo.setUsername("测试教师");
loginTodo.setPassword("123qwe"); loginTodo.setPassword("123qwe");
loginTodo.setRoleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode()); loginTodo.setRoleid(LoginTodo.ThirdRole.TEACHER_ROLE.getCode());
loginTodo.setTeacherid("1"); loginTodo.setTeacherId("1");
loginTodo.setStudentid(null); loginTodo.setStudentId(null);
loginTodo.setName("测试教师"); loginTodo.setName("测试教师");
loginTodo.setSex("男"); loginTodo.setSex("男");
loginTodo.setSchool("天蚕一瓶123"); loginTodo.setSchool("天蚕一瓶123");
loginTodo.setCollege("天蚕一瓶123"); loginTodo.setCollege("天蚕一瓶123");
loginTodo.setMajor(null); loginTodo.setMajor(null);
loginTodo.setSchoolclass(null); loginTodo.setSchoolClass(null);
loginTodo.setStudentNo(null); loginTodo.setStudentNo(null);
// LoginTodo loginTodo = new LoginTodo(); // LoginTodo loginTodo = new LoginTodo();
@ -392,8 +392,8 @@ public class IndexController {
if("4".equals(loginTodo.getRoleid())){ if("4".equals(loginTodo.getRoleid())){
//查相应的班级ID //查相应的班级ID
SchoolClass schoolClass = new SchoolClass(); SchoolClass schoolClass = new SchoolClass();
if(StringUtils.isNotBlank(loginTodo.getSchoolclass())){ if(StringUtils.isNotBlank(loginTodo.getSchoolClass())){
schoolClass.setClassName(loginTodo.getSchoolclass()); schoolClass.setClassName(loginTodo.getSchoolClass());
List<SchoolClass>schoolClassList = schoolClassService.getValues(schoolClass); List<SchoolClass>schoolClassList = schoolClassService.getValues(schoolClass);
if(null != schoolClassList && schoolClassList.size()>0){ if(null != schoolClassList && schoolClassList.size()>0){
for(int i=0;i<schoolClassList.size();i++){ for(int i=0;i<schoolClassList.size();i++){
@ -409,7 +409,7 @@ public class IndexController {
schoolClass.setAddTime(new Date()); schoolClass.setAddTime(new Date());
schoolClass.setClassStatus(1); schoolClass.setClassStatus(1);
schoolClass.setUserId(coreUser.getId()); schoolClass.setUserId(coreUser.getId());
schoolClass.setClassName(loginTodo.getSchoolclass()); schoolClass.setClassName(loginTodo.getSchoolClass());
schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId()); schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
schoolClass.setOrgId(universitiesColleges.getOrgId()); schoolClass.setOrgId(universitiesColleges.getOrgId());

Loading…
Cancel
Save