|
|
@@ -10,9 +10,14 @@ import com.ruoyi.common.enums.AccessFromType;
|
|
|
import com.ruoyi.common.enums.ExamType;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.dz.domain.DzCards;
|
|
|
+import com.ruoyi.dz.domain.DzClasses;
|
|
|
import com.ruoyi.dz.domain.DzControl;
|
|
|
+import com.ruoyi.dz.domain.DzSchool;
|
|
|
import com.ruoyi.dz.service.IDzCardsService;
|
|
|
+import com.ruoyi.dz.service.IDzClassesService;
|
|
|
import com.ruoyi.dz.service.IDzControlService;
|
|
|
+import com.ruoyi.dz.service.IDzSchoolService;
|
|
|
+import com.ruoyi.enums.UserTypeEnum;
|
|
|
import com.ruoyi.framework.web.service.SysPermissionService;
|
|
|
import com.ruoyi.framework.web.service.TokenService;
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
@@ -42,8 +47,10 @@ public class UserController {
|
|
|
private final CommService commService;
|
|
|
private final ISysConfigService configService;
|
|
|
private final IDzCardsService dzCardsService;
|
|
|
+ private final IDzSchoolService dzSchoolService;
|
|
|
+ private final IDzClassesService dzClassesService;
|
|
|
|
|
|
- public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService) {
|
|
|
+ public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService, IDzSchoolService dzSchoolService, IDzClassesService dzClassesService) {
|
|
|
this.dzControlService = dzControlService;
|
|
|
this.loginService = loginService;
|
|
|
this.permissionService = permissionService;
|
|
|
@@ -51,6 +58,8 @@ public class UserController {
|
|
|
this.commService = commService;
|
|
|
this.configService = configService;
|
|
|
this.dzCardsService = dzCardsService;
|
|
|
+ this.dzSchoolService = dzSchoolService;
|
|
|
+ this.dzClassesService = dzClassesService;
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "provinces")
|
|
|
@@ -131,6 +140,29 @@ public class UserController {
|
|
|
return AjaxResult.success(resultList);
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/getSchoolList")
|
|
|
+ @Anonymous
|
|
|
+ @ApiOperation("查询学校列表")
|
|
|
+ public AjaxResult getSchoolList(DzSchool dzSchool)
|
|
|
+ {
|
|
|
+ dzSchool.setCampus(false);
|
|
|
+ List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
|
|
|
+ return AjaxResult.success(list);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/getClassList")
|
|
|
+ @Anonymous
|
|
|
+ @ApiOperation("查询学校班级列表")
|
|
|
+ public AjaxResult getClassList(@ApiParam("schoolId") Long schoolId)
|
|
|
+ {
|
|
|
+ DzClasses cCond = new DzClasses();
|
|
|
+ cCond.setSchoolId(schoolId);
|
|
|
+ List<DzClasses> list = dzClassesService.selectDzClassesList(cCond);
|
|
|
+ return AjaxResult.success(list);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|