|
@@ -8,6 +8,7 @@ import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
|
|
import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
|
|
import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
|
|
import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
|
|
import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
|
|
import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
|
|
import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
|
|
|
|
+import cn.com.qmth.examcloud.exchange.helper.XmlPropertyHelper;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.ExamOuterService;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.ExamOuterService;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetExamReq;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetExamReq;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.request.OuterSaveExamReq;
|
|
import cn.com.qmth.examcloud.exchange.outer.api.request.OuterSaveExamReq;
|
|
@@ -16,6 +17,7 @@ import cn.com.qmth.examcloud.exchange.outer.api.response.OuterSaveExamResp;
|
|
import cn.com.qmth.examcloud.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.web.support.StatusResponse;
|
|
import cn.com.qmth.examcloud.web.support.StatusResponse;
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -84,7 +86,13 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
|
|
saveExamReq.setEnableExamStage(req.getEnableExamStage());
|
|
saveExamReq.setEnableExamStage(req.getEnableExamStage());
|
|
saveExamReq.setCallType(req.getCallType());
|
|
saveExamReq.setCallType(req.getCallType());
|
|
saveExamReq.setEnableTimingEnd(req.getEnableTimingEnd());
|
|
saveExamReq.setEnableTimingEnd(req.getEnableTimingEnd());
|
|
- saveExamReq.setIpWhitelist(req.getIpWhitelist());
|
|
|
|
|
|
+
|
|
|
|
+ if(CollectionUtils.isNotEmpty(req.getIpWhitelist())){
|
|
|
|
+ saveExamReq.setIpWhitelist(req.getIpWhitelist());
|
|
|
|
+ }else {
|
|
|
|
+ saveExamReq.setIpWhitelist(XmlPropertyHelper.getIpWhiteListFormXml(rootOrgId));
|
|
|
|
+ }
|
|
|
|
+
|
|
if(req.getLateMinuteLimit()!=null&&req.getLateMinuteLimit()<=0) {
|
|
if(req.getLateMinuteLimit()!=null&&req.getLateMinuteLimit()<=0) {
|
|
throw new StatusException("lateMinuteLimit 必须大于零");
|
|
throw new StatusException("lateMinuteLimit 必须大于零");
|
|
}
|
|
}
|