From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-job/src/main/java/com/java110/job/quartz/TaskSystemQuartz.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 14 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 5dd8f6b..b03d91a
--- 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,8 +1,24 @@
package com.java110.job.quartz;
+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 com.java110.core.log.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author
@@ -10,6 +26,18 @@
public abstract class TaskSystemQuartz {
protected static final Logger logger = LoggerFactory.getLogger(TaskSystemQuartz.class);
+
+ @Autowired
+ private ITaskServiceDao taskServiceDaoImpl;
+
+ @Autowired
+ private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+ @Autowired
+ private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
+ @Autowired
+ private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
public void initTask() {
@@ -22,19 +50,26 @@
* @param taskDto
*/
public void startTask(TaskDto taskDto) throws Exception {
-
- // 杩欎箞鍋氭槸涓轰簡锛屽崟绾跨▼璋冪敤锛岄槻姝㈠绾跨▼瀵艰嚧鏁版嵁閲嶅澶勭悊
- if (!"002".equals(taskDto.getState())) {
- 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);
@@ -44,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;
@@ -77,4 +116,46 @@
protected void after(TaskDto taskDto) {
}
+
+ /**
+ * 鏌ヨ灏忓尯淇℃伅
+ *
+ * @return
+ */
+ protected List<CommunityDto> getAllCommunity() {
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setState("1100"); //瀹℃牳杩囩殑灏忓尯
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+ return communityDtos;
+ }
+
+ /**
+ * 鏌ヨ鍟嗘埛淇℃伅
+ *
+ * @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
+ */
+ protected TaskAttrDto getCurTaskAttr(TaskDto taskDto, String specCd) {
+ List<TaskAttrDto> taskAttrDtos = taskDto.getTaskAttr();
+ for (TaskAttrDto taskAttrDto : taskAttrDtos) {
+ if (specCd.equals(taskAttrDto.getSpecCd())) {
+ return taskAttrDto;
+ }
+ }
+
+ return null;
+ }
}
--
Gitblit v1.8.0