Explorar o código

feat: 连接coder子系统的新建课程

mjh %!s(int64=4) %!d(string=hai) anos
pai
achega
683ba8804a

+ 3 - 3
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseVO.java

@@ -25,7 +25,7 @@ public class CourseVO {
 
     private Long evalId;
 
-    private Long coderId;
+    private Integer coderId;
 
     private Long helperId;
 
@@ -115,11 +115,11 @@ public class CourseVO {
         this.evalId = evalId;
     }
 
-    public Long getCoderId() {
+    public Integer getCoderId() {
         return coderId;
     }
 
-    public void setCoderId(Long coderId) {
+    public void setCoderId(Integer coderId) {
         this.coderId = coderId;
     }
 

+ 3 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Course.java

@@ -64,7 +64,7 @@ public class Course {
 
     @Column
 //    @NotNull
-    private Long coderId;
+    private Integer coderId;
 
     @Column
 //    @NotNull
@@ -171,11 +171,11 @@ public class Course {
         this.evalId = evalId;
     }
 
-    public Long getCoderId() {
+    public Integer getCoderId() {
         return coderId;
     }
 
-    public void setCoderId(Long coderId) {
+    public void setCoderId(Integer coderId) {
         this.coderId = coderId;
     }
 

+ 18 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -5,6 +5,8 @@ import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
 import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.exception.ExceptionType;
+import cn.seecoder.seecoderportalserver.exception.PortalException;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
@@ -12,6 +14,8 @@ import cn.seecoder.seecoderportalserver.repository.UserRepository;
 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;
@@ -54,12 +58,22 @@ public class CourseService {
     }
 
     public CourseVO createCourse(CourseVO courseVO) {
-        evalService.getAllExams();
+        Integer coderId;
 
+        // 确认授课老师
         Optional<User> teacher = userRepository.findById(courseVO.getTeacher().getId());
-        // 确认授课老师ID存在
         if (!teacher.isPresent()) {
-            return null;
+            throw new PortalException(ExceptionType.ERROR, "该老师不存在");
+        }
+
+        // 创建Coder课程
+        JSONObject coderRes = coderService.createService(courseVO);
+        if ((int) coderRes.get("err") == 0) {
+            JSONObject coderCourse = (JSONObject) coderRes.get("res");
+            coderId = (Integer) coderCourse.get("id");
+            courseVO.setCoderId(coderId);
+        } else {
+            throw new PortalException(ExceptionType.ERROR, "Coder: " + coderRes.get("msg"));
         }
         Course course = courseMapper.courseVOToCourse(courseVO);
         course.setCourseState(CourseState.NORMAL);
@@ -74,7 +88,7 @@ public class CourseService {
     }
 
     // 伪删除
-    public String deleteCourse(Long courseId){
+    public String deleteCourse(Long courseId) {
         Course course = courseRepository.findById(courseId).get();
         course.setCourseState(CourseState.DELETED);
         courseRepository.save(course);

+ 8 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/HttpService.java

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

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

@@ -3,13 +3,10 @@ package cn.seecoder.seecoderportalserver.service.Impl;
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.HttpService;
 import cn.seecoder.seecoderportalserver.service.SubsystemService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +23,7 @@ public class CoderService implements SubsystemService {
     }
 
     @Override
-    public void 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();
@@ -39,7 +36,7 @@ public class CoderService implements SubsystemService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        System.out.println(result);
+        return JSON.parseObject(result);
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package cn.seecoder.seecoderportalserver.service.Impl;
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.HttpService;
 import cn.seecoder.seecoderportalserver.service.SubsystemService;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 import org.springframework.stereotype.Service;
@@ -21,8 +22,8 @@ public class EvalService implements SubsystemService {
     }
 
     @Override
-    public void createService(CourseVO courseVO) {
-
+    public JSONObject createService(CourseVO courseVO) {
+        return null;
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package cn.seecoder.seecoderportalserver.service.Impl;
 
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.SubsystemService;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -9,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(rollbackFor = RuntimeException.class)
 public class HelperService implements SubsystemService {
     @Override
-    public void createService(CourseVO courseVO) {
-
+    public JSONObject createService(CourseVO courseVO) {
+        return null;
     }
 
     @Override

+ 2 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/SubsystemService.java

@@ -1,11 +1,12 @@
 package cn.seecoder.seecoderportalserver.service;
 
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
+import com.alibaba.fastjson.JSONObject;
 
 import java.io.UnsupportedEncodingException;
 
 public interface SubsystemService {
-    void createService(CourseVO courseVO) throws Exception;
+    JSONObject createService(CourseVO courseVO) throws Exception;
 
     void deleteService();
 }