|
|
|
@ -95,6 +95,7 @@ public class UserController {
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
public ResultEntity login(@RequestParam(required = false) String passwordEncode,
|
|
|
|
|
@RequestParam(required = false) String userName,
|
|
|
|
|
@ApiParam("所属系统")@RequestParam String systemOwner,
|
|
|
|
|
HttpServletRequest request,
|
|
|
|
|
@RequestParam(required = false) String TOKEN) {
|
|
|
|
|
JwtUser jwtUser;
|
|
|
|
@ -115,7 +116,7 @@ public class UserController {
|
|
|
|
|
|
|
|
|
|
// 1、子系统直接登录
|
|
|
|
|
StuUserExample stuUserExample = new StuUserExample();
|
|
|
|
|
stuUserExample.createCriteria().andUsernameEqualTo(userName).andPasswordEqualTo(passWord);
|
|
|
|
|
stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andUsernameEqualTo(userName).andPasswordEqualTo(passWord);
|
|
|
|
|
List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
|
|
|
|
|
//不存在返回错误,正确放行
|
|
|
|
|
if (stuUsers.isEmpty()) {
|
|
|
|
@ -214,7 +215,8 @@ public class UserController {
|
|
|
|
|
@ApiOperation("根据用户Code查询该用户是否存在个人赛用户数据,存在则返回,不存在则新增后返回,用于智云3.0创建用户后调用该接口创建用户个人赛")
|
|
|
|
|
@PostMapping("/checkOrCreateForexSimulationUser")
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList) {
|
|
|
|
|
public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList,
|
|
|
|
|
@RequestParam String systemOwner) {
|
|
|
|
|
List<StuUser> users = new ArrayList<>();
|
|
|
|
|
Map<String, StuClass> map = new HashMap<>();
|
|
|
|
|
for (int i = 0; i < zyUserInfoList.size(); i++) {
|
|
|
|
@ -241,6 +243,11 @@ public class UserController {
|
|
|
|
|
stuUser.setRoleId(roleId);
|
|
|
|
|
stuUser.setSchoolId(zyUserInfo.getSchoolId().toString());
|
|
|
|
|
stuUser.setSchoolName(zyUserInfo.getSchoolName());
|
|
|
|
|
|
|
|
|
|
//新增两个参数
|
|
|
|
|
stuUser.setSystemOnwer(systemOwner);
|
|
|
|
|
stuUser.setZyUserid(zyUserInfo.getUserId());
|
|
|
|
|
|
|
|
|
|
stuUser.setStatus(0);
|
|
|
|
|
stuUser.setCreateTime(new Date());
|
|
|
|
|
users.add(stuUser);
|
|
|
|
|