Parcourir la source

将CompetitionLogicImpl类下的getAllCompetition方法中的result集合倒置

lich il y a 5 ans
Parent
commit
22e37ab489

+ 1 - 1
mooctest-site-server/pom.xml

@@ -7,7 +7,7 @@
         <groupId>cn.iselab.mooctest</groupId>
         <version>0.0.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+    <modelversion>4.0.0</modelversion>
 
     <artifactId>mooctest-site-server</artifactId>
 

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/CompetitionServiceImpl.java

@@ -261,7 +261,7 @@ public class CompetitionServiceImpl implements CompetitionService {
                 List<AddOns2Qualification> addOns2Qualification = addOns2QualificationDao.findByQualificationId(temp.getId());
                 for (AddOns2Qualification addons : addOns2Qualification) {
                     for (AddonsVO currAddons : addonsList) {
-                        //如果信息已存在则返回错误
+                        //如果信息已存在则返回错误7
                         if (currAddons.getEmail().equals(addons.getEmail())) {
                             res.put("code", 2);
                             res.put("message", "修改失败,队员'" + addons.getEmail() + "'已加入其它队伍!");

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/updownload/impl/DownloadServiceImpl.java

@@ -63,7 +63,7 @@ public class DownloadServiceImpl implements DownloadService {
         //遍历该目录下所有的文件找到最新的提交文件
         for (OSSObjectSummary s : sums) {
             String zipFullName = s.getKey();
-            latestTimestamp=checkoutTimestamp(zipFullName, caseName,latestTimestamp);
+            latestTimestamp = checkoutTimestamp(zipFullName, caseName,latestTimestamp);
         }
         System.out.println(latestTimestamp);
         if(latestTimestamp != 0){

+ 2 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/webIDE/WebIDEUrlService.java

@@ -31,5 +31,6 @@ public interface WebIDEUrlService {
      * @param monitor
      * @return
      */
-    public String generateUrlForWebIDE(long userId, long examId, long targetId, long caseId, String caseName, boolean canSubmit, boolean monitor);
+    public String generateUrlForWebIDE(long userId, long examId, long targetId, long caseId,
+                                       String caseName, boolean canSubmit, boolean monitor);
 }

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/webIDE/impl/DockerImageServiceImpl.java

@@ -33,7 +33,7 @@ public class DockerImageServiceImpl implements DockerImageService {
 
     @Override
     public String getImageName(long caseId) {
-        CaseExtends caseExtends=caseExtendsDao.findOne(caseId);
+        CaseExtends caseExtends = caseExtendsDao.findOne(caseId);
         if(caseExtends==null||!JSONUtil.isJson(caseExtends.getProperties())){
             return null;
         }

+ 5 - 4
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/webIDE/impl/WebIDEUrlServiceImpl.java

@@ -41,9 +41,9 @@ public class WebIDEUrlServiceImpl implements WebIDEUrlService {
         String extraCode = indexService.getEntranceJson(examId, caseId, caseName,
                 dockerImageService.getImageName(caseId), true, false, switchConfig);
         try {
-            if (answerWay== AnswerWayConstants.JMETER) {
+            if (answerWay == AnswerWayConstants.JMETER) {
                 return generateUrlForWebIDEJmeter(token, extraCode);
-            }else if (answerWay== AnswerWayConstants.APP_ECLIPSE||answerWay.equals(AnswerWayConstants.WEB_ECLIPSE)){
+            }else if (answerWay == AnswerWayConstants.APP_ECLIPSE||answerWay.equals(AnswerWayConstants.WEB_ECLIPSE)){
                 return null;
             }else {
                 return generateUrlForWebIDE(token, extraCode);
@@ -55,14 +55,15 @@ public class WebIDEUrlServiceImpl implements WebIDEUrlService {
     }
 
     @Override
-    public String generateUrlForWebIDE(long userId, long examId, long targetId, long caseId, String caseName, boolean canSubmit, boolean monitor) {
+    public String generateUrlForWebIDE(long userId, long examId, long targetId,
+                                       long caseId, String caseName, boolean canSubmit, boolean monitor) {
 
         String token = indexService.getSecret(userId, examId);
         String extraCode = indexService.getEntranceJson(examId, caseId, caseName,
                 dockerImageService.getImageName(caseId), canSubmit, monitor,null);//switchConfig为null,即默认所有高级功能均不开启
         try {
             return generateUrlForWebIDE(token, extraCode);
-        }catch (UnsupportedEncodingException e){
+        }catch (UnsupportedEncodingException e) {
             LOG.error("试题"+caseId+"url生成失败");
             return null;
         }

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/CompetitionVOWrapper.java

@@ -38,7 +38,7 @@ public class CompetitionVOWrapper extends BaseWrapper<CompetitionVO,Competition>
     public CompetitionVO wrapWithQualification(Competition competition, Long userId){
         CompetitionVO vo = wrap(competition);
         Qualification qualification = competitionService.getQualification(competition.getId(),userId);
-        if(qualification!=null){
+        if(qualification != null){
             vo.setIsQualified(qualification.getStatus().equals(competition.getStatus()));
             vo.setQualificationId(qualification.getId());
             vo.setAddonsList(addonsVOWrapper.wrap(competitionService.getAddons2Qualification(qualification.getId())));

+ 2 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CompetitionLogicImpl.java

@@ -291,6 +291,8 @@ public class CompetitionLogicImpl implements CompetitionLogic {
         while (iterator.hasNext()) {
             result.add(competitionVOWrapper.wrap((Competition) iterator.next()));
         }
+        //将获取到的集合进行倒序排列
+        Collections.reverse(result);
         return result;
     }
 

+ 21 - 0
mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/updownload/impl/DownloadServiceImplTest.java

@@ -0,0 +1,21 @@
+package cn.iselab.mooctest.site.service.updownload.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DownloadServiceImplTest {
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @Test
+    public void generateUrlForDevAnalysis() {
+    }
+
+    @Test
+    public void download() {
+    }
+}

+ 29 - 0
mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/updownload/impl/DownloadServicePCImplTest.java

@@ -0,0 +1,29 @@
+package cn.iselab.mooctest.site.service.updownload.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DownloadServicePCImplTest {
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @Test
+    public void generateUrlForDevAnalysis() {
+    }
+
+    @Test
+    public void download() {
+    }
+
+    @Test
+    public void testGenerateUrlForDevAnalysis() {
+    }
+
+    @Test
+    public void testDownload() {
+    }
+}

+ 0 - 0
path


+ 0 - 0
which