Quellcode durchsuchen

feat: 同步方法的commit写入数据库

haha vor 4 Jahren
Ursprung
Commit
d9762e0110

+ 3 - 3
seec-oj-server/src/main/java/cn/seecoder/ojserver/controller/JudgeController.java

@@ -29,12 +29,12 @@ public class JudgeController {
 
     @PostMapping("/code")
     public Response judgeCode(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest119","/api/judge/code");
+        Call call = MonitorClient.createCall(SeecSystem.CODER,"syncJudge","/api/judge/code");
         try{
             call.start();
-            return Response.buildSuccess(judgeService.judgeCode(problemId, codeJudgeVO));
+            return Response.buildSuccess(judgeService.syncJudgeCode(problemId, codeJudgeVO));
         }catch (Exception e){
-            MonitorClient.logError(SeecSystem.CODER,"ojtest119","/api/judge/code",e);
+            MonitorClient.logError(SeecSystem.CODER,"syncJudge","/api/judge/code",e);
             call.fail();
             throw e;
         }finally {

+ 0 - 3
seec-oj-server/src/main/java/cn/seecoder/ojserver/manager/JudgeManager.java

@@ -23,10 +23,7 @@ public class JudgeManager {
     }
 
     public JudgeResult judgeCodeQuestionAnswers(JudgeDTO judgeDTO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest119","callJudgeCode");
-        call.start();
         Optional<JudgeResult> res = codeJudgeThirdPartyService.judgeCodeQuestionAnswers(judgeDTO);
-        call.end();
         if (res.isPresent()) {
             return res.get();
         } else {

+ 1 - 0
seec-oj-server/src/main/java/cn/seecoder/ojserver/service/JudgeService.java

@@ -6,4 +6,5 @@ import cn.seecoder.ojserver.model.vo.CodeJudgeVO;
 public interface JudgeService {
     public JudgeResult judgeCode(Integer questionId, CodeJudgeVO codeJudgeVO);
     public JudgeResult asyncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO);
+    public JudgeResult syncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO);
 }

+ 44 - 8
seec-oj-server/src/main/java/cn/seecoder/ojserver/service/impl/JudgeServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.seecoder.ojserver.service.impl;
 
+import cn.seecoder.codejudge.client.CodeJudgeException;
 import cn.seecoder.codejudge.client.JudgeDTO;
 import cn.seecoder.codejudge.client.JudgeResult;
+import cn.seecoder.codejudge.client.JudgeResultType;
 import cn.seecoder.ojserver.dao.CommitDAO;
 import cn.seecoder.ojserver.dao.entity.Commit;
 import cn.seecoder.ojserver.dao.entity.Problem;
 import cn.seecoder.ojserver.dao.entity.TestCase;
+import cn.seecoder.ojserver.enums.CodeJudgeResultType;
 import cn.seecoder.ojserver.exception.ThirdPartyServiceException;
 import cn.seecoder.ojserver.manager.JudgeManager;
 import cn.seecoder.ojserver.manager.QuestionManager;
@@ -22,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -46,11 +50,10 @@ public class JudgeServiceImpl implements JudgeService {
 
     }
 
+
     @Override
     public JudgeResult judgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
         try {
-            Call call = MonitorClient.createCall(SeecSystem.CODER, "ojtest119", "buildJudge");
-            call.start();
             JudgeDTO judgeDTO = new JudgeDTO();
             judgeDTO.setCode(codeJudgeVO.getCode());
             judgeDTO.setLanguage(codeJudgeVO.getLanguage());
@@ -62,8 +65,6 @@ public class JudgeServiceImpl implements JudgeService {
             List<String> outputList = testCaseList.stream().map(TestCase::getOutput).collect(Collectors.toList());
             judgeDTO.setInputList(inputList);
             judgeDTO.setOutputList(outputList);
-            call.end();
-
             return judgeManager.judgeCodeQuestionAnswers(judgeDTO);
         } catch (ThirdPartyServiceException exception) {
             throw exception;
@@ -72,7 +73,7 @@ public class JudgeServiceImpl implements JudgeService {
 
     @Override
     public JudgeResult asyncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"asyncJudge","createCommit");
+        Call call = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "createCommit");
         call.start();
         Commit commit = new Commit();
         commit.setUserId(0);
@@ -82,13 +83,48 @@ public class JudgeServiceImpl implements JudgeService {
         commit.setCommitTime(new Date());
         commitDAO.save(commit);
         call.end();
-        Call call1 = MonitorClient.createCall(SeecSystem.CODER,"asyncJudge","commitToMQ");
+        Call call1 = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "commitToMQ");
         call1.start();
-        CodeJudgeDTO codeJudgeDTO = new CodeJudgeDTO(commit.getId(),questionId,codeJudgeVO);
-        rabbitTemplate.convertAndSend("notice_queue",codeJudgeDTO);
+        CodeJudgeDTO codeJudgeDTO = new CodeJudgeDTO(commit.getId(), questionId, codeJudgeVO);
+        rabbitTemplate.convertAndSend("notice_queue", codeJudgeDTO);
         call1.end();
         return null;
     }
 
+    @Override
+    public JudgeResult syncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
+        Commit commit = new Commit();
+        commit.setUserId(0);
+        commit.setProblemId(questionId);
+        commit.setCode(codeJudgeVO.getCode());
+        commit.setLanguage(codeJudgeVO.getLanguage());
+        commit.setCommitTime(new Date());
+        JudgeResult judgeResult = judgeCode(questionId, codeJudgeVO);
+
+        CodeJudgeResultType message = CodeJudgeResultType.values()[JudgeResultType.ACCEPT.ordinal()];
+        for (JudgeResult.Item item : judgeResult.getResultList()) {
+            if (item.getResult() != JudgeResultType.ACCEPT) {
+                message = CodeJudgeResultType.values()[item.getResult().ordinal()];
+                break;
+            }
+        }
+
+        int acNum = 0;
+        for (JudgeResult.Item item : judgeResult.getResultList()) {
+            if (item.getResult() == JudgeResultType.ACCEPT) {
+                acNum++;
+            }
+        }
+
+        int score = (acNum / judgeResult.getResultList().size()) * 100;
+
+
+        commit.setResult(message.name());
+        commit.setScore(score);
+        commit.setJudgeTime(new Date());
+        commitDAO.save(commit);
+        return null;
+    }
+
 
 }