just format code (no change)

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/AudioTimeConfigController.java

@@ -1,26 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
+import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
-import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author chenken

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/CourseController.java

@@ -38,6 +38,18 @@ import io.swagger.annotations.ApiOperation;
  * @return 根据课程编号获取课程信息
  * @param courseNo
  * @return 查询所有课程
+ * @return 获取全部课程
+ * @return 更新课程
+ * @param course
+ * @return 新增课程
+ * @param course
+ * @return 删除课程
+ * @param coruse_id
+ * @return 根据课程名称或者课程编号获取课程信息
+ * @param keyword
+ * @return 根据课程编号获取课程信息
+ * @param courseNo
+ * @return 查询所有课程
  * @return
  *//*
 

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/CoursePropertyController.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
+import cn.com.qmth.examcloud.core.questions.service.CoursePropertyService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -14,19 +14,11 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
-import cn.com.qmth.examcloud.core.questions.service.CoursePropertyService;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author weiwenhai

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExamFileController.java

@@ -1,9 +1,8 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
+import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -12,8 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
-import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExportPaperController.java

@@ -5,7 +5,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
 import cn.com.qmth.examcloud.core.questions.service.ExportPaperService;
 import cn.com.qmth.examcloud.core.questions.service.export.SydxExportPaperService;
 import io.swagger.annotations.ApiOperation;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExportStructureController.java

@@ -1,25 +1,18 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.service.ExportStructureService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.service.ExportStructureService;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/GenPaperController.java

@@ -1,8 +1,13 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.base.enums.RandomGenPaperPolicy;
+import cn.com.qmth.examcloud.core.questions.service.PaperService;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.GenPaperDto;
+import cn.com.qmth.examcloud.core.questions.service.impl.GenPaperService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -11,14 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.GenPaperDto;
-import cn.com.qmth.examcloud.core.questions.service.impl.GenPaperService;
-import cn.com.qmth.examcloud.core.questions.service.PaperService;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-import cn.com.qmth.examcloud.core.questions.base.enums.RandomGenPaperPolicy;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import io.swagger.annotations.ApiOperation;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by weiwenhai on 16/12/28.

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ImportPaperController.java

@@ -1,17 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
-import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.exception.PaperException;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.service.ClonePaperService;
 import cn.com.qmth.examcloud.core.questions.service.ImportPaperService;
 import cn.com.qmth.examcloud.core.questions.service.PaperService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperDetailController.java

@@ -1,28 +1,20 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.service.PaperDetailService;
 import cn.com.qmth.examcloud.core.questions.service.PaperService;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * Created by songyue on 16/12/28.

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperStructController.java

@@ -1,26 +1,24 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.PaperStructRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
+import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStructSearchInfo;
+import cn.com.qmth.examcloud.core.questions.service.PaperStructService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.QuesNameDto;
-
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import cn.com.qmth.examcloud.core.questions.dao.PaperStructRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStructSearchInfo;
-import cn.com.qmth.examcloud.core.questions.service.PaperStructService;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Created by songyue on 16/12/28.

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PropertyController.java

@@ -1,25 +1,18 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
+import cn.com.qmth.examcloud.core.questions.service.PropertyService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
-import cn.com.qmth.examcloud.core.questions.service.PropertyService;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/SettingController.java

@@ -1,12 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
 
-import com.google.gson.Gson;
-
 import cn.com.qmth.examcloud.core.questions.dao.SettingRepo;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.SettingDto;
+import com.google.gson.Gson;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultPaperController.java

