Browse Source

根据华科检查客观题小工具修改部分接口

ting.yin 3 years ago
parent
commit
84fa50094e

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -571,7 +571,7 @@ public class CoreController extends BaseApiController {
 
     @RequestMapping(value = "/exam/paper/query", method = RequestMethod.POST)
     @ResponseBody
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCHOOL_DEV })
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCHOOL_DEV, Role.SUBJECT_HEADER })
     public JSONArray paperQuery(HttpServletRequest request, @RequestParam Integer examId,
             @RequestParam String subjectCode, @RequestParam(required = false, defaultValue = "#") String paperType) {
         ApiUser user = RequestUtils.getApiUser(request);

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamStudentController.java

@@ -74,7 +74,7 @@ public class ExamStudentController extends BaseApiController {
             obj.accumulate("studentId", String.valueOf(student.getId()));
             obj.accumulate("subjectCode", student.getSubjectCode());
             obj.accumulate("subjectName", student.getSubjectName());
-            obj.accumulate("examSite", student.getExamSite());
+            obj.accumulate("examSite", StringUtils.trimToEmpty(student.getExamSite()));
         } else {
             obj.accumulate("examId", examStudent.getExamId());
             obj.accumulate("campusCode", "");

+ 14 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/LoginController.java

@@ -1,10 +1,14 @@
 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.domain.ApiUser;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 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.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,7 +20,12 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/api")
 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)
     @ResponseBody
     public JSONObject login(HttpServletRequest request) {
@@ -27,6 +36,10 @@ public class LoginController extends BaseApiController {
         obj.accumulate("userRole", user.getRole().toString());
         obj.accumulate("campusId", 0);
         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;
     }
 }