Merge remote-tracking branch 'origin/dev' into dev

themis-backend/.gitignore

@@ -1,3 +1,5 @@
+file/
+logs/
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java

@@ -177,6 +177,7 @@ public class TEExamPaperController {
             transMap.put("audioPlayCount", audioPlayCount);
             transMap.put("processPaper", processPaper);
             transMap.put("processAnswer", processAnswer);
+            transMap.put("remark", tbAttachment.getRemark());
             //mq发送消息start
             MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.examPaperImport.name(), transMap, MqEnum.TASK_LOG, String.valueOf(tbTaskHistory.getId()), tbUser.getName());
             mqDtoService.assembleSendOneWayMsg(mqDto);

themis-business/pom.xml

@@ -77,8 +77,9 @@
 			<artifactId>springfox-swagger2</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+			<version>1.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -15,6 +15,8 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,6 +52,7 @@ import cn.hutool.core.date.DateUtil;
  */
 @Service("taskExamPaperImportTemplete")
 public class TaskExamPaperImportTemplete implements TaskImportTemplete {
+	private final static Logger log = LoggerFactory.getLogger(TaskExamPaperImportTemplete.class);
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
     @Resource
     TEExamService teExamService;
@@ -74,8 +77,9 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
             file = taskImportCommon.getUploadFile();
             dispose(file, map, result);
         } catch (Exception e) {
+        	taskImportCommon.setException(true);
+        	log.error("处理出错 ",e);
             addResult(result, "处理出错 " + e.getMessage());
-            throw e;
         } finally {
             if (file != null) {
                 file.delete();
@@ -108,6 +112,8 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
                         disposeCourseDir(dir, teExam, courseDir, map);
                     }
                 }
+            }else {
+            	throw new BusinessException("校验失败");
             }
         } finally {
             FileUtil.deleteFolder(dir);
@@ -146,6 +152,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
         		break;
         	}
         }
+        course.setPaperCount(list.size());
         course.setHasAnswer(hasAnswer);
         teExamCourseService.saveOrUpdate(course);
     }
@@ -175,7 +182,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
                 course.getCourseCode(), paperCode);
         if (paper == null) {
             paper = new TEExamPaper();
-            Long createId = (Long) map.get("createId");
+            Integer createId = (Integer) map.get("createId");
             JSONObject paperJson = JSONObject.parseObject(FileUtil.readFileContent(paperFile));
             paper.setId(Constants.idGen.next());
             paper.setName(paperJson.getString("name"));
@@ -185,7 +192,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
             paper.setExamId(teExam.getId());
             paper.setCode(paperCode);
             paper.setHasAudio(paperJson.getInteger("hasAudio"));
-            paper.setCreateId(createId);
+            paper.setCreateId(Long.parseLong(createId.toString()));
             paper.setCourseCode(course.getCourseCode());
             paper.setDecryptVector(RandomStringUtils.randomAlphanumeric(16));
         }
@@ -198,7 +205,8 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
         if(processAnswer) {
         	disposeAnswer(rootDir, paper, answerFile);
         }
-
+        Integer audioPlayCount = (Integer) map.get("audioPlayCount");
+        paper.setAudioPlayCount(audioPlayCount);
         teExamPaperService.saveOrUpdate(paper);
     }