master版本提交，推送

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

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
 import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;

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

@@ -14,11 +14,7 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
-
 import com.google.gson.Gson;
 import cn.com.qmth.examcloud.core.questions.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
@@ -49,7 +45,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "获取全部课程", notes = "获取全部课程")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/course/{curPage}/{pageSize}")
     public ResponseEntity getAllCourse(@ModelAttribute Course searchCondition, @PathVariable int curPage,
             @PathVariable int pageSize) {
@@ -63,7 +58,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "更新课程", notes = "更新课程")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/course")
     public ResponseEntity updateCourse(@ModelAttribute Course course) {
         return new ResponseEntity(courseRepo.save(course), HttpStatus.OK);
@@ -76,7 +70,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "新增课程", notes = "新增课程")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/course")
     public ResponseEntity addCourse(@ModelAttribute Course course) {
         return new ResponseEntity(courseRepo.save(course), HttpStatus.OK);
@@ -89,7 +82,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "删除课程", notes = "删除课程")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/course/{coruse_id}")
     public ResponseEntity removeCourse(@PathVariable String coruse_id) {
         courseRepo.delete(coruse_id);
@@ -103,7 +95,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "根据课程名称或者课程编号获取课程信息", notes = "根据课程名称或者课程编号获取课程信息")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/course")
     public ResponseEntity getCourseByKeyword(@RequestParam String keyword) {
         return new ResponseEntity(courseService.findCoursesByKeyword(keyword), HttpStatus.OK);
@@ -116,7 +107,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = "根据课程编号获取课程信息", notes = "根据课程编号获取课程信息")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/course/{courseNo}")
     public ResponseEntity getCourseByNo(@PathVariable String courseNo) {
         return new ResponseEntity(courseRepo.findFirstByCode(courseNo), HttpStatus.OK);
@@ -128,7 +118,6 @@ public class CourseController {
      * @return
      */
     @ApiOperation(value = " 查询所有课程", notes = "查询所有课程")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/course/allCourses")
     public ResponseEntity getAllCourses() {
         List<Course> courses = courseRepo.findAll();

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

@@ -1,15 +1,14 @@
 package cn.com.qmth.examcloud.service.core.api;
 
+import io.swagger.annotations.ApiOperation;
+
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
@@ -22,13 +21,11 @@ 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.RequestParam;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-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.dao.entity.dto.CoursePropertyDto;
 import cn.com.qmth.examcloud.core.questions.service.CoursePropertyService;
 
 /**

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

@@ -1,11 +1,11 @@
 package cn.com.qmth.examcloud.service.core.api;
 
+import io.swagger.annotations.ApiOperation;
+
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.service.ExportStructureService;

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

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.service.core.api;
 
 
-import cn.com.qmth.examcloud.common.dto.question.PaperDto;
-import cn.com.qmth.examcloud.common.dto.question.QuestionDto;
-import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportWay;
@@ -12,6 +12,7 @@ import cn.com.qmth.examcloud.core.questions.service.ExtractConfigFileService;
 import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,6 +37,7 @@ import java.util.Map;
  * @date 2017年4月14日 下午6:05:37
  * @company QMTH
  * @description 调卷规则控制器
+ * @code 050
  */
 @Controller
 @RequestMapping("${api_cqb}/")
@@ -59,7 +62,8 @@ public class ExtractConfigController extends ControllerSupport {
             return new ResponseEntity<Page<ExtractConfig>>(extractConfigPageList, HttpStatus.OK);
         } catch (Exception e) {
             e.printStackTrace();
-            return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new StatusException("Q-050065",e.getMessage());
+//            return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -92,7 +96,8 @@ public class ExtractConfigController extends ControllerSupport {
             return new ResponseEntity<Object>(HttpStatus.OK);
         } catch (Exception e) {
             e.printStackTrace();
-            return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new StatusException("Q-050099",e.getMessage());
+            //return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -192,7 +197,8 @@ public class ExtractConfigController extends ControllerSupport {
             return new ResponseEntity<Object>(HttpStatus.OK);
         } catch (Exception e) {
             e.printStackTrace();
-            return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.OK);
+            throw new StatusException("Q-050200",e.getMessage());
+            //return new ResponseEntity<Object>(new ErrorMsg(e.getMessage()), HttpStatus.OK);
         }
     }
 

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

@@ -18,11 +18,8 @@ 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.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -42,7 +39,6 @@ public class GenPaperController extends ControllerSupport {
     PaperService paperService;
 
     @ApiOperation(value = "简易随机组卷", notes = "简易随机组卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping("/genPaper/simple")
     public ResponseEntity<Object> genPaperSimple(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
     	User user = getAccessUser();
@@ -101,7 +97,6 @@ public class GenPaperController extends ControllerSupport {
     }
 
     @ApiOperation(value = "精细组卷", notes = "精细组卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping("/genPaper/normal")
     public ResponseEntity<Object> genPaperNormal(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
     	User user = getAccessUser();
@@ -151,7 +146,6 @@ public class GenPaperController extends ControllerSupport {
     }
 
     @ApiOperation(value = "蓝图组卷", notes = "蓝图组卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping("/genPaper/blue")
     public ResponseEntity<Object> genPaperBlue(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
     	User user = getAccessUser();

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

@@ -1,10 +1,8 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.exception.PaperException;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
@@ -13,6 +11,7 @@ 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 io.swagger.annotations.ApiOperation;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,12 +21,17 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Created by songyue on 16/12/28.
+ * @author weiwenhai
+ * @date 2017年4月14日 下午6:05:37
+ * @company QMTH
+ * @description 导入试卷控制器
+ * @code 090
  */
 @RestController
 @RequestMapping("${api_cqb}/")
@@ -50,7 +54,6 @@ public class ImportPaperController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "导入试卷", notes = "导入试卷")
-    @Uac(roles = {RoleMeta.QUESTION_ADMIN, RoleMeta.SUPER_ADMIN}, policy = UacPolicy.IN)
     @PostMapping(value = "/importPaper")
     public ResponseEntity importPaper(HttpServletRequest request,
                                       @ModelAttribute Paper paper,
@@ -66,7 +69,8 @@ public class ImportPaperController extends ControllerSupport {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("导入异常:" + e.getMessage());
-            return new ResponseEntity(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new StatusException("Q-090072",e.getMessage());
+            //return new ResponseEntity(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             log.info("导入结束");
         }
@@ -80,7 +84,6 @@ public class ImportPaperController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "保存导入类型空白试卷", notes = "保存导入类型空白试卷")
-    @Uac(roles = {RoleMeta.QUESTION_ADMIN, RoleMeta.SUPER_ADMIN}, policy = UacPolicy.IN)
     @PostMapping(value = "/importPaper/saveBlankPaper/{courseNo}/{courseName}/{paperName}")
     public ResponseEntity saveBlankPaper(HttpServletRequest request,
                                          @PathVariable String courseNo,
@@ -102,7 +105,6 @@ public class ImportPaperController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "克隆试卷", notes = "克隆试卷")
-    @Uac(roles = {RoleMeta.QUESTION_ADMIN, RoleMeta.SUPER_ADMIN}, policy = UacPolicy.IN)
     @PostMapping(value = "/clonePaper/{paperId}/{paperName}/{courseNo}")
     public ResponseEntity clonePaper(HttpServletRequest request, @PathVariable String paperId,
                                      @PathVariable String paperName, @PathVariable String courseNo) {

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

@@ -47,18 +47,16 @@ import cn.com.qmth.examcloud.core.questions.service.QuesService;
 import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
 import cn.com.qmth.examcloud.core.questions.base.StringSimilarityUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import io.swagger.annotations.ApiOperation;
 
 /**
  * Created by songyue on 16/12/28.
+ * @code 160
  */
 @RestController
 @RequestMapping("${api_cqb}/")
@@ -86,7 +84,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "根据Id获取试卷", notes = "根据Id获取试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/{paperId}")
     public ResponseEntity getPaperById(@PathVariable String paperId) {
         return new ResponseEntity(paperService.getPaperDto(paperId), HttpStatus.OK);
@@ -99,7 +96,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "保存试卷", notes = "保存试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paper")
     public ResponseEntity savePaperById(HttpServletRequest request, @RequestBody PaperExp paper) {
         //AccessUser user = (AccessUser) request.getAttribute("accessUser");
@@ -122,7 +118,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询所有导入试卷", notes = "查询所有导入试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/importPaper/{curPage}/{pageSize}")
     public ResponseEntity getImportPapers(HttpServletRequest request,
                                           @ModelAttribute PaperSearchInfo paperSearchInfo,
@@ -135,7 +130,6 @@ public class PaperController extends ControllerSupport{
     }
 
     @ApiOperation(value = "查询所有待审核和审核不通过的导入试卷", notes = "查询所有待审核和审核不通过的导入试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/importPaperNotSuccess/{curPage}/{pageSize}")
     public ResponseEntity getImportPapersNotSuccess(HttpServletRequest request,
             @ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable int curPage, @PathVariable int pageSize) {
@@ -147,7 +141,6 @@ public class PaperController extends ControllerSupport{
     }
 
     @ApiOperation(value = "根据条件查询导入试卷", notes = "根据条件查询导入试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/getImportPaper")
     public ResponseEntity<List<Paper>> getImportPapersBySearch(HttpServletRequest request,
                                                                @ModelAttribute PaperSearchInfo paperSearchInfo) {
@@ -158,7 +151,6 @@ public class PaperController extends ControllerSupport{
     }
 
     @ApiOperation(value = "根据条件查询已组试卷", notes = "根据条件查询已组试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/getGenPaper")
     public ResponseEntity<List<Paper>> getGenPapersBySearch(HttpServletRequest request,
                                                             @ModelAttribute PaperSearchInfo paperSearchInfo) {
@@ -177,7 +169,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询所有已组试卷", notes = "查询所有已组试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/genPaper/{curPage}/{pageSize}")
     public ResponseEntity getGenPapers(HttpServletRequest request, @ModelAttribute PaperSearchInfo paperSearchInfo,
             @PathVariable int curPage, @PathVariable int pageSize) {
@@ -197,7 +188,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/genPaper/{ids}/{curPage}/{pageSize}")
     public ResponseEntity<Object> getGenPapersNotInIds(HttpServletRequest request, @ModelAttribute PaperSearchInfo paperSearchInfo, 
     		@PathVariable String[] ids, @PathVariable int curPage, @PathVariable int pageSize) {
@@ -219,7 +209,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "删除试卷", notes = "删除试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paper/{paperIds}")
     public ResponseEntity delPaper(@PathVariable String paperIds) {
         List<String> paperList = Stream.of(paperIds.split(",")).collect(Collectors.toList());
@@ -239,7 +228,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "批量通过试卷", notes = "批量通过试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paper/pass")
     public ResponseEntity passPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.passPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
@@ -253,7 +241,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "批量不通过试卷", notes = "批量不通过试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paper/noPass")
     public ResponseEntity noPassPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.noPassPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
@@ -267,7 +254,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "批量待审核试卷", notes = "批量待审核试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paper/draft")
     public ResponseEntity initPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.backPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
@@ -283,7 +269,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "获取卷库考试试卷", notes = "获取卷库考试试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/list/{examId}/{courseCode}/{groupCode}")
     public List<Paper> listPaperById(@PathVariable String examId, @PathVariable String courseCode,
             @PathVariable String groupCode) {
@@ -300,7 +285,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "新增考试试卷", notes = "新增考试试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paper/join/{examId}/{courseCode}/{groupCode}/{paperId}")
     public ResponseEntity joinExamPaper(@PathVariable String examId, @PathVariable String courseCode,
             @PathVariable String groupCode, @PathVariable String paperId) {
@@ -318,7 +302,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "删除考试试卷", notes = "删除考试试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paper/release/{examId}/{courseCode}/{groupCode}/{paperId}")
     public ResponseEntity releaseExamPaper(@PathVariable String examId, @PathVariable String courseCode,
             @PathVariable String groupCode, @PathVariable String paperId) {
@@ -335,7 +318,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "获取考试试卷类型集合", notes = "获取考试试卷类型集合")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/groupCode/{examId}/{courseCode}")
     public Set<String> listGroup(@PathVariable String examId, @PathVariable String courseCode) {
         return paperService.listGroupCodes(Long.parseLong(examId), courseCode);
@@ -350,7 +332,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "删除考试试卷类型", notes = "删除考试试卷类型")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paper/groupCode/{examId}/{courseCode}/{groupCode}")
     public ResponseEntity deleteGroup(@PathVariable String examId, @PathVariable String courseCode,
             @PathVariable String groupCode) {
@@ -365,7 +346,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "删除导入试卷中的试题", notes = "删除导入试卷中的试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paper/deleteQuestion/{questionId}")
     public ResponseEntity deleteImportPaperQuestion(HttpServletRequest request, @PathVariable String questionId) {
     	User user = getAccessUser();
@@ -383,7 +363,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "向导入试卷中的新增试题", notes = "向导入试卷中的新增试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paper/addQuestion/{paperId}/{paperDetailId}")
     public ResponseEntity<Object> insertQuestionToPaper(HttpServletRequest request, @PathVariable String paperId,
             @PathVariable String paperDetailId, @RequestBody Question question) {
@@ -395,7 +374,6 @@ public class PaperController extends ControllerSupport{
     }
 
     @ApiOperation(value = "获取试卷的重复试题", notes = "获取试卷的重复试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/{paperId}/reduplicate-questions")
     public ResponseEntity reduplicateQuestions(@PathVariable String paperId) {
 
@@ -472,7 +450,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "获取试题所在的试卷名称", notes = "获取试题所在的试卷名称")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/listNames/{questionId}")
     public ResponseEntity getPaperNamesByQuesId(@PathVariable String questionId) {
         return new ResponseEntity(paperService.getPaperNamesByQuestionId(questionId), HttpStatus.OK);
@@ -485,7 +462,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询用于选题的试题列表", notes = "查询用于选题的试题列表")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paper/listQuestion/{paperId}/{curPage}/{pageSize}")
     public ResponseEntity<Object> listQuestionforSelect(HttpServletRequest request,
                                                 @PathVariable String paperId,
@@ -515,7 +491,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "向导入试卷中的新增试题", notes = "向导入试卷中的新增试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paper/selectQuestions/{paperId}/{paperDetailId}")
     public ResponseEntity selectQuestionsToPaper(HttpServletRequest request, @PathVariable String paperId,
             @PathVariable String paperDetailId, @RequestBody List<Question> questions) {
@@ -536,7 +511,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/importPaper/{ids}/{curPage}/{pageSize}")
     public ResponseEntity getImportPapersNotInIds(HttpServletRequest request,
             @ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable String[] ids, @PathVariable int curPage,
@@ -559,7 +533,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "查询该课程的所有导入试卷", notes = "查询该课程的所有导入试卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/importPaper/course")
     public ResponseEntity getImportPapersByCourseNo(HttpServletRequest request,
             @ModelAttribute PaperSearchInfo paperSearchInfo) {
@@ -579,7 +552,6 @@ public class PaperController extends ControllerSupport{
      * @return
      */
     @ApiOperation(value = "复制导入试卷为组卷", notes = "复制导入试卷为组卷")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/useBasePaper/{paperIds}")
     public ResponseEntity useBasePaper(HttpServletRequest request,@PathVariable String paperIds){
     	User user = getAccessUser();
@@ -590,7 +562,8 @@ public class PaperController extends ControllerSupport{
         		Paper oldpaper = paperRepo.findOne(paperIdArray[i]);
         		boolean result = paperService.checkPaperName(oldpaper.getName(), PaperType.GENERATE,user.getRootOrgId()+"");
         		if(!result){
-        			return new ResponseEntity(new ErrorMsg("考试试卷:"+oldpaper.getName()+"已经存在"),HttpStatus.OK);
+        			throw new StatusException("Q-160565","考试试卷:"+oldpaper.getName()+"已经存在");
+        			//return new ResponseEntity(new ErrorMsg("考试试卷:"+oldpaper.getName()+"已经存在"),HttpStatus.OK);
         		}
         	}
     		paperService.useBasePaper(paperIds, user.getDisplayName());

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

@@ -20,11 +20,8 @@ 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.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -51,7 +48,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取大题对应的小题", notes = "获取大题对应的小题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperDetail/units/{detail_id}")
     public List<PaperDetailUnit> getUnitsByPaperDetailId(String detail_id) {
         return paperDetailService.getUnitsByPaperDetailId(detail_id);
@@ -64,7 +60,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取大题", notes = "获取大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperDetail/{detail_id}")
     public PaperDetail getPaperDetailId(@PathVariable String detail_id) {
         return paperDetailService.findById(detail_id);
@@ -77,7 +72,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "更新试卷中的大题", notes = "更新试卷中的大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/updatePaperDetail/{paperId}")
     public ResponseEntity updatePaperDetail( HttpServletRequest request,
                                              @PathVariable String paperId, 
@@ -96,7 +90,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "新增大题", notes = "新增大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paperDetail")
     public ResponseEntity addPaperDetail(@RequestBody PaperDetail pd) {
         PaperDetail paperDetail = paperDetailRepo.save(pd);
@@ -110,7 +103,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "删除大题", notes = "删除大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paperDetail/{detailId}")
     public ResponseEntity removePaperDetail(@PathVariable String detailId) {
         paperDetailService.deletePaperDetail(detailId);
@@ -124,7 +116,6 @@ public class PaperDetailController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "根据试卷ID得到所有大题", notes = "根据试卷ID得到所有大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperDetail/paper/{paperId}")
     public ResponseEntity getPaperDetailsByPaperId(@PathVariable String paperId) {
         return new ResponseEntity(paperService.findPaperDetailsById(paperId), HttpStatus.OK);

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

@@ -18,11 +18,8 @@ import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.service.PaperDetailUnitService;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -43,7 +40,6 @@ public class PaperDetailUnitController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取小题对应的试题", notes = "获取小题对应的试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperDetailUnit/question/{unit_id}")
     public Question getQuestionByUnitId(String unit_id) {
         return unitService.getQuestionByPaperDetailUnitId(unit_id);
@@ -56,7 +52,6 @@ public class PaperDetailUnitController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取小题", notes = "获取小题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperDetailUnit/{unit_id}")
     public PaperDetailUnit getPaperDetailUnitId(@PathVariable String unit_id) {
         return unitService.findById(unit_id);
@@ -69,7 +64,6 @@ public class PaperDetailUnitController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "更新小题", notes = "更新小题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paperDetailUnit")
     public ResponseEntity updatePaperDetailUnit(HttpServletRequest request, @RequestBody PaperDetailUnitExp pdu) {
         User user = getAccessUser();
@@ -86,7 +80,6 @@ public class PaperDetailUnitController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "新增小题", notes = "新增小题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paperDetailUnit")
     public ResponseEntity addPaperDetailUnit(HttpServletRequest request, @RequestBody PaperDetailUnitExp pdu) {
     	User user = getAccessUser();
@@ -102,7 +95,6 @@ public class PaperDetailUnitController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "删除小题", notes = "删除小题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paperDetailUnit/{unitId}")
     public ResponseEntity removePaperDetailUnit(HttpServletRequest request, @PathVariable String unitId) {
     	User user = getAccessUser();

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

@@ -7,7 +7,7 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.QuesNameDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,11 +20,8 @@ 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.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -47,7 +44,6 @@ public class PaperStructController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取试卷结构带分页", notes = "获取试卷结构带分页")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperStruct/{curPage}/{pageSize}")
     public ResponseEntity getPaperStructs(HttpServletRequest request,
                                           @ModelAttribute PaperStructSearchInfo searchInfo,
@@ -69,7 +65,6 @@ public class PaperStructController extends ControllerSupport {
      */
     @ApiOperation(value = "获取试卷结构不带分页", notes = "获取试卷结构不带分页")
     @GetMapping(value = "/paperStruct")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     public ResponseEntity getPaperStructs(HttpServletRequest request,@ModelAttribute PaperStructSearchInfo searchInfo) {
     	User user = getAccessUser();
     	//AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
@@ -87,7 +82,6 @@ public class PaperStructController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取试卷结构", notes = "获取试卷结构")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperStruct/{id}")
     public ResponseEntity getPaperStructById(@PathVariable String id) {
         return new ResponseEntity(paperStructRepo.findOne(id), HttpStatus.OK);
@@ -100,7 +94,6 @@ public class PaperStructController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "更新试卷结构", notes = "更新试卷结构")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/paperStruct")
     public ResponseEntity updatePaperStruct(HttpServletRequest request, @RequestBody PaperStruct ps) {
     	User user = getAccessUser();
@@ -121,7 +114,6 @@ public class PaperStructController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "新增试卷结构", notes = "新增试卷结构")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/paperStruct")
     public ResponseEntity addPaperStruct(HttpServletRequest request, @RequestBody PaperStruct ps) {
     	User user = getAccessUser();
@@ -142,7 +134,6 @@ public class PaperStructController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "删除试卷结构", notes = "删除试卷结构")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/paperStruct/{ids}")
     public ResponseEntity removePaperStruct(@PathVariable String ids) {
         List<String> paperList = Stream.of(ids.split(",")).collect(Collectors.toList());
@@ -152,12 +143,10 @@ public class PaperStructController extends ControllerSupport {
 
     /**
      * 根据题型获取来源大题
-     *
      * @param
      * @return
      */
     @ApiOperation(value = "获取来源大题", notes = "获取来源大题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/paperStruct/quesNames")
     public ResponseEntity getPaperStructById(HttpServletRequest request,
                                              @RequestParam(required = false) String courseNo,

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

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;

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

@@ -25,11 +25,8 @@ import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 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.service.QuesService;
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -56,7 +53,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "获取试题", notes = "获取试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/question/{id}")
     public ResponseEntity getQuesById(@PathVariable String id) {
         Question ques = quesRepo.findOne(id);
@@ -70,7 +66,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "分页查询试题", notes = "分页查询试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/question/{curPage}/{pageSize}")
     public ResponseEntity getAllQuestion(HttpServletRequest request,
                                         @ModelAttribute QuestionSearchCondition searchCondition,
@@ -89,7 +84,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "更新试题", notes = "更新试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/question")
     public ResponseEntity updateQuestion(@RequestBody Question question) {
         quesService.saveQues(question);
@@ -103,7 +97,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "新增试题", notes = "新增试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/question")
     public ResponseEntity addQuestion(HttpServletRequest request,
                                       @RequestBody Question question) {
@@ -117,7 +110,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "删除试题", notes = "删除试题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/question/{id}")
     public ResponseEntity removeQuestion(@PathVariable String id) {
         quesRepo.delete(id);
@@ -131,7 +123,6 @@ public class QuesController extends ControllerSupport {
      * @return
      */
     @ApiOperation(value = "删除套题子题", notes = "删除套题子题")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/question/{id}/{number}")
     public ResponseEntity removeQuestion(@PathVariable String id, @PathVariable String number) {
         Question question = quesRepo.findOne(id);
@@ -141,7 +132,6 @@ public class QuesController extends ControllerSupport {
     }
 
     @ApiOperation(value = "查询题目数量", notes = "查询题目数量")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/question/count")
     public ResponseEntity<Object> getQuesCount(HttpServletRequest request,@ModelAttribute QuestionSearchCondition searchCondition){
     	User user = getAccessUser();

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

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.commons.web.security.annotation.Uac;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 
 import com.google.gson.Gson;
 import cn.com.qmth.examcloud.core.questions.dao.SettingRepo;
@@ -35,7 +33,6 @@ public class SettingController {
      * @return
      */
     @ApiOperation(value="获取全部设置",notes="获取全部设置")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/setting")
     public ResponseEntity getAllSetting(){
         return new ResponseEntity(settingRepo.findAll(), HttpStatus.OK);
@@ -47,7 +44,6 @@ public class SettingController {
      * @return
      */
     @ApiOperation(value="更新设置",notes="更新设置")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PutMapping(value = "/setting")
     public ResponseEntity updateSetting(@RequestBody SettingDto settingDto){
     	return new ResponseEntity(settingRepo.save(settingDto.getSettingList()),HttpStatus.OK);
@@ -59,7 +55,6 @@ public class SettingController {
      * @return
      */
     @ApiOperation(value="新增设置",notes="新增设置")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @PostMapping(value = "/setting")
     public ResponseEntity addSetting(@RequestBody SettingDto settingDto){
     	return new ResponseEntity(settingRepo.save(settingDto.getSettingList()),HttpStatus.OK);
@@ -71,7 +66,6 @@ public class SettingController {
      * @return
      */
     @ApiOperation(value="删除设置",notes="删除设置")
-    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @DeleteMapping(value = "/setting/{id}")
     public ResponseEntity removeSetting(@PathVariable String id){
         settingRepo.delete(id);

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.base;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -0,0 +1,74 @@
+package cn.com.qmth.examcloud.core.questions.base.core;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+public class CourseSpeciatly implements Serializable{
+
+	private static final long serialVersionUID = -250814769612993025L;
+	
+	private Long id;
+	
+	private Long courseId;
+	
+	private Long specialtyId;
+	
+	private Long creator;
+	
+	private Date createTime;
+
+	private Date updateTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public Long getSpecialtyId() {
+		return specialtyId;
+	}
+
+	public void setSpecialtyId(Long specialtyId) {
+		this.specialtyId = specialtyId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public Long getCreator() {
+		return creator;
+	}
+
+	public void setCreator(Long creator) {
+		this.creator = creator;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+}

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

@@ -0,0 +1,92 @@
+package cn.com.qmth.examcloud.core.questions.base.core;
+
+import java.io.Serializable;
+
+/**
+ * Created by songyue on 17/8/3.
+ */
+public class CourseSync implements Serializable {
+
+	private static final long serialVersionUID = 8986880538637117108L;
+
+	private Long id;
+
+	private String code;
+
+	private String name;
+
+	private Long orgId;
+
+	private String level;
+
+	private String createTime;
+
+	private String updateTime;
+
+	private Boolean enable;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+}

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

@@ -0,0 +1,60 @@
+package cn.com.qmth.examcloud.core.questions.base.core;
+
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
+
+/**
+ * @author  	chenken
+ * @date    	2017年7月20日 上午9:49:03
+ * @company 	QMTH
+ * @description ExamCourseDto.java
+ */
+public class ExamCourseDto {
+	private Long examId;
+    private String examName;
+    private ExamType examType;
+    private String courseName;
+    private String courseCode;
+	private Long orgId;
+    
+    public ExamCourseDto(){}
+    
+	public Long getExamId() {
+		return examId;
+	}
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+	public String getExamName() {
+		return examName;
+	}
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+	public ExamType getExamType() {
+		return examType;
+	}
+	public void setExamType(ExamType examType) {
+		this.examType = examType;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getCourseCode() {
+		return courseCode;
+	}
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+}
+

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

@@ -0,0 +1,57 @@
+package cn.com.qmth.examcloud.core.questions.base.core.enums;
+
+public enum CourseLevel {
+
+	ZSB("专升本", "Z"),
+
+	GQZ("高起专", "Q"),
+
+	GQB("高起本", "S"),
+
+	ALL("不限", "");
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 简写
+	 */
+	private String abbreviate;
+
+	private CourseLevel(String name, String abbreviate) {
+		this.name = name;
+		this.abbreviate = abbreviate;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getAbbreviate() {
+		return abbreviate;
+	}
+
+	/**
+	 * 混合查询
+	 *
+	 * @author WANGWEI
+	 * @param name
+	 * @return
+	 */
+	public static CourseLevel getCourseLevel(String name) {
+		if (null == name) {
+			return CourseLevel.ALL;
+		}
+		for (CourseLevel cur : CourseLevel.values()) {
+			if (name.equals(cur.getName())) {
+				return cur;
+			}
+			if (name.equals(cur.name())) {
+				return cur;
+			}
+		}
+		return CourseLevel.ALL;
+	}
+}

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

@@ -0,0 +1,41 @@
+package cn.com.qmth.examcloud.core.questions.base.em.enums;
+
+/**
+ * @author ting.yin
+ * @Description: 考试类型
+ * @date 2017年1月5日
+ */
+public enum ExamType {
+    /**
+     * 传统考试
+     */
+    TRADITION,
+    /**
+     * 在线考试
+     */
+    ONLINE,
+    /**
+     * 在线练习
+     */
+    PRACTICE,
+
+    /**
+     * 离线考试
+     */
+    OFFLINE,
+
+    /**
+     * 分布式印刷考试
+     */
+    PRINT_EXAM;
+
+    public static ExamType strToEnum(String str) {
+        for (ExamType examType : ExamType.values()) {
+            if (examType.name().equals(str)) {
+                return examType;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,143 @@
+package cn.com.qmth.examcloud.core.questions.base.print;
+
+import java.util.Date;
+/**
+ * @author  	chenken
+ * @date    	2018年3月6日 下午5:39:57
+ * @company 	QMTH
+ * @description 课程试卷关联表
+ */
+public class CoursePaperDto {
+	
+	private Long id;
+	/**
+	 * 机构ID
+	 */
+	private Long orgId;
+	/**
+	 * 考试ID
+	 */
+	private Long examId;
+	/**
+	 * 课程code
+	 */
+	private String courseCode;
+	/**
+	 * 课程名称
+	 */
+	private String courseName;
+	/**
+	 * 试卷ID
+	 */
+	private String paperId;
+	/**
+	 * 试卷名称
+	 */
+	private String paperName;
+	/**
+	 * 试卷P数
+	 */
+	private Integer pNum;
+	/**
+	 * 试卷htmlURL
+	 */
+	private String paperHtmlUrl;
+	/**
+	 * 答案htmlURL
+	 */
+	private String answerHtmlUrl;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	
+	public CoursePaperDto(){}
+	
+	public CoursePaperDto(Long orgId, Long examId, String courseCode) {
+		this.orgId = orgId;
+		this.examId = examId;
+		this.courseCode = courseCode;
+	}
+
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+	
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getPaperName() {
+		return paperName;
+	}
+	public void setPaperName(String paperName) {
+		this.paperName = paperName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getpNum() {
+		return pNum;
+	}
+
+	public void setpNum(Integer pNum) {
+		this.pNum = pNum;
+	}
+
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
+
+	public String getPaperHtmlUrl() {
+		return paperHtmlUrl;
+	}
+
+	public void setPaperHtmlUrl(String paperHtmlUrl) {
+		this.paperHtmlUrl = paperHtmlUrl;
+	}
+
+	public String getAnswerHtmlUrl() {
+		return answerHtmlUrl;
+	}
+
+	public void setAnswerHtmlUrl(String answerHtmlUrl) {
+		this.answerHtmlUrl = answerHtmlUrl;
+	}
+	
+}
+

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

@@ -0,0 +1,76 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by songyue on 17/3/15.
+ */
+public class PaperDetailDto implements Serializable {
+
+    private static final long serialVersionUID = -3520871668728091404L;
+
+    private String id;
+
+    private Integer number;// 大题序号
+
+    private String cnNum;// 中文序号
+
+    private String name;// 大题名称
+
+    private Double score;// 大题分数
+
+    private List<PaperDetailUnitDto> paperDetailUnits;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getCnNum() {
+        return cnNum;
+    }
+
+    public void setCnNum(String cnNum) {
+        this.cnNum = cnNum;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public List<PaperDetailUnitDto> getPaperDetailUnits() {
+        return paperDetailUnits;
+    }
+
+    public void setPaperDetailUnits(List<PaperDetailUnitDto> paperDetailUnits) {
+        this.paperDetailUnits = paperDetailUnits;
+    }
+}

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

@@ -0,0 +1,132 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+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.
+ */
+public class PaperDetailUnitDto implements Serializable {
+
+    private static final long serialVersionUID = 6507445685386413261L;
+
+    private String id;
+
+    private Integer number;// 小题序号
+
+    private Double score;// 小题分数
+
+    private QuesStructType questionType;// 小题类型
+
+    private List<SubQuestionDto> subQuestions;// 套题下面的子题,如不是套题集合为空
+
+    private String quesId;// 关联试题Id
+
+    private String answer;// 试题答案
+
+    private List<Double> subScoreList;// 对应套题的情况下，各子题的分数分布
+
+    /**
+     * 选择题下option的排序,按照number排序 一般：4,2,3,1 套题下的选择题:1,2,3,4;2,3,4,1;3,2,1,4
+     * 题与题之间按分号";"分隔
+     */
+    private String optionOrder;
+    
+    private String quesBody;// 子题题干,默认为html
+    
+    private List<QuesOptionDto> quesOptions;// 子题选项
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public QuesStructType getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(QuesStructType questionType) {
+        this.questionType = questionType;
+    }
+
+    public String getQuesId() {
+        return quesId;
+    }
+
+    public void setQuesId(String quesId) {
+        this.quesId = quesId;
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer;
+    }
+
+    public List<SubQuestionDto> getSubQuestions() {
+        return subQuestions;
+    }
+
+    public void setSubQuestions(List<SubQuestionDto> subQuestions) {
+        this.subQuestions = subQuestions;
+    }
+
+    public List<Double> getSubScoreList() {
+        return subScoreList;
+    }
+
+    public void setSubScoreList(List<Double> subScoreList) {
+        this.subScoreList = subScoreList;
+    }
+
+    public String getOptionOrder() {
+        return optionOrder;
+    }
+
+    public void setOptionOrder(String optionOrder) {
+        this.optionOrder = optionOrder;
+    }
+
+	public String getQuesBody() {
+		return quesBody;
+	}
+
+	public void setQuesBody(String quesBody) {
+		this.quesBody = quesBody;
+	}
+	
+	public List<QuesOptionDto> getQuesOptions() {
+		return quesOptions;
+	}
+
+	public void setQuesOptions(List<QuesOptionDto> quesOptions) {
+		this.quesOptions = quesOptions;
+	}
+}

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

@@ -0,0 +1,127 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by songyue on 17/3/15.
+ */
+public class PaperDto implements Serializable{
+    private static final long serialVersionUID = -4673013279766466337L;
+
+    private String id;
+
+    private String name;//试卷名称
+
+    private String title;//试卷标题
+
+    private Double totalScore;//试卷总分
+    /**
+     * 试卷中是否全为客观题
+     * 是：true
+     * 否：false
+     */
+    private boolean isAllQbjectiveQuestion;
+    
+    private List<PaperDetailDto> paperDetails;
+
+    private Map<String,String> params;//导入试卷属性
+
+    /**
+     * 调卷规则原始试卷ID
+     */
+    private String basePaperId;
+    
+    /**
+     * 是否包含音频题
+     */
+    private Boolean hasAudio;
+    
+    private String examRemark;//考试说明
+    
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public List<PaperDetailDto> getPaperDetails() {
+        return paperDetails;
+    }
+
+    public void setPaperDetails(List<PaperDetailDto> paperDetails) {
+        this.paperDetails = paperDetails;
+    }
+
+    public Map<String, String> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, String> params) {
+        this.params = params;
+    }
+
+	public String getBasePaperId() {
+		return basePaperId;
+	}
+
+	public void setBasePaperId(String basePaperId) {
+		this.basePaperId = basePaperId;
+	}
+
+	public boolean isAllQbjectiveQuestion() {
+		return isAllQbjectiveQuestion;
+	}
+
+	public void setAllQbjectiveQuestion(boolean isAllQbjectiveQuestion) {
+		this.isAllQbjectiveQuestion = isAllQbjectiveQuestion;
+	}
+
+	public Boolean getHasAudio() {
+		return hasAudio;
+	}
+
+	public void setHasAudio(Boolean hasAudio) {
+		this.hasAudio = hasAudio;
+	}
+
+	public String getExamRemark() {
+		return examRemark;
+	}
+
+	public void setExamRemark(String examRemark) {
+		this.examRemark = examRemark;
+	}
+    
+}

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

@@ -0,0 +1,33 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+import java.io.Serializable;
+
+public class QuesOptionDto implements Serializable {
+
+    private static final long serialVersionUID = -49939145760800880L;
+
+    private String number;// 选项编号
+
+    private String optionBody;// 选项内容
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getOptionBody() {
+        return optionBody;
+    }
+
+    public void setOptionBody(String optionBody) {
+        this.optionBody = optionBody;
+    }
+
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
+
+}

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

@@ -0,0 +1,122 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+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;
+
+    private String id;
+
+    private String quesBody;// 题干,默认为html
+
+    private String quesAnswer;// 答案,默认为html
+
+    private List<SubQuestionDto> subQuestions;// 子题目,用于套题
+
+    private List<QuesOptionDto> quesOptions;// 试题选项
+
+    private QuesStructType questionType;// 试题结构类型
+
+    private Map<String, String> quesParams;// 试题属性
+
+    private Double score;// 预设分值
+
+    /**
+     * 是否包含音频
+     */
+    private Boolean hasAudio;
+    /**
+     * 播放次数
+     */
+    private Integer playTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getQuesBody() {
+        return quesBody;
+    }
+
+    public void setQuesBody(String quesBody) {
+        this.quesBody = quesBody;
+    }
+
+    public String getQuesAnswer() {
+        return quesAnswer;
+    }
+
+    public void setQuesAnswer(String quesAnswer) {
+        this.quesAnswer = quesAnswer;
+    }
+
+    public List<QuesOptionDto> getQuesOptions() {
+        return quesOptions;
+    }
+
+    public void setQuesOptions(List<QuesOptionDto> quesOptions) {
+        this.quesOptions = quesOptions;
+    }
+
+    public QuesStructType getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(QuesStructType questionType) {
+        this.questionType = questionType;
+    }
+
+    public Map<String, String> getQuesParams() {
+        return quesParams;
+    }
+
+    public void setQuesParams(Map<String, String> quesParams) {
+        this.quesParams = quesParams;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Double getScore() {
+        return score == null ? 0 : score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public List<SubQuestionDto> getSubQuestions() {
+        return subQuestions;
+    }
+
+    public void setSubQuestions(List<SubQuestionDto> subQuestions) {
+        this.subQuestions = subQuestions;
+    }
+
+    public Boolean getHasAudio() {
+        return hasAudio;
+    }
+
+    public void setHasAudio(Boolean hasAudio) {
+        this.hasAudio = hasAudio;
+    }
+
+    public Integer getPlayTime() {
+        return playTime;
+    }
+
+    public void setPlayTime(Integer playTime) {
+        this.playTime = playTime;
+    }
+
+}

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

@@ -0,0 +1,82 @@
+package cn.com.qmth.examcloud.core.questions.base.question;
+
+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;
+
+    private Integer number;// 子题的序号
+
+    private String quesBody;// 子题题干,默认为html
+
+    private String quesAnswer;// 子题答案,默认为html
+
+    private List<QuesOptionDto> quesOptions;// 子题选项
+
+    private QuesStructType questionType;// 子题结构类型
+
+    private Map<String, String> quesParams;// 试题属性
+
+    private Double score;// 预设分值
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getQuesBody() {
+        return quesBody;
+    }
+
+    public void setQuesBody(String quesBody) {
+        this.quesBody = quesBody;
+    }
+
+    public String getQuesAnswer() {
+        return quesAnswer;
+    }
+
+    public void setQuesAnswer(String quesAnswer) {
+        this.quesAnswer = quesAnswer;
+    }
+
+    public List<QuesOptionDto> getQuesOptions() {
+        return quesOptions;
+    }
+
+    public void setQuesOptions(List<QuesOptionDto> quesOptions) {
+        this.quesOptions = quesOptions;
+    }
+
+    public QuesStructType getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(QuesStructType questionType) {
+        this.questionType = questionType;
+    }
+
+    public Map<String, String> getQuesParams() {
+        return quesParams;
+    }
+
+    public void setQuesParams(Map<String, String> quesParams) {
+        this.quesParams = quesParams;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+}

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

@@ -0,0 +1,97 @@
+package cn.com.qmth.examcloud.core.questions.base.question.enums;
+
+public enum QuesStructType {
+	
+	/**
+	 * 单选
+	 */
+	SINGLE_ANSWER_QUESTION(1L,"单选",true,false),
+	/**
+	 * 多选
+	 */
+	MULTIPLE_ANSWER_QUESTION(2L,"多选",true,false),
+	/**
+	 * 判断
+	 */
+	BOOL_ANSWER_QUESTION(3L,"判断",true,false),
+	/**
+	 * 填空
+	 */
+	FILL_BLANK_QUESTION(4L,"填空",false,false),
+	/**
+	 * 问答
+	 */
+	TEXT_ANSWER_QUESTION(5L,"问答",false,false),
+	/**
+	 * 套题
+	 */
+	NESTED_ANSWER_QUESTION(6L,"套题",false,true);
+	
+	private Long id;
+	private String name;
+	private boolean objective;//是否是客观题
+	private boolean combline;//是否是组合题
+		
+	private QuesStructType(Long id, String name, boolean objective, boolean combline) {
+		this.id = id;
+		this.name = name;;
+		this.objective = objective;
+		this.combline = combline;
+	}
+	
+	/**
+	 * 通过ID获取试题类型
+	 * @param id
+	 * @return
+	 */
+	public static QuesStructType getQuesStructTypeById(Long id){
+		for(QuesStructType type:QuesStructType.values()){
+			if(type.getId()==id){
+				return type;
+			}
+		}
+		return null;
+	}
+	
+	private QuesStructType(){
+		
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public boolean isObjective() {
+		return objective;
+	}
+
+	public void setObjective(boolean objective) {
+		this.objective = objective;
+	}
+
+	public boolean isCombline() {
+		return combline;
+	}
+
+	public void setCombline(boolean combline) {
+		this.combline = combline;
+	}
+
+	public String toString(){
+		return getName();
+	}
+	
+}
+

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import com.mongodb.DBRef;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+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;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesTypeName;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Query;

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

@@ -9,7 +9,7 @@ import java.util.Map.Entry;
 
 import org.springframework.data.annotation.Id;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestPaper;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;

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

@@ -8,7 +8,7 @@ import org.springframework.data.annotation.Id;
 
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
 
 /**
  * @author  	chenken

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

@@ -7,7 +7,7 @@ import java.util.Map;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import org.springframework.data.annotation.Id;
 
-import cn.com.qmth.examcloud.common.dto.core.ExamCourseDto;
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
 
 import cn.com.qmth.examcloud.core.questions.base.enums.ExtractPolicy;
 

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

@@ -13,7 +13,7 @@ import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 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.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
 
 /**
  * @author songyue

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyNumberDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PaperDetailUnitStructDto;

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

@@ -12,7 +12,7 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit> {
 

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

@@ -5,7 +5,7 @@ import java.util.List;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyNumberDto;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 /**
  * Created by songyue on 17/3/21.

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import org.springframework.data.annotation.Id;
 
 import java.io.Serializable;

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

@@ -8,7 +8,7 @@ import java.util.Map;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Specialty;
 import org.springframework.data.annotation.Id;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import org.springframework.data.annotation.Transient;
 
 /**

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

@@ -10,7 +10,7 @@ import org.springframework.data.annotation.Id;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 public class QuestionBak implements Serializable {
 

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

@@ -4,7 +4,7 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 public class QuestionSearchCondition {
 

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

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.questions.dao.entity;
 import java.io.Serializable;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+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/QuestionTypeNum.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 /**
  * @author  	chenken

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

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+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;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.dto;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 import java.io.Serializable;
 import java.util.List;

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

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
 
 /**

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

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.questions.service;
 import java.util.List;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
 

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

@@ -5,7 +5,6 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 
 /**

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

@@ -5,13 +5,12 @@ import java.util.Map;
 
 
 
-import cn.com.qmth.examcloud.common.dto.question.PaperDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
 
 import org.springframework.data.domain.Page;
 
-import cn.com.qmth.examcloud.common.dto.question.QuestionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 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.base.enums.PaperType;

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

@@ -66,9 +66,8 @@ import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.enums.QuesUnit;
 import cn.com.qmth.examcloud.core.questions.base.exception.PaperException;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
 
 @Service

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

@@ -6,7 +6,6 @@ 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.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 
 public interface PaperDetailService {
     /**

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

@@ -9,7 +9,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.base.enums.PaperType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 
 /**
  * 

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

@@ -8,9 +8,8 @@ import java.util.Set;
 import org.springframework.data.domain.Page;
 import org.springframework.web.multipart.MultipartFile;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.QuestionAllTypeDto;

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

@@ -6,7 +6,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.QuesTypeNameRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyNumberDto;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.QuesNameDto;
@@ -28,7 +28,6 @@ import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.exact;
 

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

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.questions.service;
 import java.util.List;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PropertyDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
 

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 
 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.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 /**
  * Created by songyue on 16/12/28.

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.QuesTypeNameRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesTypeName;

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

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.questions.service;
 import java.util.List;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.bean;
 
-import cn.com.qmth.examcloud.common.dto.question.PaperDetailDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDetailDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 import org.springframework.stereotype.Component;
 

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

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.bean;
 
-import cn.com.qmth.examcloud.common.dto.question.PaperDetailUnitDto;
-import cn.com.qmth.examcloud.common.dto.question.QuesOptionDto;
+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;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.bean;
 
-import cn.com.qmth.examcloud.common.dto.question.PaperDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import org.springframework.stereotype.Component;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.bean;
 
-import cn.com.qmth.examcloud.common.dto.question.QuesOptionDto;
-import cn.com.qmth.examcloud.common.dto.question.SubQuestionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuesOptionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.SubQuestionDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import org.springframework.stereotype.Component;

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

@@ -8,7 +8,7 @@ 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.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
 
 /**
  * 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

@@ -5,7 +5,7 @@ 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.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 
 /**

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

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.questions.service.bean.dto;
 import java.io.Serializable;
 import java.util.List;
 
-import cn.com.qmth.examcloud.common.dto.core.ExamCourseDto;
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
 
 /**
  * @author  	chenken

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

@@ -5,7 +5,7 @@ import java.util.List;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 /**
  * 试卷小题导出dto Created by songyue on 17/3/15.

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

@@ -7,7 +7,7 @@ import java.util.List;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;

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

@@ -11,7 +11,7 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;

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

@@ -40,9 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelWriter;
 
 import com.google.gson.Gson;

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;

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

@@ -24,8 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;

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

@@ -14,7 +14,7 @@ import org.docx4j.wml.Text;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 
 import com.google.gson.Gson;

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

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 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;

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

@@ -17,7 +17,6 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.ExamFileRepo;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.FileDisposeUtil;
 import cn.com.qmth.examcloud.core.questions.base.SpringContextUtils;

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

@@ -16,9 +16,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.ExamFileRepo;
 import cn.com.qmth.examcloud.core.questions.dao.ExportStructureRepo;
 import cn.com.qmth.examcloud.core.questions.dao.ExtractConfigRepo;

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import cn.com.qmth.examcloud.common.dto.core.ExamCourseDto;
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelWriter;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;

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

@@ -31,17 +31,15 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
-import cn.com.qmth.examcloud.common.dto.core.ExamCourseDto;
-import cn.com.qmth.examcloud.common.dto.question.PaperDetailDto;
-import cn.com.qmth.examcloud.common.dto.question.PaperDetailUnitDto;
-import cn.com.qmth.examcloud.common.dto.question.PaperDto;
-import cn.com.qmth.examcloud.common.dto.question.QuesOptionDto;
-import cn.com.qmth.examcloud.common.dto.question.QuestionDto;
-import cn.com.qmth.examcloud.common.dto.question.SubQuestionDto;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDetailDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDetailUnitDto;
+import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuesOptionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.SubQuestionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
-import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.core.questions.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
@@ -72,6 +70,7 @@ import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
 import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
 
 /**
  * 
@@ -935,7 +934,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 	public Page<ExtractConfig> findPageExtractConfig(int currentPage,int pageSize, Long examId, String courseNo, String courseLevel) {
 		String examCourseJson = examCourseClient.findPageExamCourse(examId,courseNo,currentPage,pageSize,courseLevel);
 		
-		PageExamCourse pageExamCourse = GsonUtil.getInstanceByJson(examCourseJson,PageExamCourse.class);
+		PageExamCourse pageExamCourse = JsonUtil.fromJson(examCourseJson,PageExamCourse.class);
+				//GsonUtil.getInstanceByJson(examCourseJson,PageExamCourse.class);
 		
 		List<ExamCourseDto> examCourseList = pageExamCourse.getContent();
 		if(examCourseList.size()==0){

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

@@ -42,7 +42,7 @@ import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
 import cn.com.qmth.examcloud.core.questions.base.CombinationUtils;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;

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

@@ -7,7 +7,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;

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

@@ -13,9 +13,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.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;

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

@@ -40,10 +40,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.web.multipart.MultipartFile;
 
-import cn.com.qmth.examcloud.common.dto.print.CoursePaperDto;
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.print.CoursePaperDto;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 
 import com.google.gson.Gson;
 import com.mysql.fabric.xmlrpc.base.Array;

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

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.core.questions.service.bean.PropertyAssembler;
 import cn.com.qmth.examcloud.core.questions.dao.PropertyRepo;

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

@@ -34,7 +34,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;

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

@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 import cn.com.qmth.examcloud.core.questions.dao.QuestionAudioRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import cn.com.qmth.examcloud.common.dto.core.ExamCourseDto;
+import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
 
 /**
  * @author  	chenken

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

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import cn.com.qmth.examcloud.common.dto.print.CoursePaperDto;
+import cn.com.qmth.examcloud.core.questions.base.print.CoursePaperDto;
 
 @FeignClient(value = "weiwenhai-ExamCloud-service-print")
 public interface PrintCoursePaperClient {

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

@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
 
 
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/sync/DataReceiveService.java

@@ -47,7 +47,7 @@ public class DataReceiveService {
     @Autowired
     ExtractConfigRepo extractConfigRepo;
 
-    @DataReceive(domain = "cn.com.qmth.examcloud.common.dto.core.CourseSync")
+    @DataReceive(domain = "cn.com.qmth.examcloud.core.questions.base.core.CourseSync")
     public synchronized void readCourse(BaseSyncData baseSyncData) {
         log.info("-----------coursesync start---------");
         log.info(baseSyncData.toString());
@@ -162,7 +162,7 @@ public class DataReceiveService {
         log.info("-----------coursesync end---------");
     }
 
-    @DataReceive(domain = "cn.com.qmth.examcloud.common.dto.core.SpecialtySync")
+    @DataReceive(domain = "cn.com.qmth.examcloud.core.questions.base.core.SpecialtySync")
     public synchronized void readSpecialty(BaseSyncData baseSyncData) {
         log.info("-----------specialty start---------");
         log.info(baseSyncData.toString());

examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ApplicationTest.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.starter;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
 
 import com.google.gson.Gson;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.*;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.ImportPaperService;

examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ExtractConfigServiceTest.java

@@ -24,7 +24,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import cn.com.qmth.examcloud.common.dto.question.QuestionDto;
+import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
 import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;