提交机考 数据包导出代码

cqb-paper/src/main/java/com/qmth/cqb/paper/dto/ExportPaperInfoModel.java

@@ -5,8 +5,6 @@ import java.util.List;
 
 import com.qmth.cqb.utils.enums.ExportWay;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-
 /**
  * @author  	chenken
  * @date    	2017年7月15日 下午1:52:52
@@ -27,10 +25,6 @@ public class ExportPaperInfoModel implements Serializable{
 	 * 课程ID
 	 */
 	private String courseId;
-	/**
-	 * 考试类型
-	 */
-	private ExamType examType;
 	
 	/**
 	 * BATCH:批量导出
@@ -57,14 +51,6 @@ public class ExportPaperInfoModel implements Serializable{
 		this.examId = examId;
 	}
 	
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
 	public List<String> getExportContentList() {
 		return exportContentList;
 	}

cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExamFile.java

@@ -2,13 +2,11 @@ package com.qmth.cqb.paper.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 import org.springframework.data.annotation.Id;
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
 
-import com.qmth.cqb.paper.dto.ExportPaperInfoModel;
 import com.qmth.cqb.utils.enums.ExamFileType;
 
 /**

cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExportStructure.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import org.springframework.data.annotation.Id;
 
-import com.qmth.cqb.paper.dto.ExportPaperInfoModel;
 import com.qmth.cqb.utils.enums.ExportType;
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
@@ -69,11 +68,6 @@ public class ExportStructure implements Serializable{
     	this.examId = examId;
     }
     
-    public ExportStructure(ExportPaperInfoModel exportModel){
-    	this.examId = exportModel.getExamId();
-    	this.examType = exportModel.getExamType();
-    }
-    
 	public String getId() {
 		return id;
 	}

cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/SxsfExportPaperService.java

@@ -1,9 +1,6 @@
 package com.qmth.cqb.paper.service.export;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -14,15 +11,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
 import main.java.com.UpYun;
 
 import org.apache.commons.io.FileUtils;
-import org.docx4j.docProps.core.dc.terms.DDC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +67,7 @@ import com.qmth.cqb.utils.word.DocxProcessUtil;
 @Service("sxsfExportPaperService")
 public class SxsfExportPaperService extends ExportPaperAbstractService {
 	
-	private static final Logger logger = LoggerFactory.getLogger(FileDisposeUtil.class);
+	private static final Logger logger = LoggerFactory.getLogger(SxsfExportPaperService.class);
 	
 	@Autowired
 	private PaperService paperService;
@@ -87,8 +81,8 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
 	@Override
     public void downloadPaper(String paperId, HttpServletResponse response) throws Exception {
     	PaperExp paperExp = initExportPaper(paperId);
-        List<String> fileList = new ArrayList<String>();
-        if (paperExp!= null) {
+        if (paperExp!=null) {
+        	List<String> fileList = new ArrayList<String>();
             String paperfileName = paperExp.getName()+DOCX_SUFFIX;
             String answerFileName = paperExp.getName()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
             DocxProcessUtil.exportWord(paperExp, paperfileName,SXSF_TEMPLATE_PAPER);

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -79,6 +79,7 @@ import com.qmth.cqb.utils.BeanCopierUtil;
 import com.qmth.cqb.utils.CommonUtils;
 import com.qmth.cqb.utils.FileDisposeUtil;
 import com.qmth.cqb.utils.SpringContextUtils;
+import com.qmth.cqb.utils.enums.ExportType;
 import com.qmth.cqb.utils.enums.ExportWay;
 import com.qmth.cqb.utils.enums.PaperType;
 
@@ -696,11 +697,13 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			if(exportStructure==null){
 				throw new RuntimeException("该考试下的试卷结构导出设置未制定,不能导出");
 			}
-			paperIds = checkAllCourseByExamId(exportModel.getExamId());
-			//生成试卷结构到downloadDirectory目录
-			if(paperIds.size()>0){
-				//创建试卷结构Excel文件
-				makePaperStructure(exportStructure.getExamName(),paperIds,exportStructure);
+			if(exportStructure.getExportType()==ExportType.NORMAL){
+				paperIds = checkAllCourseByExamId(exportModel.getExamId());
+				//生成试卷结构到downloadDirectory目录
+				if(paperIds.size()>0){
+					//创建试卷结构Excel文件
+					makePaperStructure(exportStructure.getExamName(),paperIds,exportStructure);
+				}
 			}
 		}
 		//根据条件获取到文件下载路径,下载文件到服务器的downloadDirectory文件夹
@@ -711,7 +714,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			}
 		}
 		//创建压缩文件名称
-		String zipFileName = CommonUtils.getCurNum();
+		String zipFileName = exportStructure.getExamId();
 		//将downloadDirectory文件夹压缩成zip文件,存放到zipDirectory文件夹中
 		FileDisposeUtil.fileToZip(downloadDirectory,zipDirectory,zipFileName);
 		//下载zip文件到客户端

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExtractConfigController.java

@@ -163,7 +163,7 @@ public class ExtractConfigController {
 	
 	@ApiOperation(value = "导出单张考试试卷、答案、试卷结构", notes = "导出单张考试试卷、答案、试卷结构")
 	@GetMapping(value = "/exportSingleExamPaperInfo/{exportWay}/{examId}/{courseId}/{exportContentList}")
-	public void exportExamPaperInfo(HttpServletResponse response,
+	public void exportSingleExamPaperInfo(HttpServletResponse response,
 											@PathVariable String exportWay,
 											@PathVariable String examId,
 											@PathVariable String courseId,
@@ -206,7 +206,7 @@ public class ExtractConfigController {
 	
 	@ApiOperation(value = "导出整个考试下所有 课程的试卷、答案、试卷结构", notes = "导出整个考试下所有 课程的试卷、答案、试卷结构")
 	@GetMapping(value = "/exportBatchExamPaperInfo/{exportWay}/{examId}/{exportContentList}")
-	public void exportExamPaperInfo(HttpServletResponse response,
+	public void exportBatchExamPaperInfo(HttpServletResponse response,
 											@PathVariable String exportWay,
 											@PathVariable String examId,
 											@PathVariable String exportContentList){