|
@@ -1,10 +1,14 @@
|
|
package cn.com.qmth.stmms.api.controller;
|
|
package cn.com.qmth.stmms.api.controller;
|
|
|
|
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.domain.ApiUser;
|
|
import cn.com.qmth.stmms.common.domain.ApiUser;
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
import net.sf.json.JSONObject;
|
|
import net.sf.json.JSONObject;
|
|
|
|
+
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
@@ -16,7 +20,12 @@ import javax.servlet.http.HttpServletRequest;
|
|
@RequestMapping("/api")
|
|
@RequestMapping("/api")
|
|
public class LoginController extends BaseApiController {
|
|
public class LoginController extends BaseApiController {
|
|
|
|
|
|
- @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER })
|
|
|
|
|
|
+ public static final String SUBJECT_CODE_SPLIT = ",";
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private SubjectUserService subjectUserService;
|
|
|
|
+
|
|
|
|
+ @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER, Role.SUBJECT_HEADER })
|
|
@RequestMapping(value = "/user/login", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/user/login", method = RequestMethod.GET)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public JSONObject login(HttpServletRequest request) {
|
|
public JSONObject login(HttpServletRequest request) {
|
|
@@ -27,6 +36,10 @@ public class LoginController extends BaseApiController {
|
|
obj.accumulate("userRole", user.getRole().toString());
|
|
obj.accumulate("userRole", user.getRole().toString());
|
|
obj.accumulate("campusId", 0);
|
|
obj.accumulate("campusId", 0);
|
|
obj.accumulate("schoolId", user.getSchoolId());
|
|
obj.accumulate("schoolId", user.getSchoolId());
|
|
|
|
+ if (user.getUserData() != null && Role.SUBJECT_HEADER.equals(user.getRole())) {
|
|
|
|
+ obj.accumulate("subjectCode", StringUtils.join(
|
|
|
|
+ subjectUserService.findSubjectCode(user.getUserData().getId()), SUBJECT_CODE_SPLIT));
|
|
|
|
+ }
|
|
return obj;
|
|
return obj;
|
|
}
|
|
}
|
|
}
|
|
}
|