...

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/ExamStudentImportController.java

@@ -24,13 +24,17 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import com.google.common.collect.Lists;
+
 import cn.com.qmth.examcloud.commons.base.util.DateUtil;
 import cn.com.qmth.examcloud.commons.base.util.DateUtil.DatePatterns;
 import cn.com.qmth.examcloud.commons.base.util.PathUtil;
+import cn.com.qmth.examcloud.commons.web.helpers.page.PageInfo;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
+import cn.com.qmth.examcloud.task.api.controller.bean.ExamStudentImportDomain;
 import cn.com.qmth.examcloud.task.dao.ExamStudentImportRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
 import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
@@ -106,7 +110,7 @@ public class ExamStudentImportController extends ControllerSupport {
 
 	@ApiOperation(value = "查询所有用户", notes = "")
 	@GetMapping("/all/{curPage}/{pageSize}")
-	public Page<ExamStudentImportEntity> getExamStudentImportList(@PathVariable Integer curPage,
+	public PageInfo<ExamStudentImportDomain> getExamStudentImportList(@PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
@@ -123,7 +127,27 @@ public class ExamStudentImportController extends ControllerSupport {
 		Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "updateTime");
 		Page<ExamStudentImportEntity> list = examStudentImportRepo.findAll(specification, pageable);
 
-		return list;
+		List<ExamStudentImportDomain> ret = Lists.newArrayList();
+
+		for (ExamStudentImportEntity cur : list) {
+			ExamStudentImportDomain domain = new ExamStudentImportDomain();
+			domain.setBatchId(cur.getBatchId());
+			domain.setExamId(cur.getExamId());
+			domain.setFailNum(cur.getFailNum());
+			domain.setFileName(cur.getFileName());
+			domain.setFilePath(cur.getFilePath());
+			domain.setId(cur.getId());
+			domain.setResultFilePath(cur.getResultFilePath());
+			domain.setRootOrgId(cur.getRootOrgId());
+			domain.setStatus(cur.getStatus().name());
+			domain.setStatusDesc(cur.getStatus().getDesc());
+			domain.setSuccessNum(cur.getSuccessNum());
+			domain.setTotalNum(cur.getTotalNum());
+
+			ret.add(domain);
+		}
+
+		return new PageInfo<ExamStudentImportDomain>(list, ret);
 	}
 
 }

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/bean/ExamStudentImportDomain.java

@@ -0,0 +1,174 @@
+package cn.com.qmth.examcloud.task.api.controller.bean;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 考生导入
+ *
+ * @author WANGWEI
+ * @date 2018年7月13日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ExamStudentImportDomain implements JsonSerializable {
+
+	private static final long serialVersionUID = -3080614059689123498L;
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	/**
+	 * 批次ID
+	 */
+	private Long batchId;
+
+	/**
+	 * 考试ID
+	 */
+	private Long examId;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 状态
+	 */
+	private String status;
+
+	/**
+	 * 状态描述
+	 */
+	private String statusDesc;
+
+	/**
+	 * 文件名
+	 */
+	private String fileName;
+
+	/**
+	 * 文件路径
+	 */
+	private String filePath;
+
+	/**
+	 * 结果通知文件
+	 */
+	private String resultFilePath;
+
+	/**
+	 * 总条数
+	 */
+	private Long totalNum;
+
+	/**
+	 * 成功条数
+	 */
+	private Long successNum;
+
+	/**
+	 * 失败条数
+	 */
+	private Long failNum;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getBatchId() {
+		return batchId;
+	}
+
+	public void setBatchId(Long batchId) {
+		this.batchId = batchId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getStatusDesc() {
+		return statusDesc;
+	}
+
+	public void setStatusDesc(String statusDesc) {
+		this.statusDesc = statusDesc;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+
+	public String getResultFilePath() {
+		return resultFilePath;
+	}
+
+	public void setResultFilePath(String resultFilePath) {
+		this.resultFilePath = resultFilePath;
+	}
+
+	public Long getTotalNum() {
+		return totalNum;
+	}
+
+	public void setTotalNum(Long totalNum) {
+		this.totalNum = totalNum;
+	}
+
+	public Long getSuccessNum() {
+		return successNum;
+	}
+
+	public void setSuccessNum(Long successNum) {
+		this.successNum = successNum;
+	}
+
+	public Long getFailNum() {
+		return failNum;
+	}
+
+	public void setFailNum(Long failNum) {
+		this.failNum = failNum;
+	}
+
+}

examcloud-task-dao/src/main/java/cn/com/qmth/examcloud/task/dao/entity/ExamStudentImportEntity.java

@@ -51,9 +51,9 @@ public class ExamStudentImportEntity extends JpaEntity {
 	private ExamStudentImportStatus status;
 
 	/**
-	 * 状态描述
+	 * 错误描述
 	 */
-	private String statusDesc;
+	private String errorDesc;
 
 	/**
 	 * 文件名
@@ -125,12 +125,12 @@ public class ExamStudentImportEntity extends JpaEntity {
 		this.status = status;
 	}
 
-	public String getStatusDesc() {
-		return statusDesc;
+	public String getErrorDesc() {
+		return errorDesc;
 	}
 
-	public void setStatusDesc(String statusDesc) {
-		this.statusDesc = statusDesc;
+	public void setErrorDesc(String errorDesc) {
+		this.errorDesc = errorDesc;
 	}
 
 	public String getFileName() {

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportDataProcessingTask.java

@@ -125,7 +125,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 		} catch (IOException e) {
 			debugLog.error("导入报告写入失败", e);
 			importEntity.setStatus(ExamStudentImportStatus.ERROR);
-			importEntity.setStatusDesc("导入报告写入失败");
+			importEntity.setErrorDesc("导入报告写入失败");
 			examStudentImportRepo.saveAndFlush(importEntity);
 			return;
 		}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportParsingFileTask.java

@@ -74,7 +74,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 		} catch (Exception e) {
 			debugLog.error("文件解析入库异常", e);
 			importEntity.setStatus(ExamStudentImportStatus.ERROR);
-			importEntity.setStatusDesc(e.getMessage());
+			importEntity.setErrorDesc(e.getMessage());
 			examStudentImportRepo.saveAndFlush(importEntity);
 			return;
 		}
@@ -96,7 +96,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 
 		if (!file.exists()) {
 			importEntity.setStatus(ExamStudentImportStatus.ERROR);
-			importEntity.setStatusDesc("文件不存在");
+			importEntity.setErrorDesc("文件不存在");
 			examStudentImportRepo.saveAndFlush(importEntity);
 			return;
 		}
@@ -111,7 +111,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 
 		if (CollectionUtils.isEmpty(lineList)) {
 			importEntity.setStatus(ExamStudentImportStatus.ERROR);
-			importEntity.setStatusDesc("Excel 没有内容");
+			importEntity.setErrorDesc("Excel 没有内容");
 			examStudentImportRepo.saveAndFlush(importEntity);
 			return;
 		}
@@ -129,7 +129,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 			if (0 == i) {
 				if (headerError(line)) {
 					importEntity.setStatus(ExamStudentImportStatus.ERROR);
-					importEntity.setStatusDesc("EXCEL表头错误");
+					importEntity.setErrorDesc("EXCEL表头错误");
 					examStudentImportRepo.saveAndFlush(importEntity);
 					return;
 				}
@@ -180,7 +180,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 			FileUtils.writeStringToFile(resultFile, sb.toString(), "UTF-8", true);
 		} catch (IOException e) {
 			importEntity.setStatus(ExamStudentImportStatus.ERROR);
-			importEntity.setStatusDesc("导入报告写入失败");
+			importEntity.setErrorDesc("导入报告写入失败");
 			examStudentImportRepo.saveAndFlush(importEntity);
 			return;
 		}