修改试卷文件导出BUG

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

@@ -199,7 +199,11 @@ public class BuildComputerTestJsonService {
 				blocks.add(block);
 			}else{
 				block.setType("text");
-				questionRowStrings[i] = questionRowStrings[i].replaceAll(" ","");
+				questionRowStrings[i] = questionRowStrings[i].replace(" ","");//消除空格
+				questionRowStrings[i] = questionRowStrings[i].replace(""","\"");//将"转换成\"
+				questionRowStrings[i] = questionRowStrings[i].replace("&lt;","<");//将&lt;转换成<
+				questionRowStrings[i] = questionRowStrings[i].replace("&gt;",">");//将&gt;转换成>
+				questionRowStrings[i] = questionRowStrings[i].replace("&amp;","&");//将&amp;转换成&
 				if(StringUtils.isNotBlank(questionRowStrings[i])){
 					block.setValue(questionRowStrings[i]);
 					blocks.add(block);

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

@@ -299,11 +299,11 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -707,6 +707,9 @@ public abstract class ExportPaperAbstractService {
 		//将对象转成 json对象
 		Gson gson = new Gson();
 		String strJSON = gson.toJson(computerTestPaper);
+		
+		strJSON = CommonUtils.replaceUnicodeStr(strJSON);
+		
 		//生成文件流写入JSON文件
 		FileOutputStream outputStream;
 		try {

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

@@ -58,11 +58,11 @@ public class HzkjExportPaperService extends ExportPaperAbstractService {
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -59,11 +59,11 @@ public class SddxExportPaperService extends ExportPaperAbstractService{
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -54,11 +54,11 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -110,11 +110,11 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
         if (exportPaperExp!=null&&exportPaperStructureExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -55,11 +55,11 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -54,11 +54,11 @@ public class xajdExportPaperService extends ExportPaperAbstractService{
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//删除原有试卷文件
-        	ExamFile examFile = new ExamFile();
+        	/*ExamFile examFile = new ExamFile();
         	examFile.setExamId(extractConfig.getExamId()+"");
         	examFile.setCourseId(extractConfig.getCourseCode());
         	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);
+        	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

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

@@ -15,13 +15,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import com.google.gson.Gson;
@@ -45,7 +41,6 @@ import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.utils.CommonUtils;
 import com.qmth.cqb.utils.FileDisposeUtil;
 import com.qmth.cqb.utils.SpringContextUtils;
-import com.qmth.cqb.utils.enums.PaperType;
 
 @Service("exportPaperService")
 public class ExportPaperServiceImpl implements ExportPaperService{
@@ -266,9 +261,15 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 				blocks.add(block);
 			}else{
 				block.setType("text");
-				questionRowStrings[i] = questionRowStrings[i].replaceAll(" ","");
-				block.setValue(questionRowStrings[i]);
-				blocks.add(block);
+				questionRowStrings[i] = questionRowStrings[i].replace(" ","");//消除空格
+				questionRowStrings[i] = questionRowStrings[i].replace(""","\"");//将"转换成\"
+				questionRowStrings[i] = questionRowStrings[i].replace("&lt;","<");//将&lt;转换成<
+				questionRowStrings[i] = questionRowStrings[i].replace("&gt;",">");//将&gt;转换成>
+				questionRowStrings[i] = questionRowStrings[i].replace("&amp;","&");//将&amp;转换成&
+				if(StringUtils.isNotBlank(questionRowStrings[i])){
+					block.setValue(questionRowStrings[i]);
+					blocks.add(block);
+				}
 			}
     	}
 		return blocks;

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

@@ -130,6 +130,13 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 		//生成试卷
 		Map<String, String> finishedPaperIdMap = extractConfigService.saveExtractConfig(extractConfig,accessUser);
     	if(isbuildFile==1){
+    		//删除原有试卷文件
+        	ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);
+    		
     		Set<Entry<String,String>> entrySet = finishedPaperIdMap.entrySet();
     		Iterator<Entry<String,String>> iterator = entrySet.iterator();
     		while(iterator.hasNext()){

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

@@ -4,9 +4,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import cn.com.qmth.examcloud.common.uac.annotation.Uac;
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import cn.com.qmth.examcloud.common.uac.enums.UacPolicy;
 import io.swagger.annotations.ApiOperation;
 
 import org.slf4j.Logger;