multiple third party

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/OwningPartyConstants.java

@@ -0,0 +1,19 @@
+package cn.iselab.mooctest.site.common.constant;
+
+/**
+ * Created by ROGK on 2017/8/18.
+ */
+public class OwningPartyConstants {
+
+    public final static Integer MOOCTEST=0;
+
+    public final static Integer TEST=1;
+
+    public final static Integer ANHENG=2;
+
+    public final static Integer ZEZHONG=3;
+
+    public final static Integer KAIYUN=4;
+
+    public final static String THIRDEMAIL="anheng@mooctest.net";
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/ThirdPartConstants.java

@@ -1,15 +0,0 @@
-package cn.iselab.mooctest.site.common.constant;
-
-/**
- * Created by ROGK on 2017/8/18.
- */
-public class ThirdPartConstants {
-
-    public final static int TEST=1;
-
-    public final static int ANHENG=2;
-
-    public final static int ZEZHONG=3;
-
-    public final static String THIRDEMAIL="anheng@mooctest.net";
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/ExamGroupUser.java

@@ -49,7 +49,7 @@ public class ExamGroupUser{
     private Integer status;
 
     @Column(name = "is_third_party")
-    private Boolean isThirdParty;
+    private Integer owningParty ;
 
     @Column(name = "participant_id")
     private Long participantId;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/Task.java

@@ -53,7 +53,7 @@ public class Task {
     private Integer status;
 
     @Column(name = "is_third_party")
-    private Boolean isThirdParty;
+    private Integer owningParty;
 
     public Long getOwnerId() {
         return ownerId;
@@ -139,12 +139,12 @@ public class Task {
         this.status = status;
     }
 
-    public Boolean getIsThirdParty() {
-        return isThirdParty;
-    }
 
-    public void setIsThirdParty(Boolean thirdParty) {
-        isThirdParty = thirdParty;
+    public Integer getOwningParty() {
+        return owningParty;
     }
 
+    public void setOwningParty(Integer owningParty) {
+        this.owningParty = owningParty;
+    }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/ExamServiceImpl2.java

@@ -1,7 +1,7 @@
 package cn.iselab.mooctest.site.rpc.Oauth2.impl;
 
 import cn.iselab.mooctest.site.common.constant.Constants;
-import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
+import cn.iselab.mooctest.site.common.constant.OwningPartyConstants;
 import cn.iselab.mooctest.site.dao.Exam2CaseDao;
 import cn.iselab.mooctest.site.dao.OpenId2UserIdDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
@@ -181,7 +181,7 @@ public class ExamServiceImpl2 implements ExamService {
     private Paper savePaperAndPaper2Case(String paperName, HashMap<Long, String> caseNameMap) {
         Paper paper = new Paper();
         paper.setName(paperName+"试卷");
-        User thirdUser = userDao.findByEmail(ThirdPartConstants.THIRDEMAIL);
+        User thirdUser = userDao.findByEmail(OwningPartyConstants.THIRDEMAIL);
         if(thirdUser != null) {
             paper.setOwnerId(new Long(thirdUser.getId()));
         }else {

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/PaperServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
+import cn.iselab.mooctest.site.common.constant.OwningPartyConstants;
 import cn.iselab.mooctest.site.dao.Exam2PaperDao;
 import cn.iselab.mooctest.site.dao.PaperDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
@@ -170,7 +170,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
     }
 
     private Specification<Paper> getWhereClause(Long ownerId, String keyword) {
-        User thirdUser = userDao.findByEmail(ThirdPartConstants.THIRDEMAIL);
+        User thirdUser = userDao.findByEmail(OwningPartyConstants.THIRDEMAIL);
         return new Specification<Paper>() {
             @Override
             public Predicate toPredicate(Root<Paper> a, CriteriaQuery<?> q, CriteriaBuilder cb) {

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/ExamVO.java

@@ -24,7 +24,7 @@ public class ExamVO {
     private Long paperId;
     private boolean hasEntered;
     private Integer participantCount;
-    private Boolean isThirdParty;
+    private Integer owningParty;
 
     public Long getId() {
         return id;
@@ -148,12 +148,12 @@ public class ExamVO {
         this.participantCount = participantCount;
     }
 
-    public Boolean getIsThirdParty() {
-        return isThirdParty;
-    }
 
-    public void setIsThirdParty(Boolean thirdParty) {
-        isThirdParty = thirdParty;
+    public Integer getOwningParty() {
+        return owningParty;
     }
 
+    public void setOwningParty(Integer owningParty) {
+        this.owningParty = owningParty;
+    }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/ExamVOWrapper.java

@@ -54,7 +54,7 @@ public class ExamVOWrapper extends BaseWrapper<ExamVO, Task> {
         vo.setInfo(task.getInformation());
         vo.setType(task.getType());
         vo.setStatus(task.getStatus());
-        vo.setIsThirdParty(task.getIsThirdParty());
+        vo.setOwningParty(task.getOwningParty());
         return vo;
     }
 
@@ -138,7 +138,7 @@ public class ExamVOWrapper extends BaseWrapper<ExamVO, Task> {
         task.setEndTime(endTime);
         task.setType(vo.getType());
         task.setStatus(vo.getStatus());
-        task.setIsThirdParty(vo.getIsThirdParty());
+        task.setOwningParty(vo.getOwningParty());
 
         return task;
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

@@ -2,7 +2,7 @@ package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.TargetTypeConstants;
-import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
+import cn.iselab.mooctest.site.common.constant.OwningPartyConstants;
 import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.models.fromKibug.Application;
@@ -301,7 +301,7 @@ public class CaseLogicImpl implements CaseLogic {
             }
             if (caseExtendsVO.getAnswerWay() == AnswerWayConstants.THIRD_PARTY) {
                 String openId = openId2UserIdService.findOpenIdByUserId(userId);
-                caseExtendsVO.setEntrance("http://api.mooctest.net/oauth/thirdPart?openId=" + openId + "&taskId=" + examId + "&thirdPartId=" + ThirdPartConstants.ZEZHONG + "&caseId=" + caseid);
+                caseExtendsVO.setEntrance("http://api.mooctest.net/oauth/thirdPart?openId=" + openId + "&taskId=" + examId + "&thirdPartId=" + OwningPartyConstants.ZEZHONG + "&caseId=" + caseid);
                 Report report = reportService.getReport(examId, caseid, userId);
                 if (report != null)
                     caseExtendsVO.setReportId(report.getId());