添加根据工号和身份码登入api
This commit is contained in:
parent
ff3a1e425c
commit
7cc16df34d
|
@ -14,7 +14,10 @@ import org.jeecg.modules.entity.CeesUser;
|
|||
import org.jeecg.modules.entity.dto.CreateAccountDto;
|
||||
import org.jeecg.modules.enums.IdentityEnum;
|
||||
import org.jeecg.modules.enums.MajorEnum;
|
||||
import org.jeecg.modules.service.ICeesLocalTeacherService;
|
||||
import org.jeecg.modules.service.ICeesUserService;
|
||||
import org.jeecg.modules.service.ICeesWaiTeacherService;
|
||||
import org.jeecg.modules.service.IStudentService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
@ -36,6 +39,12 @@ import java.util.Arrays;
|
|||
public class CeesUserController extends JeecgController<CeesUser, ICeesUserService> {
|
||||
@Autowired
|
||||
private ICeesUserService ceesUserService;
|
||||
@Autowired
|
||||
private ICeesWaiTeacherService ceesWaiTeacherService;
|
||||
@Autowired
|
||||
private ICeesLocalTeacherService ceesLocalTeacherService;
|
||||
@Autowired
|
||||
private IStudentService studentService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
|
@ -138,6 +147,7 @@ public class CeesUserController extends JeecgController<CeesUser, ICeesUserServi
|
|||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
this.ceesUserService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
// this.ceesWaiTeacherService.removeById()
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,8 @@ import org.jeecg.common.api.vo.Result;
|
|||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.modules.entity.CeesWaiTeacher;
|
||||
import org.jeecg.modules.entity.dto.CreateAccountDto;
|
||||
import org.jeecg.modules.service.ICeesUserService;
|
||||
import org.jeecg.modules.service.ICeesWaiTeacherService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
@ -32,6 +34,8 @@ import java.util.Map;
|
|||
public class CeesWaiTeacherController extends JeecgController<CeesWaiTeacher, ICeesWaiTeacherService> {
|
||||
@Autowired
|
||||
private ICeesWaiTeacherService ceesWaiTeacherService;
|
||||
@Autowired
|
||||
private ICeesUserService ceesUserService;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -107,6 +111,11 @@ public class CeesWaiTeacherController extends JeecgController<CeesWaiTeacher, IC
|
|||
@ApiOperation(value="外校老师管理-添加", notes="外校老师管理-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody CeesWaiTeacher ceesWaiTeacher) {
|
||||
CreateAccountDto createAccountDto = new CreateAccountDto();
|
||||
createAccountDto.setGroup(4);
|
||||
createAccountDto.setMajorId(ceesWaiTeacher.getMajorId());
|
||||
createAccountDto.setNum(1);
|
||||
Result<?> account = ceesUserService.createAccount(createAccountDto);
|
||||
ceesWaiTeacherService.save(ceesWaiTeacher);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package org.jeecg.modules.contoller.h5;
|
||||
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.entity.CeesAdminInfo;
|
||||
import org.jeecg.modules.entity.CeesUser;
|
||||
import org.jeecg.modules.service.ICeesUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -39,6 +40,10 @@ public class h5CeesUserController {
|
|||
return ceesUserService.checkUser(ceesUser);
|
||||
}
|
||||
|
||||
@PostMapping("/checkUserByEmployeeCode")
|
||||
public Result<?> checkUserByEmployeeCode(@RequestBody CeesAdminInfo ceesAdminInfo){
|
||||
return ceesUserService.checkUserByEmployeeCode(ceesAdminInfo);
|
||||
}
|
||||
/**
|
||||
* 获取用户信息
|
||||
* @param userId
|
||||
|
|
|
@ -2,6 +2,7 @@ package org.jeecg.modules.service;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.entity.CeesAdminInfo;
|
||||
import org.jeecg.modules.entity.CeesUser;
|
||||
import org.jeecg.modules.entity.dto.CreateAccountDto;
|
||||
|
||||
|
@ -31,4 +32,5 @@ public interface ICeesUserService extends IService<CeesUser> {
|
|||
|
||||
Result<?> getH5Time();
|
||||
|
||||
Result<?> checkUserByEmployeeCode(CeesAdminInfo ceesAdminInfo);
|
||||
}
|
||||
|
|
|
@ -138,12 +138,7 @@ public class CeesUserServiceImpl extends ServiceImpl<CeesUserMapper, CeesUser> i
|
|||
jsonObject.put("status", "2"); //无需填写信息
|
||||
return Result.ok(jsonObject);
|
||||
} else {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("userId", user.getUserId());
|
||||
jsonObject.put("router", "/leaderShip");
|
||||
jsonObject.put("status", "2"); //无需填写信息
|
||||
return Result.ok(jsonObject);
|
||||
// return Result.error("管理员账号还未申请通过!");
|
||||
return Result.error("管理员账号还未申请通过!");
|
||||
}
|
||||
// 2学生
|
||||
case "2":
|
||||
|
@ -385,6 +380,22 @@ public class CeesUserServiceImpl extends ServiceImpl<CeesUserMapper, CeesUser> i
|
|||
return Result.ok(cesH5Time);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> checkUserByEmployeeCode(CeesAdminInfo ceesAdminInfo) {
|
||||
LambdaQueryWrapper<CeesAdminInfo> adminInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
adminInfoLambdaQueryWrapper.eq(CeesAdminInfo::getUserId, ceesAdminInfo.getUserId())
|
||||
.eq(CeesAdminInfo::getWorkNumber, ceesAdminInfo.getWorkNumber());
|
||||
CeesAdminInfo ceesAdminInfodata = ceesAdminInfoMapper.selectOne(adminInfoLambdaQueryWrapper);
|
||||
if (ceesAdminInfodata != null) {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("userId", ceesAdminInfodata.getUserId());
|
||||
jsonObject.put("router", "/leaderShip");
|
||||
jsonObject.put("status", "2"); //无需填写信息
|
||||
return Result.ok(jsonObject);
|
||||
} else {
|
||||
return Result.error("管理员账号还未申请通过!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 获取生成规则---用户前端获取rule
|
||||
|
|
Loading…
Reference in New Issue