题库后端提交

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

@@ -48,8 +48,9 @@ public class CoursePropertyController extends ControllerSupport{
 	public ResponseEntity<Object> findAllByOrg(HttpServletRequest request){
 		User user = getAccessUser();
 		//AccessUser accessUser = (AccessUser)request.getAttribute("accessUser");
-		if(user != null){
+		if(user == null){
 			List<CourseProperty> courseProperties = coursePropertyService.findAllByOrgId(user.getRootOrgId());
+			//List<CourseProperty> courseProperties = coursePropertyService.findAllByOrgId(109L);
 			return new ResponseEntity<Object>(courseProperties,HttpStatus.OK);
 		}
 		return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);

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

@@ -98,7 +98,7 @@ public class ExtractConfigController extends ControllerSupport {
 			//AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
 			extractConfig.setOrgId(user.getRootOrgId()+"");
 			extractConfig.setOrgName(user.getRootOrgName());
-			extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig,isbuildFile,accessUser);
+			extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig,isbuildFile,user);
 			return new ResponseEntity<Object>(HttpStatus.OK);
 		}catch(Exception e){
 			e.printStackTrace();

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

@@ -118,7 +118,8 @@ public class ImportPaperController extends ControllerSupport {
     								 @PathVariable String paperId,
     								 @PathVariable String paperName,
     								 @PathVariable String courseNo){
-    	AccessUser user = (AccessUser) request.getAttribute("accessUser");
+    	User user = getAccessUser();
+    	//AccessUser user = (AccessUser) request.getAttribute("accessUser");
     	Map<String, Object> map = importPaperService.clonePaper(paperId, paperName, courseNo, user);
     	if (map.get("msg").equals("success")) {
             return new ResponseEntity(map, HttpStatus.OK);

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

@@ -2,8 +2,8 @@ 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;
 
@@ -18,13 +18,13 @@ public interface ExamFileService {
 	 * 批量保存考试文件
 	 * @param examFile
 	 */
-	public void saveExamFiles(List<ExamFile> examFileList,AccessUser accessUser);
+	public void saveExamFiles(List<ExamFile> examFileList,User accessUser);
 	
 	/**
 	 * 保存考试文件
 	 * @param examFile
 	 */
-	public void saveExamFile(ExamFile examFile,AccessUser accessUser);
+	public void saveExamFile(ExamFile examFile,User accessUser);
 	
 	/**
 	 * 删除考试文件

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

@@ -12,8 +12,8 @@ import java.util.Set;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.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.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
@@ -292,7 +292,7 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
 	}
 	
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
     	PaperExp paperExp = initPaperExp(paperId);
     	setSplitPaperDetailExp(paperExp,paperExp.getPaperDetails());
         if (paperExp!=null) {

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

@@ -21,7 +21,6 @@ import java.util.stream.Collectors;
 import javax.xml.bind.JAXBElement;
 
 import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
-
 import main.java.com.UpYun;
 
 import org.apache.commons.io.FileUtils;
@@ -42,10 +41,12 @@ 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.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;
+
 import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
@@ -81,7 +82,6 @@ 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.enums.ExamFileType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 
@@ -275,7 +275,7 @@ public abstract class ExportPaperAbstractService {
 	 * @param accessUser
 	 * @throws Exception
 	 */
-    public abstract void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser)  throws Exception;
+    public abstract void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser)  throws Exception;
     
     public PaperExp initPaperExp(String paperId) throws Exception{
     	PaperExp paperExp = initPaperExpService.initPaperExp(paperId);
@@ -922,7 +922,7 @@ public abstract class ExportPaperAbstractService {
      * @param accessUser
      * @throws IOException 
      */
-    protected void uploadComputerTestFile(ExtractConfig extractConfig,AccessUser accessUser) throws IOException{
+    protected void uploadComputerTestFile(ExtractConfig extractConfig,User accessUser) throws IOException{
     	List<ComputerTestPaper>  computerTestPaperList = buildComputerTestJsonService.buildComputerTestPapers(extractConfig);
     	String currentTimeStr = CommonUtils.getCurNum();
     	for(int i = 0;i<computerTestPaperList.size();i++){
@@ -1042,7 +1042,7 @@ public abstract class ExportPaperAbstractService {
      */
     protected void uploadPaperOrAnswerFile(PaperExp paperExp,
 										   ExtractConfig extractConfig,
-										   AccessUser accessUser,
+										   User accessUser,
 										   String currNum,
 										   Template template,
 										   ExamFileType examFileType){
@@ -1064,7 +1064,7 @@ public abstract class ExportPaperAbstractService {
     /**
      * 生成试卷结构，上传至又拍云
      */
-    protected void uploadPaperStructure(PaperExp paperExp,ExtractConfig extractConfig,AccessUser accessUser,String currNum,List<QuestionTypeNum> questionTypeNums) {
+    protected void uploadPaperStructure(PaperExp paperExp,ExtractConfig extractConfig,User accessUser,String currNum,List<QuestionTypeNum> questionTypeNums) {
     	exportObjectiveQuestionStructures(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
     	exportSubjectiveQuestionStructures(paperExp,extractConfig,accessUser,currNum);
 	}
@@ -1074,7 +1074,7 @@ public abstract class ExportPaperAbstractService {
      * @param paperExp
      * @return
      */
-    protected void exportObjectiveQuestionStructures(PaperExp paperExp,ExtractConfig extractConfig,AccessUser accessUser,String currNum,List<QuestionTypeNum> questionTypeNums){
+    protected void exportObjectiveQuestionStructures(PaperExp paperExp,ExtractConfig extractConfig,User accessUser,String currNum,List<QuestionTypeNum> questionTypeNums){
     	String objectiveFilename = currNum+ExamFileType.PAPER_STRUCTURE_OBJECTIVE.name()+EXCEL_SUFFIX;
     	//得到试卷中的客观大题
     	List<PaperDetailExp> objectiveDetails = getAllObjectiveDetails(paperExp);
@@ -1110,7 +1110,7 @@ public abstract class ExportPaperAbstractService {
      * @param paperExp
      * @return
      */
-    protected void exportSubjectiveQuestionStructures(PaperExp paperExp,ExtractConfig extractConfig,AccessUser accessUser,String currNum){
+    protected void exportSubjectiveQuestionStructures(PaperExp paperExp,ExtractConfig extractConfig,User accessUser,String currNum){
     	String subjectiveFileName = currNum+ExamFileType.PAPER_STRUCTURE_SUBJECTIVE.name()+EXCEL_SUFFIX;
     	List<PaperDetailExp> subjectiveDetails = getAllSubjectiveDetails(paperExp);
     	List<SubjectiveQuestionStructure> subjectiveQuestionStructureList = new ArrayList<SubjectiveQuestionStructure>();

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

@@ -7,8 +7,8 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.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.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
@@ -52,7 +52,7 @@ public class HzkjExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -2,7 +2,10 @@ package cn.com.qmth.examcloud.core.questions.service.export;
 
 import java.io.File;
 import java.util.List;
+
 import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.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.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
@@ -45,7 +48,7 @@ public class RjgcExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -4,10 +4,11 @@ import java.io.File;
 import java.util.List;
 
 
+
 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.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -53,7 +54,7 @@ public class SddxExportPaperService extends ExportPaperAbstractService{
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -6,8 +6,8 @@ import java.util.List;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 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.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -58,7 +58,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 
 
+
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
@@ -17,9 +18,11 @@ 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.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 
 import com.google.gson.Gson;
+
 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;
@@ -103,7 +106,7 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
 	}
     
     @Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
     	PaperExp exportPaperExp = initExportSydxPaper(paperId);
     	PaperExp exportPaperStructureExp = initExportSydxPaper(paperId);
         if (exportPaperExp!=null&&exportPaperStructureExp!=null) {

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

@@ -7,8 +7,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 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.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -60,7 +60,7 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -5,8 +5,8 @@ import java.util.List;
 
 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.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -48,7 +48,7 @@ public class xajdExportPaperService extends ExportPaperAbstractService{
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,AccessUser accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();

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

@@ -15,8 +15,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.commons.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;
@@ -48,7 +48,7 @@ public class ExamFileServiceImpl implements ExamFileService{
 	protected String password;
 	
 	@Override
-	public void saveExamFiles(List<ExamFile> examFileList,AccessUser accessUser){
+	public void saveExamFiles(List<ExamFile> examFileList,User accessUser){
 		for(ExamFile examFile:examFileList){
 			saveExamFile(examFile,accessUser);
 		}
@@ -60,9 +60,9 @@ public class ExamFileServiceImpl implements ExamFileService{
 	}
 
 	@Override
-	public void saveExamFile(ExamFile examFile, AccessUser accessUser) {
+	public void saveExamFile(ExamFile examFile, User accessUser) {
 		examFile.setCreateTime(new Date());
-		examFile.setCreateUser(accessUser.getName());
+		examFile.setCreateUser(accessUser.getDisplayName());
 		examFileRepo.save(examFile);
 	}
 

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

@@ -165,12 +165,12 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 	 * @throws Exception
 	 */
 	private void uploadPaperFile(ExtractConfig extractConfig,String paperId,User user) throws Exception {
-		ExportServiceManage esm = exportServiceManageRepo.findByOrgName(accessUser.getRootOrgName());
+		ExportServiceManage esm = exportServiceManageRepo.findByOrgName(user.getRootOrgName());
 		if(esm == null){
 			esm = exportServiceManageRepo.findByOrgName("陕西师范大学");
 		}
     	ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById(esm.getExportServiceName());
-    	exportPaperAbstractService.uploadFile(extractConfig,paperId,accessUser);
+    	exportPaperAbstractService.uploadFile(extractConfig,paperId,user);
 	}
 	
     @Override

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -2,13 +2,13 @@
 spring.data.mongodb.uri=mongodb://192.168.10.30:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 spring.data.mongodb.database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.10.30:1111/eureka/
+eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 spring.application.name=ExamCloud-service-question
 
 spring.redis.host=192.168.10.30
 spring.redis.port=6379
 
-upyun.bucketName=exam-cloud-test
+upyun.bucketName=exam-cloud-test 
 upyun.userName=examcloud
 upyun.password=examcloud123456
 upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/