From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java b/service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java
old mode 100644
new mode 100755
index 33047db..aa278f8
--- a/service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java
+++ b/service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java
@@ -1,10 +1,17 @@
package com.java110.job.quartz;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
+import com.java110.dto.logSystemError.LogSystemErrorDto;
+import com.java110.dto.store.StoreDto;
import com.java110.dto.task.TaskDto;
import com.java110.dto.taskAttr.TaskAttrDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.job.dao.ITaskServiceDao;
+import com.java110.po.logSystemError.LogSystemErrorPo;
+import com.java110.service.smo.ISaveSystemErrorSMO;
+import com.java110.utils.util.ExceptionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +33,12 @@
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+ @Autowired
+ private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
+ @Autowired
+ private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
+
public void initTask() {
@@ -37,26 +50,26 @@
* @param taskDto
*/
public void startTask(TaskDto taskDto) throws Exception {
-
- Map info = new HashMap();
- info.put("taskId", taskDto.getTaskId());
- List<Map> taskInfos = taskServiceDaoImpl.getTaskInfo(info);
- if (taskInfos == null || taskInfos.size() < 1) {
- return;
- }
-
- // 杩欎箞鍋氭槸涓轰簡锛屽崟绾跨▼璋冪敤锛岄槻姝㈠绾跨▼瀵艰嚧鏁版嵁閲嶅澶勭悊
- if (!"002".equals(taskInfos.get(0).get("state"))) {
- return;
- }
-
- String taskId = taskDto.getTaskId();
-
- if (logger.isDebugEnabled()) {
- logger.debug("---銆怲askSystemQuartz.startFtpTask銆戯細浠诲姟銆�" + taskId + "銆戝紑濮嬭繍琛岋紒", taskId);
- }
-
try {
+ Map info = new HashMap();
+ info.put("taskId", taskDto.getTaskId());
+ List<Map> taskInfos = taskServiceDaoImpl.getTaskInfo(info);
+ if (taskInfos == null || taskInfos.size() < 1) {
+ return;
+ }
+
+ // 杩欎箞鍋氭槸涓轰簡锛屽崟绾跨▼璋冪敤锛岄槻姝㈠绾跨▼瀵艰嚧鏁版嵁閲嶅澶勭悊
+ if (!"002".equals(taskInfos.get(0).get("state"))) {
+ return;
+ }
+
+ String taskId = taskDto.getTaskId();
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("---銆怲askSystemQuartz.startFtpTask銆戯細浠诲姟銆�" + taskId + "銆戝紑濮嬭繍琛岋紒", taskId);
+ }
+
+
// 1.0绌烘柟娉曪紝璁╁瓙绫诲幓瀹炵幇
prepare(taskDto);
@@ -66,7 +79,11 @@
// 5.0绌烘柟娉曪紝璁╁瓙绫诲幓瀹炵幇
after(taskDto);
} catch (Exception ex) {
-
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(ex));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
// 鎺ョ画鍚戝鎶涘嚭鍘�
logger.error("澶勭悊鍑虹幇闂锛�", ex);
return;
@@ -113,7 +130,20 @@
}
/**
+ * 鏌ヨ鍟嗘埛淇℃伅
+ *
+ * @return
+ */
+ protected List<StoreDto> getAllStore(String storeTypeCd) {
+ StoreDto storeDto = new StoreDto();
+ storeDto.setStoreTypeCd(storeTypeCd);
+ List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
+ return storeDtos;
+ }
+
+ /**
* 鑾峰彇褰撳墠灞炴��
+ *
* @param taskDto
* @param specCd
* @return
--
Gitblit v1.8.0