@@ -1,8 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.api.controller;
 
 
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.service.PaperProviderService;
+import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -12,15 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
-import cn.com.qmth.examcloud.core.questions.service.PaperProviderService;
-import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
-
 /**
  * @author weiwenhai
  * @date 2018.10.8

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultQuesionController.java

@@ -1,24 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.api.controller;
 
-import java.util.List;
-import java.util.Set;
-
-import io.swagger.annotations.ApiOperation;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
@@ -26,6 +9,17 @@ import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
 import cn.com.qmth.examcloud.core.questions.service.ExtractConfigProviderService;
 import cn.com.qmth.examcloud.core.questions.service.QuestionProviderService;
 import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author weiwenhai

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/provider/HandleSyncCloudServiceProvider.java

@@ -1,35 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.api.provider;
 
-import java.util.List;
-
-import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
-import io.swagger.annotations.ApiOperation;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
-import cn.com.qmth.examcloud.global.api.request.SyncCourseReq;
-import cn.com.qmth.examcloud.global.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.global.api.request.SyncExamStudentReq;
-import cn.com.qmth.examcloud.global.api.request.SyncOrgReq;
-import cn.com.qmth.examcloud.global.api.request.SyncSpecialtyReq;
-import cn.com.qmth.examcloud.global.api.request.SyncStudentReq;
-import cn.com.qmth.examcloud.global.api.request.SyncUserReq;
-import cn.com.qmth.examcloud.global.api.response.SyncCourseResp;
-import cn.com.qmth.examcloud.global.api.response.SyncExamResp;
-import cn.com.qmth.examcloud.global.api.response.SyncExamStudentResp;
-import cn.com.qmth.examcloud.global.api.response.SyncOrgResp;
-import cn.com.qmth.examcloud.global.api.response.SyncSpecialtyResp;
-import cn.com.qmth.examcloud.global.api.response.SyncStudentResp;
-import cn.com.qmth.examcloud.global.api.response.SyncUserResp;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.dao.ExtractConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
@@ -38,10 +9,23 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-
+import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
+import cn.com.qmth.examcloud.global.api.request.*;
+import cn.com.qmth.examcloud.global.api.response.*;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/provider/PaperCloudServiceProvider.java

@@ -1,8 +1,13 @@
 package cn.com.qmth.examcloud.core.questions.api.provider;
 
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.core.questions.api.PaperCloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.service.PaperProviderService;
 import io.swagger.annotations.ApiOperation;
-
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,14 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.questions.api.PaperCloudService;
-import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
-import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.core.questions.service.PaperProviderService;
-
 /**
  * @author weiwenhai
  * @date 20180.10.10

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/provider/QuestionCloudServiceProvider.java

@@ -1,15 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.api.provider;
 
-import java.util.List;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.questions.api.QuestionCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionListReq;
@@ -20,6 +10,16 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuesionIdResp
 import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp;
 import cn.com.qmth.examcloud.core.questions.service.QuestionProviderService;
 import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/initQuesHash/InitQuesHashController.java

@@ -1,7 +1,8 @@
 package cn.com.qmth.examcloud.service.core.api.initQuesHash;
 
+import cn.com.qmth.examcloud.core.questions.service.initQuesHash.InitQuesHashService;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,9 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.service.initQuesHash.InitQuesHashService;
-
 /**
  * @author weiwenhai
  * @date 2018.7.17

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/BeanCopierUtil.java

@@ -4,7 +4,10 @@ import com.esotericsoftware.reflectasm.ConstructorAccess;
 import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static java.lang.String.format;

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/enums/PaperStructType.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.base.enums;
 
-import org.omg.CORBA.PRIVATE_MEMBER;
-
 /**
  * @author weiwenhai
  * @describle 试卷结构类型

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ColumnSetting.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.base.excel;
 
-import cn.com.qmth.examcloud.core.questions.base.excel.ColumnSetting;
-
 public class ColumnSetting implements Comparable<ColumnSetting> {
 
     private String header;

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExcelReaderHandle.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.base.excel;
 
-import cn.com.qmth.examcloud.core.questions.base.excel.ExcelError;
-
 public interface ExcelReaderHandle {
 
     ExcelError handle(Object dto);

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExcelUtils.java

@@ -5,9 +5,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.questions.base.excel.ColumnSetting;
-import cn.com.qmth.examcloud.core.questions.base.excel.ExcelProperty;
-
 /**
  * Created by zhengmin on 2016/8/17.
  */

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/question/PaperDetailUnitDto.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.base.question;
 
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+
 import java.io.Serializable;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 /**
  * Created by songyue on 17/3/15.
  */

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/question/QuestionDto.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.base.question;
 
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 public class QuestionDto implements Serializable {
 
     private static final long serialVersionUID = 1866951329075565891L;

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/question/SubQuestionDto.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.base.question;
 
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 public class SubQuestionDto implements Serializable {
 
     private static final long serialVersionUID = -7612222458755752097L;

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/AudioTimeConfigRepo.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/CoursePropertyRepo.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExamFileRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
-
 /**
  * @author chenken
  * @date 2017年7月13日 下午4:54:10

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExamPaperRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-
 public interface ExamPaperRepo extends MongoRepository<ExamPaper, Long>, QueryByExampleExecutor<ExamPaper> {
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExportServiceManageRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
-
 public interface ExportServiceManageRepo extends MongoRepository<ExportServiceManage, Long>, QueryByExampleExecutor<ExportServiceManage> {
     ExportServiceManage findByOrgName(String orgName);
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExportStructureRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-
 /**
  * @author chenken
  * @date 2017年7月12日 下午4:34:35

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExtractConfigRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-
 import java.util.List;
 
 public interface ExtractConfigRepo extends MongoRepository<ExtractConfig, String>, QueryByExampleExecutor<ExtractConfig> {

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailRepo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 
 import java.util.List;
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailUnitNativeRepo.java

@@ -1,17 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
-import com.mongodb.DBRef;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-
+import com.mongodb.DBRef;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
 import org.bson.Document;
 import org.bson.types.ObjectId;
 import org.slf4j.Logger;

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailUnitRepo.java

@@ -1,15 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
-
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import java.util.List;
 import java.util.Optional;

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperRepo.java

@@ -1,17 +1,16 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public interface PaperRepo extends MongoRepository<Paper, String>, QueryByExampleExecutor<Paper> {
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperStructRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
-
 public interface PaperStructRepo extends MongoRepository<PaperStruct, String>, QueryByExampleExecutor<PaperStruct> {
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PropertyRepo.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuesBakRepo.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionBak;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionBak;
-
 public interface QuesBakRepo extends MongoRepository<QuestionBak, String>, QueryByExampleExecutor<QuestionBak> {
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuesRepo.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.questions.dao;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuestionAudioRepo.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/SettingRepo.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Setting;
-
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionType.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+
 import java.io.Serializable;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 /**
  * 试题类型(结构类型包装类) Created by songyue on 16/12/28.
  */

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestPaper.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 
+import java.util.List;
+
 /**
  * @author chenken
  * @date 2017年7月25日 上午9:39:11

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestPaperDetail.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 
+import java.util.List;
+
 /**
  * @author chenken
  * @date 2017年7月25日 上午9:43:00

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestQuestion.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 
-import java.util.List;
-import java.util.Map;
-
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author chenken
  * @date 2017年7月25日 上午9:51:37

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/dto/PropertyDto.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.dto;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
 
+import java.util.List;
+
 /**
  * @author weiwenhai
  * @describle 属性Dto

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/AudioTimeConfigService.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-import java.util.Map;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author chenken
  * @date 2017年8月10日 下午3:16:02

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/CoursePropertyService.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
-import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExamFileService.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
+
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExportStructureService.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExtractConfigService.java

@@ -1,19 +1,17 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-import java.util.Map;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
-
-import org.springframework.data.domain.Page;
-
 import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.service.bean.CouresInfo;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PaperDetailService.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
+
+import java.util.List;
 
 public interface PaperDetailService {
     /**

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PaperDetailUnitService.java

@@ -1,14 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
+
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PaperProviderService.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.Map;
-import java.util.Set;
-
 import cn.com.qmth.examcloud.core.questions.api.bean.PaperK12Bean;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @author weiwenhai
  * @date 2018.10.8

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/PropertyService.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
+
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/QuesService.java

@@ -1,16 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-import java.util.Set;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.data.domain.*;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionSearchCondition;
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * Created by songyue on 16/12/28.

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/QuestionAudioService.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 
+import java.util.List;
+
 /**
  * @author chenken
  * @date 2017年8月1日 上午11:26:40

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/QuestionProviderService.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
+import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
+import org.springframework.data.domain.Page;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.data.domain.Page;
-
-import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
-
 /**
  * @author weiwenhai
  * @date 2018.9.10

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/PaperDetailUnitDtoAssembler.java

@@ -2,10 +2,8 @@ package cn.com.qmth.examcloud.core.questions.service.bean;
 
 import cn.com.qmth.examcloud.core.questions.base.question.PaperDetailUnitDto;
 import cn.com.qmth.examcloud.core.questions.base.question.QuesOptionDto;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
-
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/PropertyAssembler.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service.bean;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import org.springframework.stereotype.Component;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import java.util.ArrayList;
+import java.util.List;
 
 @Component
 public class PropertyAssembler {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/Context.java

@@ -1,14 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
 import cn.com.qmth.examcloud.core.questions.service.bean.valve.Valve;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+
+import java.util.*;
 
 public abstract class Context implements Valve {
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/DetailContext.java

@@ -1,18 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailStruct;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnitStruct;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+
+import java.util.*;
 
 public class DetailContext extends Context {
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/PaperContext.java

@@ -1,19 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailStruct;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.*;
+import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
+
+import java.util.*;
 
 public class PaperContext extends Context {
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/UnitContext.java

@@ -1,13 +1,13 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
-import java.util.List;
-import java.util.UUID;
-
-import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnitStruct;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
+
+import java.util.List;
+import java.util.UUID;
 
 public class UnitContext extends Context {
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/ExportPaperInfoModel.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
+import cn.com.qmth.examcloud.core.questions.base.enums.ExportWay;
+
 import java.io.Serializable;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.questions.base.enums.ExportWay;
-
 /**
  * @author chenken
  * @date 2017年7月15日 下午1:52:52

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/GenPaperDto.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.core.questions.base.enums.RandomGenPaperPolicy;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
-import cn.com.qmth.examcloud.core.questions.base.enums.RandomGenPaperPolicy;
 
-import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by songyue on 17/3/24.

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/ObjectiveQuestionStructure.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.base.excel.ExcelProperty;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/PageExamCourse.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
+
 import java.io.Serializable;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
-
 /**
  * @author chenken
  * @date 2017年7月26日 上午11:32:38

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/PaperDetailExp.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.List;
 
 /**
  * 试卷大题导出dto

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/PaperDetailUnitExp.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
-import java.io.Serializable;
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * 试卷小题导出dto Created by songyue on 17/3/15.

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/PaperExp.java

@@ -1,11 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 试卷导出dto

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/PaperQuestionStructureInfo.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
 /**
  * @author weiwenhai
  * @date 2018.4.19

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/dto/SubjectiveQuestionStructure.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 
-import java.io.Serializable;
-
 import cn.com.qmth.examcloud.core.questions.base.excel.ExcelProperty;
 
+import java.io.Serializable;
+
 /**
  * @author chenken
  * @date 2017年7月18日 上午10:51:54

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/valve/Valve.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.valve;
 
-import java.util.Map;
-
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 
+import java.util.Map;
+
 public interface Valve {
 
     public boolean check(Question question);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/converter/PrintExamPaperService.java

@@ -25,7 +25,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.PaperDetailService;
 import cn.com.qmth.examcloud.core.questions.service.PaperService;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjhkExportPaperService.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -16,6 +10,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjjtExportPaperService.java

@@ -1,10 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -15,6 +10,10 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 @Service("bjjtExportPaperService")
 public class BjjtExportPaperService extends ExportPaperAbstractService {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjsfExportPaperService.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -16,6 +10,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BuildComputerTestJsonService.java

@@ -1,5 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.*;
+import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.*;
+import cn.com.qmth.examcloud.core.questions.service.PaperDetailService;
+import cn.com.qmth.examcloud.core.questions.service.PaperService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -7,29 +17,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.Block;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestOption;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestPaperDetail;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestQuestion;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.Section;
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.Sections;
-import cn.com.qmth.examcloud.core.questions.service.PaperDetailService;
-import cn.com.qmth.examcloud.core.questions.service.PaperService;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-
 /**
  * @author chenken
  * @date 2017年10月24日 下午2:29:09

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DbsfExportPaperService.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -16,6 +10,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/FjsfExportPaperService.java

@@ -1,14 +1,8 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
@@ -18,6 +12,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HnsfExportPaperService.java

@@ -1,10 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -15,6 +10,10 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 @Service("hnsfExportPaperService")
 public class HnsfExportPaperService extends ExportPaperAbstractService {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/NkdxExportPaperService.java

@@ -1,14 +1,8 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
@@ -18,6 +12,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/RjgcExportPaperService.java

@@ -1,20 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SddxExportPaperService.java

@@ -1,19 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SxsfExportPaperService.java

@@ -1,23 +1,22 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.ImageUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.apache.commons.lang3.StringUtils;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/TjdxExportPaperService.java

@@ -11,7 +11,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.stereotype.Service;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/XnjdExportPaperService.java

@@ -1,12 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.ImageUtils;
@@ -18,6 +11,12 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.apache.commons.lang3.StringUtils;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author WEIWENHAI

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/YkdxExportPaperService.java

@@ -1,20 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 @Service("ykdxExportPaperService")
 public class YkdxExportPaperService extends ExportPaperAbstractService {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddbExportPaperService.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -16,6 +10,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddwExportPaperService.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
@@ -16,6 +10,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 
 /**

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/xajdExportPaperService.java

@@ -1,20 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
-import java.io.File;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/AudioTimeConfigServiceImpl.java

@@ -1,32 +1,21 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import cn.com.qmth.examcloud.core.questions.base.Model;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.Model;
 import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
+import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;
 import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.QuesService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * @author chenken

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/CoursePropertyServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.criteria.Predicate;
-
+import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 import cn.com.qmth.examcloud.core.questions.base.Model;
+import cn.com.qmth.examcloud.core.questions.dao.CoursePropertyRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
+import cn.com.qmth.examcloud.core.questions.service.CoursePropertyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -13,13 +15,9 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
-import cn.com.qmth.examcloud.core.questions.dao.CoursePropertyRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyDto;
-import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
-import cn.com.qmth.examcloud.core.questions.service.CoursePropertyService;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/CourseService.java

@@ -1,15 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PropertyServiceImpl.java

@@ -1,18 +1,17 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.com.qmth.examcloud.core.questions.base.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.service.bean.PropertyAssembler;
+import cn.com.qmth.examcloud.core.questions.base.Model;
 import cn.com.qmth.examcloud.core.questions.dao.PropertyRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import cn.com.qmth.examcloud.core.questions.service.PropertyService;
+import cn.com.qmth.examcloud.core.questions.service.bean.PropertyAssembler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuestionProviderServiceImpl.java

@@ -1,13 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+import cn.com.qmth.examcloud.core.questions.service.QuestionProviderService;
+import cn.com.qmth.examcloud.question.commons.core.question.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -18,19 +19,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.core.questions.service.QuestionProviderService;
-import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
-import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestionOption;
-import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestionStructure;
-import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestionUnit;
-import cn.com.qmth.examcloud.question.commons.core.question.QuestionType;
+import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * @author weiwenhai

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/SettingService.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.com.qmth.examcloud.core.questions.base.enums.Switch;
 import cn.com.qmth.examcloud.core.questions.dao.SettingRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Setting;
-import cn.com.qmth.examcloud.core.questions.base.enums.Switch;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * Created by songyue on 16/12/28.