mjh 4 лет назад
Родитель
Сommit
fb49f1414e

+ 3 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -73,8 +73,9 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/course/selection/confirm",
                         "/api/course/selection/confirm",
                         "/api/course/selection/cancel",
                         "/api/course/selection/cancel",
                         "/api/course/checkName",
                         "/api/course/checkName",
-                        "/api/eval/exams",
-                        "/api/eval/student/exams",
+                        "/api/eval/exam/all",
+                        "/api/eval/exam/student",
+                        "/api/eval/exam/recommend",
                         "/api/coder/exams",
                         "/api/coder/exams",
                         "/api/announcement",
                         "/api/announcement",
                         "/api/announcement/getAllByCourseId")
                         "/api/announcement/getAllByCourseId")

+ 1 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -46,9 +46,7 @@ public class CourseService {
 
 
         // 确认授课教师
         // 确认授课教师
         UserVO teacher = userService.findUserById(courseVO.getTeacher().getId());
         UserVO teacher = userService.findUserById(courseVO.getTeacher().getId());
-        List<UserRole> teacherRoles = new ArrayList<>();
-        teacherRoles.add(UserRole.TEACHER);
-        if (!teacherRoles.contains(teacher.getRole())) {
+        if (!userService.isTeacher(teacher.getRole())) {
             throw new CustomErrorException("当前用户无权创建课程");
             throw new CustomErrorException("当前用户无权创建课程");
         }
         }
 
 

+ 5 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/HttpService.java

@@ -45,14 +45,16 @@ public class HttpService {
 
 
     public String sendGet(String uri, List<NameValuePair> params, String token) throws Exception {
     public String sendGet(String uri, List<NameValuePair> params, String token) throws Exception {
         String completedUri;
         String completedUri;
-        if(!params.isEmpty()){
+        if (!params.isEmpty()) {
             String requestParam = EntityUtils.toString(new UrlEncodedFormEntity(params, Consts.UTF_8));
             String requestParam = EntityUtils.toString(new UrlEncodedFormEntity(params, Consts.UTF_8));
             completedUri = uri + "?" + requestParam;
             completedUri = uri + "?" + requestParam;
-        }else{
+        } else {
             completedUri = uri;
             completedUri = uri;
         }
         }
         HttpGet httpGet = new HttpGet(completedUri);
         HttpGet httpGet = new HttpGet(completedUri);
-        httpGet.setHeader("Authorization", token);
+        if (token != null) {
+            httpGet.setHeader("Authorization", token);
+        }
         httpGet.setConfig(RequestConfig.DEFAULT);
         httpGet.setConfig(RequestConfig.DEFAULT);
         CloseableHttpClient client = HttpClients.createDefault();
         CloseableHttpClient client = HttpClients.createDefault();
         CloseableHttpResponse response = client.execute(httpGet);
         CloseableHttpResponse response = client.execute(httpGet);

+ 11 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/EvalService.java

@@ -61,4 +61,15 @@ public class EvalService implements SubsystemService {
         }
         }
         return JSONObject.parseObject(result);
         return JSONObject.parseObject(result);
     }
     }
+
+    public JSONObject getExampleExams(){
+        String uri = "https://eval-server.seec.seecoder.cn/api/exam/recommend";
+        String result = null;
+        try {
+            result = httpService.sendGet(uri, new ArrayList<>(), null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return JSONObject.parseObject(result);
+    }
 }
 }

+ 15 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/UserService.java

@@ -14,6 +14,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 
 
@@ -156,4 +157,18 @@ public class UserService {
         User user = userRepository.findById(id).orElseThrow(CustomErrorException::userIdNotFound);
         User user = userRepository.findById(id).orElseThrow(CustomErrorException::userIdNotFound);
         return userMapper.userToUserVO(user);
         return userMapper.userToUserVO(user);
     }
     }
+
+    public Boolean isTeacher(UserRole role){
+        List<UserRole> teacherRoles = new ArrayList<>();
+        teacherRoles.add(UserRole.TEACHER);
+        teacherRoles.add(UserRole.ADMIN);
+        return teacherRoles.contains(role);
+    }
+
+    public Boolean isStudent(UserRole role){
+        List<UserRole> studentRoles = new ArrayList<>();
+        studentRoles.add(UserRole.STUDENT);
+        studentRoles.add(UserRole.SEEC);
+        return studentRoles.contains(role);
+    }
 }
 }

+ 8 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/EvalController.java

@@ -2,8 +2,8 @@ package cn.seecoder.seecoderportalserver.web.rest;
 
 
 import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
 import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,16 +16,21 @@ public class EvalController {
 
 
     public EvalController(EvalService evalService) {this.evalService = evalService;}
     public EvalController(EvalService evalService) {this.evalService = evalService;}
 
 
-    @GetMapping("/exams")
+    @GetMapping("/exam/all")
     public OkResponse<JSONObject> getAllExams(@RequestParam(defaultValue = "100") int pageSize, @RequestParam(defaultValue = "1") int pageNum) {
     public OkResponse<JSONObject> getAllExams(@RequestParam(defaultValue = "100") int pageSize, @RequestParam(defaultValue = "1") int pageNum) {
         return OkResponse.of((JSONObject) evalService.getAllExams(pageSize, pageNum).get("result"));
         return OkResponse.of((JSONObject) evalService.getAllExams(pageSize, pageNum).get("result"));
     }
     }
 
 
-    @GetMapping("/exams/student")
+    @GetMapping("/exam/student")
     public OkResponse<JSONObject> getStudentExams(@RequestParam(defaultValue = "100") int pageSize,
     public OkResponse<JSONObject> getStudentExams(@RequestParam(defaultValue = "100") int pageSize,
                                                   @RequestParam(defaultValue = "1") int pageNum,
                                                   @RequestParam(defaultValue = "1") int pageNum,
                                                   @RequestParam(value = "state") int state
                                                   @RequestParam(value = "state") int state
     ) {
     ) {
         return OkResponse.of((JSONObject) evalService.getStudentExams(pageSize, pageNum, state).get("result"));
         return OkResponse.of((JSONObject) evalService.getStudentExams(pageSize, pageNum, state).get("result"));
     }
     }
+
+    @GetMapping("/exam/recommend")
+    public OkResponse<JSONArray> getExampleExams(){
+        return OkResponse.of((JSONArray) evalService.getExampleExams().get("result"));
+    }
 }
 }