Merge branch 'dev' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/DownloadFileEnum.java

@@ -11,7 +11,7 @@ import java.util.Objects;
  */
 public enum DownloadFileEnum {
 
-    IMPORTFILE("导入文件"),
+    IMPORT_FILE("导入文件"),
 
     REPORT("报告文件"),
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPrintPlanServiceImpl.java

@@ -226,7 +226,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus())){
             throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除 status = " + examPrintPlan.getStatus());
         }
-        return this.removeById(id);
+        this.removeById(id);
+        examDetailService.deleteExaminationData(id);
+        return true;
     }
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -99,7 +99,6 @@ public abstract class AsyncExportTaskTemplete {
             String result = json.toJSONString();
             System.out.println(result);
 
-            tbTask.setResult(TaskResultEnum.SUCCESS);
             tbTask.setReportFilePath(json.toJSONString());
         } catch (Exception e) {
             log.error("请求出错", e);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.Async;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
@@ -91,6 +92,18 @@ public abstract class AsyncImportTaskTemplete {
         InputStream inputStream = null;
         try {
             JSONObject jsonObject = JSONObject.parseObject(tbTask.getImportFilePath());
+            if (Objects.isNull(jsonObject)) {
+                jsonObject = new JSONObject();
+                LocalDateTime nowTime = LocalDateTime.now();
+                StringJoiner stringJoiner = new StringJoiner("");
+                stringJoiner.add(UploadFileEnum.FILE.getTitle()).add(File.separator);
+                stringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getDayOfMonth()))
+                        .add(File.separator).add(SystemConstant.getUuid()).add(TXT_PREFIX);
+                jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
+            }
             String path = (String) jsonObject.get(SystemConstant.PATH);
             String type = (String) jsonObject.get(SystemConstant.TYPE);
 
@@ -120,7 +133,6 @@ public abstract class AsyncImportTaskTemplete {
             json.put(SystemConstant.TYPE, type);
             json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
 
-            tbTask.setResult(TaskResultEnum.SUCCESS);
             tbTask.setReportFilePath(json.toJSONString());
         } catch (Exception e) {
             log.error("请求出错", e);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -337,7 +337,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         ossUtil.ossUpload(dirName, in, null);
         jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
         jsonObject.put(SystemConstant.PATH, dirName);
-        jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE.getTitle());
+        jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         map.put("path", jsonObject.toString());
         return map;
     }
@@ -434,16 +434,22 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 int index = fieldsDto.getIndex();
                 String level = fieldsDto.getLevel();
                 if ("学号".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     studentCode = row.getCell(index).getStringCellValue();
                 } else if ("姓名".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     studentName = row.getCell(index).getStringCellValue();
                 } else if ("课程代码".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     courseCode = row.getCell(index).getStringCellValue();
                 } else if ("课程名称".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     courseName = row.getCell(index).getStringCellValue();
                 } else if ("考点".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     examPlace = row.getCell(index).getStringCellValue();
                 } else if ("考场".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     examRoom = row.getCell(index).getStringCellValue();
                 } else if ("考试日期".equals(name)) {
                     row.getCell(index).setCellType(CellType.STRING);
@@ -452,6 +458,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     row.getCell(index).setCellType(CellType.STRING);
                     examTime = row.getCell(index).getStringCellValue();
                 } else if ("试卷编号".equals(name)) {
+                    row.getCell(index).setCellType(CellType.STRING);
                     paperNumber = row.getCell(index).getStringCellValue();
                 } else {
                     if ("primary".equals(level)) {
@@ -504,7 +511,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         // 组装exam_student数据
         examDetailService.disposeExamStudentByExaminationExcel(dataList, userId);
 
-        // TODO: 2021/4/13 调用检验接口 dataList按照schoolId,courseCode,paperNumber归集
         List<Map<String, Object>> checkList = dataList.stream().flatMap(e -> {
             Map<String, Object> tmp = new HashMap<>();
             tmp.put("schoolId", e.get("schoolId"));

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -143,7 +143,7 @@ public class ExamDetailController {
     @ApiOperation(value = "考务数据导入-结果导出")
     @RequestMapping(value = "/data_export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    public void dataExport(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
+    public Result dataExport(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
                            @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
                            @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                            @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
@@ -158,7 +158,8 @@ public class ExamDetailController {
         map.put("packageCode",packageCode);
         asyncExaminationExportTemplateService
                 .exportTask(map);
-//        TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;
+        TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;
+        return Objects.nonNull(tbTask) ? ResultUtil.ok(tbTask.getId()) : ResultUtil.error("创建任务失败");
     }
 }