|
|
@ -131,10 +131,10 @@ public class UserController {
|
|
|
|
map.put("classId", user.getClassId());
|
|
|
|
map.put("classId", user.getClassId());
|
|
|
|
map.put("userId", user.getUserid());
|
|
|
|
map.put("userId", user.getUserid());
|
|
|
|
map.put("zyuserid", user.getZyUserid());
|
|
|
|
map.put("zyuserid", user.getZyUserid());
|
|
|
|
try{
|
|
|
|
try {
|
|
|
|
String uuid = getIPAndPlace(request, user.getName(), user.getUserid(), user.getStudentId());
|
|
|
|
String uuid = getIPAndPlace(request, user.getName(), user.getUserid(), user.getStudentId());
|
|
|
|
map.put("logId", uuid);
|
|
|
|
map.put("logId", uuid);
|
|
|
|
}catch (Exception e){
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
map.put("token", token);
|
|
|
|
map.put("token", token);
|
|
|
@ -153,13 +153,18 @@ public class UserController {
|
|
|
|
LoginResult loginResult = LoginResult.create(jwtUser, token);
|
|
|
|
LoginResult loginResult = LoginResult.create(jwtUser, token);
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
map.put("name", loginResult.getName());
|
|
|
|
map.put("name", loginResult.getName());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
StuUserExample stuUserExample = new StuUserExample();
|
|
|
|
|
|
|
|
stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andZyUseridEqualTo(Integer.parseInt(loginResult.getUserId()));
|
|
|
|
|
|
|
|
List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
|
|
|
|
|
|
|
|
String userid = stuUsers.get(0).getUserid();
|
|
|
|
map.put("username", loginResult.getUsername());
|
|
|
|
map.put("username", loginResult.getUsername());
|
|
|
|
map.put("roleId", loginResult.getRoleId());
|
|
|
|
map.put("roleId", loginResult.getRoleId());
|
|
|
|
map.put("schoolId", loginResult.getSchoolId());
|
|
|
|
map.put("schoolId", loginResult.getSchoolId());
|
|
|
|
if (StringUtils.isNotBlank(loginResult.getUserId())) {
|
|
|
|
if (StringUtils.isNotBlank(loginResult.getUserId())) {
|
|
|
|
map.put("classId", loginResult.getClassId());
|
|
|
|
map.put("classId", loginResult.getClassId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
map.put("userId", loginResult.getUserId());
|
|
|
|
map.put("userId", userid);
|
|
|
|
map.put("token", token);
|
|
|
|
map.put("token", token);
|
|
|
|
String uuid = getIPAndPlace(request, loginResult.getName(), loginResult.getUserId(), jwtUser.getStudentId());
|
|
|
|
String uuid = getIPAndPlace(request, loginResult.getName(), loginResult.getUserId(), jwtUser.getStudentId());
|
|
|
|
map.put("logId", uuid);
|
|
|
|
map.put("logId", uuid);
|
|
|
@ -228,7 +233,6 @@ public class UserController {
|
|
|
|
StuClass stuClass = new StuClass();
|
|
|
|
StuClass stuClass = new StuClass();
|
|
|
|
ZYUserInfo zyUserInfo = zyUserInfoList.get(i);
|
|
|
|
ZYUserInfo zyUserInfo = zyUserInfoList.get(i);
|
|
|
|
Integer roleId = zyUserInfo.getRoleId(); //3教师 4学生
|
|
|
|
Integer roleId = zyUserInfo.getRoleId(); //3教师 4学生
|
|
|
|
|
|
|
|
|
|
|
|
Integer zyUserId = zyUserInfo.getUserId();
|
|
|
|
Integer zyUserId = zyUserInfo.getUserId();
|
|
|
|
String username = zyUserInfo.getUsername(); // studentid
|
|
|
|
String username = zyUserInfo.getUsername(); // studentid
|
|
|
|
String name = zyUserInfo.getName();
|
|
|
|
String name = zyUserInfo.getName();
|
|
|
@ -366,12 +370,12 @@ public class UserController {
|
|
|
|
@AnonymousAccess
|
|
|
|
@AnonymousAccess
|
|
|
|
@PostMapping("/selectAllClassNameBySchoolId")
|
|
|
|
@PostMapping("/selectAllClassNameBySchoolId")
|
|
|
|
@ApiOperation("班级下拉框")
|
|
|
|
@ApiOperation("班级下拉框")
|
|
|
|
public ResultEntity<List<Map<String, String>>> selectAllClassNameBySchoolId(@RequestParam String schoolId,@RequestParam String systemOwner) {
|
|
|
|
public ResultEntity<List<Map<String, String>>> selectAllClassNameBySchoolId(@RequestParam String schoolId, @RequestParam String systemOwner) {
|
|
|
|
StuUserExample example =new StuUserExample();
|
|
|
|
StuUserExample example = new StuUserExample();
|
|
|
|
example.createCriteria().andSchoolIdEqualTo(schoolId);
|
|
|
|
example.createCriteria().andSchoolIdEqualTo(schoolId);
|
|
|
|
List<StuUser> list = stuUserMapper.selectByExample(example);
|
|
|
|
List<StuUser> list = stuUserMapper.selectByExample(example);
|
|
|
|
String schoolName = list.get(0).getSchoolName();
|
|
|
|
String schoolName = list.get(0).getSchoolName();
|
|
|
|
return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolName,systemOwner));
|
|
|
|
return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolName, systemOwner));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|