|
@@ -16,16 +16,12 @@ import cn.seecoder.ojserver.model.dto.CodeJudgeDTO;
|
|
|
import cn.seecoder.ojserver.model.vo.CodeJudgeVO;
|
|
import cn.seecoder.ojserver.model.vo.CodeJudgeVO;
|
|
|
import cn.seecoder.ojserver.service.JudgeService;
|
|
import cn.seecoder.ojserver.service.JudgeService;
|
|
|
|
|
|
|
|
-import com.nju.edu.paasMonitorClient.MonitorClient;
|
|
|
|
|
-import com.nju.edu.paasMonitorClient.entity.Call;
|
|
|
|
|
-import com.nju.edu.paasMonitorCommon.enums.SeecSystem;
|
|
|
|
|
import okhttp3.*;
|
|
import okhttp3.*;
|
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -73,8 +69,6 @@ public class JudgeServiceImpl implements JudgeService {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public JudgeResult asyncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
|
|
public JudgeResult asyncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
|
|
|
- Call call = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "createCommit");
|
|
|
|
|
- call.start();
|
|
|
|
|
Commit commit = new Commit();
|
|
Commit commit = new Commit();
|
|
|
commit.setUserId(0);
|
|
commit.setUserId(0);
|
|
|
commit.setProblemId(questionId);
|
|
commit.setProblemId(questionId);
|
|
@@ -82,12 +76,8 @@ public class JudgeServiceImpl implements JudgeService {
|
|
|
commit.setLanguage(codeJudgeVO.getLanguage());
|
|
commit.setLanguage(codeJudgeVO.getLanguage());
|
|
|
commit.setCommitTime(new Date());
|
|
commit.setCommitTime(new Date());
|
|
|
commitDAO.save(commit);
|
|
commitDAO.save(commit);
|
|
|
- call.end();
|
|
|
|
|
- Call call1 = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "commitToMQ");
|
|
|
|
|
- call1.start();
|
|
|
|
|
CodeJudgeDTO codeJudgeDTO = new CodeJudgeDTO(commit.getId(), questionId, codeJudgeVO);
|
|
CodeJudgeDTO codeJudgeDTO = new CodeJudgeDTO(commit.getId(), questionId, codeJudgeVO);
|
|
|
rabbitTemplate.convertAndSend("notice_queue", codeJudgeDTO);
|
|
rabbitTemplate.convertAndSend("notice_queue", codeJudgeDTO);
|
|
|
- call1.end();
|
|
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|