wangliang 4 年之前
父节点
当前提交
e9dcb73af9

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

@@ -7,6 +7,7 @@ import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
+import com.qmth.distributed.print.common.contant.SpringContextHolder;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import com.qmth.distributed.print.common.util.ResultUtil;
@@ -26,8 +27,6 @@ import java.util.StringJoiner;
  */
  */
 @Service
 @Service
 public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemplete {
 public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemplete {
-    @Resource
-    TaskLogicService taskLogicService;
 
 
     public static final String OBJ_TITLE = "考务数据";
     public static final String OBJ_TITLE = "考务数据";
     private final static Logger log = LoggerFactory.getLogger(AsyncExaminationExportTemplateService.class);
     private final static Logger log = LoggerFactory.getLogger(AsyncExaminationExportTemplateService.class);
@@ -42,6 +41,7 @@ public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemple
 
 
 
 
         try {
         try {
+            TaskLogicService taskLogicService = SpringContextHolder.getBean(TaskLogicService.class);
             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));
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", FORMAT_TIME, FINISH_TITLE, result.size(), FINISH_SIZE));
             String path = String.valueOf(result.get("path"));
             String path = String.valueOf(result.get("path"));

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

@@ -6,6 +6,7 @@ import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
+import com.qmth.distributed.print.common.contant.SpringContextHolder;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import com.qmth.distributed.print.common.util.ResultUtil;
@@ -26,9 +27,6 @@ import java.util.StringJoiner;
  */
  */
 @Service
 @Service
 public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemplete {
 public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemplete {
-    @Resource
-    private TaskLogicService taskLogicService;
-
     private final static Logger log = LoggerFactory.getLogger(AsyncExaminationImportTemplateService.class);
     private final static Logger log = LoggerFactory.getLogger(AsyncExaminationImportTemplateService.class);
 
 
     public static final String OBJ_TITLE = "考务数据";
     public static final String OBJ_TITLE = "考务数据";
@@ -44,6 +42,7 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
         tbTask.setStatus(TaskStatusEnum.RUNNING);
         tbTask.setStatus(TaskStatusEnum.RUNNING);
 
 
         try {
         try {
+            TaskLogicService taskLogicService = SpringContextHolder.getBean(TaskLogicService.class);
             Map<String,Object> result = taskLogicService.executeImportExaminationLogic(map);
             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));
             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);
             tbTask.setResult(TaskResultEnum.SUCCESS);