From 37575a4531124ac9c3413f4ed58b60b588d1e908 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 09 九月 2019 15:44:54 +0800
Subject: [PATCH] JOB测试 功能以完成 使用业务模板时有问题 调试中
---
JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java b/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
index 75d0c9f..a772d0b 100644
--- a/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
+++ b/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
@@ -2,9 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.util.SpringBeanInvoker;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.job.common.CustomizedPropertyPlaceholderConfigurer;
import com.java110.job.dao.IHcFtpFileDAO;
import com.java110.job.smo.DownloadFileFromFtpToTable;
import com.java110.job.task.HcFtpToFileSystemJob;
@@ -22,7 +20,6 @@
import java.util.*;
/**
- * 灏唂tp涓婄殑鏂囦欢淇濆瓨鍒版敮鎸佺殑鏂囦欢绯荤粺
*
* @author wuxw7 add by 20170103
* shiyj update by 2019.08.29
@@ -36,6 +33,7 @@
private static final String defaultCronExpression = "0 * * * * ?";// 姣忓垎閽熸墽琛屼竴娆�
private static final String prefixJobName = "HcFtpToSystem_"; // job
+ private static final String triggerNames = "HcFtpToData_"; // job
// 鍚嶇О鍓嶇紑锛岄槻姝㈠拰鍏朵粬鐨刯ob鍚嶇О浜х敓鍐茬獊
private static final String RUNFLAG_START = "1";
@@ -134,9 +132,9 @@
// 鏁版嵁瑙勮寖鎬ф牎楠�
Object dealClassObj = null;
- // 鍦╬rvncCrm.properties 鏂囦欢涓幏鍙栧搴斿鐞嗙被
+ //鐩墠鍐欐浠�
if ("DT".equals(paramIn.get("uOrD").toString())) {
- dealClassObj = DownloadFileFromFtpToTable.class;
+ dealClassObj = "downloadFileFromFtpToTable";
}else{
resultMsg = this.createResultMsg("1999", "瀵瑰簲妯℃澘涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳", "");
return resultMsg;
@@ -185,7 +183,7 @@
*
* @return
*/
- public String editFtpItem(HttpServletRequest request) {
+ public JSONObject editFtpItem(HttpServletRequest request) {
// 璇锋眰鍙傛暟涓簕"taskId":"12","taskName":"缁忓姙浜虹収鐗囧悓姝ュ鐞�","ftpUserName":"weblogic",.....}
String ftpItemJson = request.getParameter("ftpItemJson");
@@ -196,18 +194,25 @@
} catch (Exception e) {
logger.error("浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, "");
- return "editFtpItem";
+ return resultMsg;
}
// 灏唂tpItemJson瑁呬负Map淇濆瓨鎿嶄綔
Map paramIn = JSONObject.parseObject(ftpItemJsonObj.getJSONObject("taskInfo").toJSONString(), Map.class);
- // 鍦╬rvncCrm.properties 鏂囦欢涓幏鍙栧搴斿鐞嗙被
- Object dealClassObj = CustomizedPropertyPlaceholderConfigurer.getContextProperty("task.deal.class." + paramIn.get("uOrD"));
+
+ Object dealClassObj = null;
+ //鐩墠鍐欐浠�
+ if ("DT".equals(paramIn.get("uOrD").toString())) {
+ dealClassObj = "downloadFileFromFtpToTable";
+ }else{
+ resultMsg = this.createResultMsg("1999", "瀵瑰簲妯℃澘涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳", "");
+ return resultMsg;
+ }
// Object dealClassObj = "provInner.DownloadFileFromFtpToTFS";
if (dealClassObj == null) {
resultMsg = this.createResultMsg("1999", "瀵瑰簲妯℃澘涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳", "");
- return "editFtpItem";
+ return resultMsg;
}
String dealClass = dealClassObj.toString();
@@ -239,13 +244,13 @@
} else {
resultMsg = this.createResultMsg("1999", "鏇存柊灞炴�уけ璐�", "");
}
- return "editFtpItem";
+ return resultMsg;
}
resultMsg = this.createResultMsg("1999", "淇敼鐨勬暟鎹笉瀛樺湪鎴栦慨鏀瑰け璐�", "");
- return "editFtpItem";
+ return resultMsg;
}
resultMsg = this.createResultMsg("1999", "鏈壘鍒板搴旂殑鏁版嵁鏇存柊澶辫触銆�" + paramIn.get("taskId") + "銆�", "");
- return "editFtpItem";
+ return resultMsg;
}
/**
@@ -253,7 +258,7 @@
*
* @return
*/
- public String deleteFtpItem(HttpServletRequest request) {
+ public JSONObject deleteFtpItem(HttpServletRequest request) {
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"DELETE"}
String ftpItemJson = request.getParameter("ftpItemJson");
@@ -269,21 +274,21 @@
} catch (Exception e) {
logger.error("浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson + e, "");
- return "deleteFtpItem";
+ return resultMsg;
}
// 浼犲叆鎶ユ枃涓嶄负绌�
if (paramIn == null || !paramIn.containsKey("tasks") || !paramIn.containsKey("state")) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(蹇呴』鍖呭惈tasks 鍜� state鑺傜偣)锛�" + ftpItemJson, "");
- return "deleteFtpItem";
+ return resultMsg;
}
// 鏍￠獙褰撳墠鏄惁涓哄惎鍔ㄤ睛鍚�
if (!"DELETE".equals(paramIn.get("state"))) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(state鐨勫�煎繀椤绘槸DELETE)锛�" + ftpItemJson, "");
- return "deleteFtpItem";
+ return resultMsg;
}
// 鏌ヨ闇�瑕佹搷浣滅殑浠诲姟
@@ -304,12 +309,12 @@
int updateFtpItemFlag = iHcFtpFileDAO.deleteFtpItemByTaskId(paramInfo);
if (updateFtpItemFlag > 0) {
resultMsg = this.createResultMsg("0000", "鎴愬姛", ftpItemJson);
- return "deleteFtpItem";
+ return resultMsg;
}
resultMsg = this.createResultMsg("1999", "鍒犻櫎鏁版嵁宸茬粡涓嶅瓨鍦紝鎴栧垹闄ゅけ璐�", "");
- return "deleteFtpItem";
+ return resultMsg;
}
/**
@@ -425,7 +430,7 @@
*
* @return
*/
- public String startJob(HttpServletRequest request) {
+ public JSONObject startJob(HttpServletRequest request) {
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"START"}
String ftpItemJson = request.getParameter("ftpItemJson");
@@ -439,21 +444,21 @@
} catch (Exception e) {
logger.error("浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, "");
- return "startJob";
+ return resultMsg;
}
// 浼犲叆鎶ユ枃涓嶄负绌�
if (paramIn == null || !paramIn.containsKey("tasks") || !paramIn.containsKey("state")) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(蹇呴』鍖呭惈tasks 鍜� state鑺傜偣)锛�" + ftpItemJson, "");
- return "startJob";
+ return resultMsg;
}
// 鏍￠獙褰撳墠鏄惁涓哄惎鍔ㄤ睛鍚�
if (!"START".equals(paramIn.get("state"))) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(state鐨勫�煎繀椤绘槸START)锛�" + ftpItemJson, "");
- return "startJob";
+ return resultMsg;
}
// 鏌ヨ闇�瑕佹搷浣滅殑浠诲姟
@@ -475,8 +480,6 @@
List<Map> doFtpItems = iHcFtpFileDAO.queryFtpItemsByTaskIds(info);
- // 鑾峰彇Spring璋冨害鍣�
- Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
int linstenCount = 0;
int updateTaskStateFailCount = 0;
try {
@@ -496,11 +499,11 @@
String jobName = prefixJobName + taskId;
- String triggerName = prefixJobName + taskId;
+ String triggerName = triggerNames + taskId;
//璁剧疆浠诲姟鍚嶇О
- JobKey jobKey = new JobKey(jobName);
- JobDetail jobDetail = scheduler.getJobDetail(jobKey); // 璇存槑杩欎釜娌℃湁鍚姩锛屽垯闇�瑕侀噸鏂板惎鍔紝濡傛灉鍚姩鐫�涓嶅仛澶勭悊
+ JobKey jobKey = new JobKey(jobName,HcFtpToFileSystemJob.JOB_GROUP_NAME);
+ JobDetail jobDetail = scheduler.getJobDetail(jobKey);
if (jobDetail == null) {
// 浠诲姟鍚嶇О
@@ -513,7 +516,7 @@
warnJob.getJobDataMap().put(HcFtpToFileSystemJob.JOB_DATA_TASK_ID, taskId);
// 瑙﹀彂鏃堕棿鐐�
- CronTrigger warnTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName, triggerName).withSchedule(cronScheduleBuilder).build();
+ CronTrigger warnTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName, triggerName+"_group").withSchedule(cronScheduleBuilder).build();
// 閿欒繃鎵ц鍚庯紝绔嬪嵆鎵ц
//warnTrigger(CronTrigger.MISFIRE_INSTRUCTION_FIRE_ONCE_NOW);
@@ -545,13 +548,13 @@
// TODO Auto-generated catch block
logger.error("璋冨害鍣ㄥ惎鍔ㄥ嚭閿欙細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "璋冨害鍣ㄥ惎鍔ㄥ嚭閿欙細" + e, "");
- return "startJob";
+ return resultMsg;
}
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.startJob銆戝嚭鍙備负锛�" + resultMsg, resultMsg);
}
- return "startJob";
+ return resultMsg;
}
/**
@@ -559,7 +562,7 @@
*
* @return
*/
- public String stopJob(HttpServletRequest request) {
+ public JSONObject stopJob(HttpServletRequest request) {
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"STOP"}
String ftpItemJson = request.getParameter("ftpItemJson");
@@ -573,21 +576,21 @@
} catch (Exception e) {
logger.error("浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, "");
- return "stopJob";
+ return resultMsg;
}
// 浼犲叆鎶ユ枃涓嶄负绌�
if (paramIn == null || !paramIn.containsKey("tasks") || !paramIn.containsKey("state")) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(蹇呴』鍖呭惈tasks 鍜� state鑺傜偣)锛�" + ftpItemJson, "");
- return "stopJob";
+ return resultMsg;
}
// 鏍￠獙褰撳墠鏄惁涓哄惎鍔ㄤ睛鍚�
if (!"STOP".equals(paramIn.get("state"))) {
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭�(state鐨勫�煎繀椤绘槸START)锛�" + ftpItemJson, "");
- return "stopJob";
+ return resultMsg;
}
// 鏌ヨ闇�瑕佹搷浣滅殑浠诲姟
@@ -608,9 +611,6 @@
info.put("taskIds", taskIds.split(","));
List<Map> doFtpItems = iHcFtpFileDAO.queryFtpItemsByTaskIds(info);
-
- // 鑾峰彇Spring璋冨害鍣�
- Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
int linstenCount = 0;
int updateTaskStateFailCount = 0;
@@ -660,13 +660,13 @@
// TODO Auto-generated catch block
logger.error("璋冨害鍣ㄥ仠姝㈠嚭閿欙細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "璋冨害鍣ㄥ仠姝㈠嚭閿欙細" + e, "");
- return "stopJob";
+ return resultMsg;
}
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.startJob銆戝嚭鍙備负锛�" + resultMsg, resultMsg);
}
- return "stopJob";
+ return resultMsg;
}
/**
@@ -721,7 +721,7 @@
for (Map ftpItemMap : ftpItems) {
// 澶勭悊鏃堕棿鏄剧ず鍜岀晫闈㈡樉绀轰紶杈撶被鍨�
- ftpItemMap.put("U_OR_D_NAME", CustomizedPropertyPlaceholderConfigurer.getContextProperty("task.tamplete.name." + ftpItemMap.get("U_OR_D")));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
+ ftpItemMap.put("U_OR_D_NAME", ftpItemMap.get("U_OR_D"));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
ftpItemMap.put("CREATE_DATE", df.format(ftpItemMap.get("CREATE_DATE")));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
rows.add(JSONObject.parseObject(JSONObject.toJSONString(ftpItemMap)));
}
--
Gitblit v1.8.0