update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationExportTemplateService.java

@@ -5,10 +5,8 @@ import com.qmth.distributed.print.business.entity.TBTask;
 import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
-import com.qmth.distributed.print.business.service.ExamDetailService;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.business.util.OssUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
@@ -28,10 +26,6 @@ import java.util.StringJoiner;
  */
 @Service
 public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemplete {
-    @Resource
-    ExamDetailService examDetailService;
-    @Resource
-    OssUtil ossUtil;
     @Resource
     TaskLogicService taskLogicService;
 
@@ -39,10 +33,8 @@ public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemple
     private final static Logger log = LoggerFactory.getLogger(AsyncExaminationExportTemplateService.class);
 
     @Override
-    public Result exportTask(Map<String, Object> map) throws Exception {
+    public Result exportTask(Map<String, Object> map) {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
-        Long userId = tbTask.getCreateId();
-        Long schoolId = tbTask.getSchoolId();
 
         StringJoiner stringJoinerSummary = new StringJoiner("\n")
                 .add(MessageFormat.format("{0}{1}{2}", FORMAT_TIME, BEGIN_TITLE, OBJ_TITLE));
@@ -50,7 +42,7 @@ public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemple
 
 
         try {
-            Map<String,Object> result = taskLogicService.executeExaminationLogic(map);
+            Map<String, Object> result = taskLogicService.executeExaminationLogic(map);
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", FORMAT_TIME, FINISH_TITLE, result.size(), FINISH_SIZE));
             String path = String.valueOf(result.get("path"));
             System.out.println("path = " + path);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -46,8 +46,8 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
         tbTask.setStatus(TaskStatusEnum.RUNNING);
 
         try {
-            taskLogicService.executeImportExaminationLogic(map);
-            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", FORMAT_TIME, FINISH_TITLE, 111, FINISH_SIZE));
+            Map<String,Object> result = taskLogicService.executeImportExaminationLogic(map);
+            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", FORMAT_TIME, FINISH_TITLE, Long.valueOf(String.valueOf(result.get("dataCount"))), FINISH_SIZE));
             tbTask.setResult(TaskResultEnum.SUCCESS);
         }catch (Exception e){
             log.error("请求出错", e);

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.templete.service;
 
-import com.qmth.distributed.print.business.entity.TBTask;
 import org.springframework.util.LinkedMultiValueMap;
 
 import java.io.IOException;

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

@@ -282,7 +282,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Map<String, Object> executeExaminationLogic(Map<String, Object> map) throws Exception {
-//        printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode,
         Long printPlanId = null;
         if (map.get("printPlanId") != null) {
             printPlanId = SystemConstant.convertIdToLong(String.valueOf(map.get("printPlanId")));
@@ -519,6 +518,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             String checkPaperNumber = String.valueOf(stringObjectMap.get("paperNumber"));
             commonService.checkData(checkSchoolId, checkCourseCode, checkPaperNumber);
         }
-        return null;
+        map.put("dataCount",dataList.size());
+        return map;
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/AuthUtil.java

@@ -154,9 +154,11 @@ public class AuthUtil {
         }
         //系统公用接口不拦截
         List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
-        int sysCount = (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
-        if (sysCount > 0) {
-            return true;
+        if (Objects.nonNull(sysUrls)) {
+            int sysCount = (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
+            if (sysCount > 0) {
+                return true;
+            }
         }
         Set<String> urls = authBean.getUrls();
         int privilegeCount = (int) urls.stream().filter(s -> s.equalsIgnoreCase(url)).count();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ConvertUtil.java

@@ -1,16 +1,26 @@
 package com.qmth.distributed.print.business.util;
 
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 import java.io.*;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description: 转换工具类
  * @Author: CaoZixuan
- * @Date:
+ * @Date: 2021-04-14
  */
+
+@Component
 public class ConvertUtil {
+
+    @Resource
+    RedisTemplate<String, Object> redisTemplate;
+
     // inputStream转outputStream
     public static ByteArrayOutputStream parse(final InputStream in) throws Exception {
         final ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
@@ -74,4 +84,28 @@ public class ConvertUtil {
         timeMap.put("endTime",endTime);
         return timeMap;
     }
+
+    /**
+     * 获取递增的序列号
+     *
+     * @param prefix 生成序列号的前缀
+     * @return
+     */
+    public String getIncre(String prefix) {
+        //序列号前缀加特定标识，如系统模块名之类的 防止重复
+        String key = "SCM_DAMLL" + prefix;
+        String increResult = null;
+        try {
+            //如果该key不存在 会自动创建，值为第二个参数delta
+            //最终调用的还是jedis的incrBy(byte[] key, long value)方法
+            Long increNum = redisTemplate.opsForValue().increment(key, 1);
+            //不足补位
+            increResult = prefix + String.format("%1$06d", increNum);
+        } catch (Exception e) {
+            System.out.println("获取序列号失败");
+            /*这里可以根据需求手动生成一个不重复的单号，
+             * */
+        }
+        return increResult;
+    }
 }

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

@@ -140,7 +140,6 @@ public class ExamDetailController {
         examDetailService.downLoadExaminationTemplate(schoolId, ServletUtil.getResponse());
     }
 
-    // TODO: 2021/4/10  
     @ApiOperation(value = "考务数据导入-结果导出")
     @RequestMapping(value = "/data_export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
@@ -149,7 +148,7 @@ public class ExamDetailController {
                            @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                            @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
                            @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
-                           @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) throws Exception {
+                           @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT);
         map.put("printPlanId",printPlanId);
         map.put("courseCode",courseCode);