Przeglądaj źródła

feat: 添加 EvalController.java 和修改UserController.java

mjh 4 lat temu
rodzic
commit
2e42b68c88

+ 5 - 6
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -15,7 +15,6 @@ import cn.seecoder.seecoderportalserver.service.Impl.CoderService;
 import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
 import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -97,7 +96,10 @@ public class CourseService {
 
     public List<CourseVO> getAllCourses() {
         List<Course> courses = courseRepository.findAll();
-        List<CourseVO> courseVOs = courses.stream().map(courseMapper::courseToCourseVO).collect(Collectors.toList());
+        List<CourseVO> courseVOs = courses.stream()
+                .filter(course -> course.getCourseState().equals(CourseState.NORMAL))
+                .map(courseMapper::courseToCourseVO)
+                .collect(Collectors.toList());
         return courseVOs;
     }
 
@@ -110,10 +112,7 @@ public class CourseService {
     public List<CourseVO> getStudentCourses(Long studentId) {
         List<CourseSelection> courseSelections = courseSelectionRepository.findCourseSelectionsByUserId(studentId);
         List<CourseVO> courseVOs = courseSelections.stream()
-                .map(courseSelection -> courseMapper
-                        .courseToCourseVO(courseRepository
-                                .findById(courseSelection.getCourseId())
-                                .get()))
+                .map(courseSelection -> courseMapper.courseToCourseVO(courseRepository.findById(courseSelection.getCourseId()).get()))
                 .collect(Collectors.toList());
         return courseVOs;
     }

+ 2 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/CoderService.java

@@ -23,7 +23,7 @@ public class CoderService implements SubsystemService {
     }
 
     @Override
-    public JSONObject createService(CourseVO courseVO){
+    public JSONObject createService(CourseVO courseVO) {
         String uri = "https://coder-server.seec.seecoder.cn/api/course";
         String token = httpService.getToken();
         JSONObject requestBody = new JSONObject();
@@ -44,7 +44,7 @@ public class CoderService implements SubsystemService {
 
     }
 
-    public void getCoursesByTeacher(){
+    public void getCoursesByTeacher() {
         String uri = "https://coder-server.seec.seecoder.cn/api/course";
         String token = httpService.getToken();
         List<NameValuePair> param = new ArrayList<>();

+ 7 - 6
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/EvalService.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
 public class EvalService implements SubsystemService {
-    HttpService httpService;
+    private final HttpService httpService;
 
     public EvalService(HttpService httpService) {
         this.httpService = httpService;
@@ -31,17 +31,18 @@ public class EvalService implements SubsystemService {
 
     }
 
-    public void getAllExams(){
+    public JSONObject getAllExams(int pageSize, int pageNum) {
         String uri = "https://eval-server.seec.seecoder.cn/api/exam/list";
         String token = httpService.getToken();
         List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("pageSize", "10"));
-        params.add(new BasicNameValuePair("pageNum", "1"));
+        params.add(new BasicNameValuePair("pageSize", String.valueOf(pageSize)));
+        params.add(new BasicNameValuePair("pageNum", String.valueOf(pageNum)));
+        String result = null;
         try {
-            String result = httpService.sendGet(uri, params, token);
-            System.out.println(result);
+            result = httpService.sendGet(uri, params, token);
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return JSONObject.parseObject(result);
     }
 }

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

@@ -151,4 +151,9 @@ public class UserService {
                 .map(User::getId)
                 .orElseThrow(CustomErrorException::userIdNotFound);
     }
+
+    public UserVO findUserById(Long id){
+        User user = userRepository.findById(id).orElseThrow(CustomErrorException::userIdNotFound);
+        return userMapper.userToUserVO(user);
+    }
 }

+ 21 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/EvalController.java

@@ -0,0 +1,21 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/eval")
+public class EvalController {
+    private final EvalService evalService;
+
+    public EvalController(EvalService evalService) {this.evalService = evalService;}
+
+    @GetMapping
+    public OkResponse<JSONObject> getAllExams() {
+        return OkResponse.of((JSONObject) evalService.getAllExams(100, 1).get("result"));
+    }
+}

+ 5 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserController.java

@@ -90,4 +90,9 @@ public class UserController {
     public OkResponse<Long> findIdByPhone(@PathVariable String phone) {
         return OkResponse.of(userService.findIdByPhone(phone));
     }
+
+    @GetMapping("/findUserById")
+    public OkResponse<UserVO> findById(@RequestParam Long id){
+        return OkResponse.of(userService.findUserById(id));
+    }
 }