From 7d8c79cd05aa3f729ded1e66563129c18734eb3c Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期六, 31 八月 2019 14:04:40 +0800
Subject: [PATCH] 新增功能调试第一版
---
JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java | 218 ++++++++++++++++++++++++++----------------------------
1 files changed, 104 insertions(+), 114 deletions(-)
diff --git a/JobService/src/main/java/com/java110/job/Api/PrvncFtpToFileSystemConfigAction.java b/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
similarity index 77%
rename from JobService/src/main/java/com/java110/job/Api/PrvncFtpToFileSystemConfigAction.java
rename to JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
index ef2e817..22774c4 100644
--- a/JobService/src/main/java/com/java110/job/Api/PrvncFtpToFileSystemConfigAction.java
+++ b/JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
@@ -3,17 +3,17 @@
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.IPrvncFtpFileDAO;
-import com.java110.job.task.PrvncFtpToFileSystemJob;
+import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.task.HcFtpToFileSystemJob;
import org.apache.commons.validator.GenericValidator;
import org.apache.commons.validator.util.ValidatorUtils;
-
import org.quartz.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.text.DateFormat;
@@ -22,58 +22,57 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
/**
* 灏唂tp涓婄殑鏂囦欢淇濆瓨鍒版敮鎸佺殑鏂囦欢绯荤粺
- *
+ *
* @author wuxw7 add by 20170103
- *
+ * shiyj update by 2019.08.29
+ *
*/
-@RestController
-public class PrvncFtpToFileSystemConfigAction{
+@Service
+public class HcFtpToFileSystemConfigAction {
- private static final Logger logger = LoggerFactory.getLogger(PrvncFtpToFileSystemConfigAction.class);
+ private static final Logger logger = LoggerFactory.getLogger(HcFtpToFileSystemConfigAction.class);
private static final String defaultCronExpression = "0 * * * * ?";// 姣忓垎閽熸墽琛屼竴娆�
- private static final String prefixJobName = "PrvncFtpToSystem_"; // job
+ private static final String prefixJobName = "HcFtpToSystem_"; // job
// 鍚嶇О鍓嶇紑锛岄槻姝㈠拰鍏朵粬鐨刯ob鍚嶇О浜х敓鍐茬獊
private static final String RUNFLAG_START = "1";
private static final String RUNFLAG_STOP = "0";
+
@Autowired
- private IPrvncFtpFileDAO iprvncFtpFileDAO;
+ private IHccFtpFileDAO iprvncFtpFileDAO;
+ @Autowired
+ private Scheduler scheduler;
+
// 姣忛〉鏁版嵁鏉℃暟
private static int pageSize = 20;
public JSONObject resultMsg;
- @Autowired
- private Scheduler scheduler;
-
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
/**
* 鏌ヨ閰嶇疆鐨勯渶瑕佷笅杞戒换鍔＄殑鍒楄〃
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/queryFtpItems" , method = RequestMethod.POST)
- public String queryFtpItems(@RequestBody String queryftpinfo,HttpServletRequest request) {
+ public JSONObject queryFtpItems(HttpServletRequest request) {
- JSONObject queryftp = JSONObject.parseObject(queryftpinfo);
- String curPage = queryftp.getString("curPage");
+ String curPage = request.getParameter("curPage");
curPage = curPage == null || "".equals(curPage) ? "1" : curPage;
// 鏌ヨ鍦ㄧ敤鐘舵�佹椂鐨勪笅杞戒换鍔″垪琛�
Map info = new HashMap();
- info.put("curPage", curPage);
- info.put("pageSize", pageSize);
- Map resultInfo = getPrvncFtpFileDAO().queryFtpItems(info);
+ info.put("curPage", (Integer.parseInt(curPage)-1)*pageSize);
+ info.put("pageSize", pageSize*Integer.parseInt(curPage));
+ Map resultInfo = iprvncFtpFileDAO.queryFtpItems(info);
// 鑾峰彇鎬绘暟鎹暟
int dataCount = resultInfo.get("ITEMSCOUNT") == null ? 0 : Integer.parseInt(resultInfo.get("ITEMSCOUNT").toString());
@@ -99,29 +98,28 @@
// 澶勭悊鏃堕棿鏄剧ず鍜岀晫闈㈡樉绀轰紶杈撶被鍨�
Map ftpItemMap = ftpItems.get(itemIndex);
- ftpItemMap.put("U_OR_D_NAME", "task.tamplete.name." + ftpItemMap.get("U_OR_D"));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
+ ftpItemMap.put("U_OR_D_NAME", CustomizedPropertyPlaceholderConfigurer.getContextProperty("task.tamplete.name." + ftpItemMap.get("U_OR_D")));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
ftpItemMap.put("CREATE_DATE", df.format(ftpItemMap.get("CREATE_DATE")));// 鏆備笖鍐欐锛屾渶缁堣繕鏄鍙栭厤缃�
rows.add(JSONObject.parseObject(JSONObject.toJSONString(ftpItems.get(itemIndex))));
}
data.put("rows", rows);
resultMsg = data;
- return data.toString();
+ return data;
}
data.put("rows", "[]");
resultMsg = data;
- return data.toString();
+ return data;
}
/**
* 澧炲姞Ftp閰嶇疆
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/addFtpItem" , method = RequestMethod.POST)
- public String addFtpItem(@RequestBody String addFtpIteminfo,HttpServletRequest request) {
- JSONObject addFtpItem = JSONObject.parseObject(addFtpIteminfo);
+ public JSONObject addFtpItem(HttpServletRequest request) {
+
// 璇锋眰鍙傛暟
- String ftpItemJson = addFtpItem.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
JSONObject ftpItemJsonObj = null;
try {
// 鏍￠獙鏍煎紡鏄惁姝ｇ‘
@@ -129,29 +127,34 @@
} catch (Exception e) {
logger.error("浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, e);
resultMsg = createResultMsg("1999", "浼犲叆鍙傛暟鏍煎紡涓嶆纭細" + ftpItemJson, "");
- return "addFtpItem";
+ return resultMsg;
}
// 灏唂tpItemJson瑁呬负Map淇濆瓨鎿嶄綔
Map paramIn = JSONObject.parseObject(ftpItemJsonObj.getJSONObject("taskInfo").toJSONString(), Map.class);
// 鏁版嵁瑙勮寖鎬ф牎楠�
-
+ Object dealClassObj = null;
// 鍦╬rvncCrm.properties 鏂囦欢涓幏鍙栧搴斿鐞嗙被
- Object dealClassObj = CustomizedPropertyPlaceholderConfigurer.getContextProperty("task.deal.class." + paramIn.get("uOrD"));
+ if ("DT".equals(paramIn.get("uOrD").toString())) {
+ dealClassObj = CustomizedPropertyPlaceholderConfigurer.getContextProperty("com.java110.job.smo.DownloadFileFromFtpToTable");
+ }else{
+ resultMsg = this.createResultMsg("1999", "瀵瑰簲妯℃澘涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳", "");
+ return resultMsg;
+ }
// Object dealClassObj = "provInner.DownloadFileFromFtpToTFS";
if (dealClassObj == null) {
resultMsg = this.createResultMsg("1999", "瀵瑰簲妯℃澘涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳", "");
- return "addFtpItem";
+ return resultMsg;
}
String dealClass = dealClassObj.toString();
- long taskId = getPrvncFtpFileDAO().newCreateTaskId();
+ long taskId = Long.parseLong(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_HCJOBId));
// 淇濆瓨鏁版嵁
paramIn.put("taskId", taskId);
paramIn.put("dealClass", dealClass);
- int addFtpItemFlag = getPrvncFtpFileDAO().addFtpItem(paramIn);
+ int addFtpItemFlag = iprvncFtpFileDAO.addFtpItem(paramIn);
if (addFtpItemFlag > 0) {
// #taskId#,#itemSpecId#,#value#
@@ -166,28 +169,27 @@
taskAttrMap.put("value", taskAttr.get("value"));
taskAttrsList.add(taskAttrMap);
}
- int addFtpItemAttrFlag = getPrvncFtpFileDAO().addFtpItemAttrs(taskAttrsList);
+ int addFtpItemAttrFlag = iprvncFtpFileDAO.addFtpItemAttrs(taskAttrsList);
if (addFtpItemAttrFlag > 0) {
resultMsg = this.createResultMsg("0000", "鎴愬姛", ftpItemJson);
} else {
resultMsg = this.createResultMsg("1999", "淇濆瓨灞炴�уけ璐�", "");
}
- return resultMsg.toString();
+ return resultMsg;
}
resultMsg = this.createResultMsg("1999", "淇濆瓨鏁版嵁澶辫触", "");
- return resultMsg.toString();
+ return resultMsg;
}
/**
* 缂栬緫Ftp閰嶇疆锛岀紪杈戞椂灏嗕細淇敼鎵�鏈夌殑ftpItem 淇℃伅锛屾墍浠ヤ紶閫掓槸鎵�鏈夊瓧娈甸渶瑕佷紶閫掑叏
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/editFtpItem",method = RequestMethod.POST)
- public String editFtpItem(@RequestBody String editFtpItem,HttpServletRequest request) {
- JSONObject editftpitem = JSONObject.parseObject(editFtpItem);
+ public String editFtpItem(HttpServletRequest request) {
+
// 璇锋眰鍙傛暟涓簕"taskId":"12","taskName":"缁忓姙浜虹収鐗囧悓姝ュ鐞�","ftpUserName":"weblogic",.....}
- String ftpItemJson = editftpitem.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
JSONObject ftpItemJsonObj = null;
try {
// 鏍￠獙鏍煎紡鏄惁姝ｇ‘
@@ -213,14 +215,14 @@
paramIn.put("dealClass", dealClass);
// 鏍规嵁taskId 鏌ヨ璁板綍鏄惁瀛樺湪锛屽鏋滀笉瀛樺湪鐩存帴杩斿洖澶辫触
- Map ftpItem = getPrvncFtpFileDAO().queryFtpItemByTaskId(paramIn);
+ Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
// 鍒ゆ柇鏄惁鏈夊搴旂殑鏁版嵁
if (ftpItem != null && ftpItem.containsKey("TASKID")) {
// 鏇存柊鏁版嵁
- int updateFtpItemFlag = getPrvncFtpFileDAO().updateFtpItemByTaskId(paramIn);
+ int updateFtpItemFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(paramIn);
if (updateFtpItemFlag > 0) {
// 棣栧厛鍏堝垹闄�
- getPrvncFtpFileDAO().deleteFtpItemAttrsbyTaskId(paramIn);
+ iprvncFtpFileDAO.deleteFtpItemAttrsbyTaskId(paramIn);
// 淇濆瓨灞炴�т俊鎭�
JSONArray taskAttrs = ftpItemJsonObj.getJSONArray("taskAttrs");
List<Map> taskAttrsList = new ArrayList<Map>();
@@ -232,7 +234,7 @@
taskAttrMap.put("value", taskAttr.get("value"));
taskAttrsList.add(taskAttrMap);
}
- int addFtpItemAttrFlag = getPrvncFtpFileDAO().addFtpItemAttrs(taskAttrsList);
+ int addFtpItemAttrFlag = iprvncFtpFileDAO.addFtpItemAttrs(taskAttrsList);
if (addFtpItemAttrFlag > 0) {
resultMsg = this.createResultMsg("0000", "鎴愬姛", ftpItemJson);
} else {
@@ -249,15 +251,13 @@
/**
* 鍒犻櫎ftp閰嶇疆
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/deleteFtpItem",method = RequestMethod.POST)
- public String deleteFtpItem(@RequestBody String deleteFtpItemInfo,HttpServletRequest request) {
+ public String deleteFtpItem(HttpServletRequest request) {
- JSONObject delteftpinfo = JSONObject.parseObject(deleteFtpItemInfo);
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"DELETE"}
- String ftpItemJson = delteftpinfo.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.deleteFtpItem銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -302,7 +302,7 @@
Map paramInfo = new HashMap();
paramInfo.put("taskIds", taskIds.split(","));
// 鏇存柊鏁版嵁
- int updateFtpItemFlag = getPrvncFtpFileDAO().deleteFtpItemByTaskId(paramInfo);
+ int updateFtpItemFlag = iprvncFtpFileDAO.deleteFtpItemByTaskId(paramInfo);
if (updateFtpItemFlag > 0) {
resultMsg = this.createResultMsg("0000", "鎴愬姛", ftpItemJson);
return "deleteFtpItem";
@@ -315,15 +315,14 @@
/**
* 鏍规嵁taskId 鑾峰彇 ftp閰嶇疆淇℃伅
- *
+ *
* @return
*/
+ public String queryFtpItemByTaskId(HttpServletRequest request) {
- @RequestMapping(path = "/FtpToFileSystem/queryFtpItemByTaskId" , method = RequestMethod.POST)
- public String queryFtpItemByTaskId(@RequestBody String queryFtpItemByTaskId,HttpServletRequest request) {
- JSONObject queryFtpItemByTask = JSONObject.parseObject(queryFtpItemByTaskId);
- // 璇锋眰鍙傛暟
- String ftpItemJson = queryFtpItemByTask.getString("ftpItemJson");
+ // 璇锋眰鍙傛暟涓簕"taskId":"12"}
+ String ftpItemJson = request.getParameter("ftpItemJson");
+
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.queryFtpItemByTaskId銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -341,7 +340,7 @@
Map paramIn = JSONObject.parseObject(ftpItemJson, Map.class);
// 鏍规嵁taskId 鏌ヨ璁板綍鏄惁瀛樺湪锛屽鏋滀笉瀛樺湪鐩存帴杩斿洖澶辫触
- Map ftpItem = getPrvncFtpFileDAO().queryFtpItemByTaskId(paramIn);
+ Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
// 鍒ゆ柇鏄惁鏈夊搴旂殑鏁版嵁
if (ftpItem != null && ftpItem.containsKey("TASKID")) {
// 鏇存柊鏁版嵁
@@ -355,16 +354,14 @@
/**
* 鏌ヨ浠诲姟妯℃澘 ftpItemJson:{'uOrD':'U'}
- *
+ *
* @return
*/
+ public String questTaskTample(HttpServletRequest request) {
- @RequestMapping(path = "/FtpToFileSystem/questTaskTample" , method = RequestMethod.POST)
- public String questTaskTample(@RequestBody String questTaskTample,HttpServletRequest request) {
- JSONObject questtasktample = JSONObject.parseObject(questTaskTample);
- // 璇锋眰鍙傛暟
- String ftpItemJson = questtasktample.getString("ftpItemJson");
// 璇锋眰鍙傛暟涓簕"taskId":"12"}
+ String ftpItemJson = request.getParameter("ftpItemJson");
+
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.queryFtpItemByTaskId銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -383,7 +380,7 @@
Map info = new HashMap();
info.put("domain", tample);
- List<Map> itemSpecs = getPrvncFtpFileDAO().queryItemSpec(info);
+ List<Map> itemSpecs = iprvncFtpFileDAO.queryItemSpec(info);
String taskItems = JSONObject.toJSONString(itemSpecs);
resultMsg = this.createResultMsg("0000", "鎴愬姛", "{\"U_OR_D\":\"" + tample + "\",\"TASK_ITEMS\":" + taskItems + "}");
@@ -392,16 +389,13 @@
/**
* 鏍规嵁TaskId 鑾峰彇浠诲姟灞炴��
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/queryTaskAttrs" , method = RequestMethod.POST)
- public String queryTaskAttrs(@RequestBody String queryTaskAttrsInfo,HttpServletRequest request) {
-
- JSONObject querytaskattrs = JSONObject.parseObject(queryTaskAttrsInfo);
+ public String queryTaskAttrs(HttpServletRequest request) {
// 璇锋眰鍙傛暟涓簕"taskId":"12"}
- String ftpItemJson = querytaskattrs.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.queryTaskAttrs銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -420,7 +414,7 @@
Map info = new HashMap();
info.put("taskId", taskId);
- List<Map> itemAttrs = getPrvncFtpFileDAO().queryFtpItemAttrsByTaskId(info);
+ List<Map> itemAttrs = iprvncFtpFileDAO.queryFtpItemAttrsByTaskId(info);
String itemsAttrs = JSONObject.toJSONString(itemAttrs);
resultMsg = this.createResultMsg("0000", "鎴愬姛", "{\"TASK_ATTRS\":" + itemsAttrs + "}");
@@ -429,15 +423,13 @@
/**
* 鍚姩渚﹀惉锛堝鑺傜偣鍚姩锛�
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/startJob",method = RequestMethod.POST)
- public String startJob(@RequestBody String startInfo , HttpServletRequest request) {
+ public String startJob(HttpServletRequest request) {
- JSONObject startinfo = JSONObject.parseObject(startInfo);
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"START"}
- String ftpItemJson = startinfo.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.startJob銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -482,8 +474,10 @@
info.put("taskIds", taskIds.split(","));
- List<Map> doFtpItems = getPrvncFtpFileDAO().queryFtpItemsByTaskIds(info);
+ List<Map> doFtpItems = iprvncFtpFileDAO.queryFtpItemsByTaskIds(info);
+ // 鑾峰彇Spring璋冨害鍣�
+ Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
int linstenCount = 0;
int updateTaskStateFailCount = 0;
try {
@@ -504,19 +498,21 @@
String jobName = prefixJobName + taskId;
String triggerName = prefixJobName + taskId;
+
//璁剧疆浠诲姟鍚嶇О
JobKey jobKey = new JobKey(jobName);
- JobDetail jobDetail = scheduler.getJobDetail(jobKey);
- // 璇存槑杩欎釜娌℃湁鍚姩锛屽垯闇�瑕侀噸鏂板惎鍔紝濡傛灉鍚姩鐫�涓嶅仛澶勭悊
+ JobDetail jobDetail = scheduler.getJobDetail(jobKey); // 璇存槑杩欎釜娌℃湁鍚姩锛屽垯闇�瑕侀噸鏂板惎鍔紝濡傛灉鍚姩鐫�涓嶅仛澶勭悊
+
if (jobDetail == null) {
// 浠诲姟鍚嶇О
String taskCfgName = (String) doFtpItem.get("TASKNAME");
//鏋勫缓job淇℃伅
- JobDetail warnJob = JobBuilder.newJob(PrvncFtpToFileSystemJob.class).withIdentity(jobName,PrvncFtpToFileSystemJob.JOB_GROUP_NAME).withDescription("浠诲姟鍚姩").build();
- // job.getJobDataMap().put("params", param.toString());
- warnJob.getJobDataMap().put(PrvncFtpToFileSystemJob.JOB_DATA_CONFIG_NAME, taskCfgName);
+ JobDetail warnJob = JobBuilder.newJob(HcFtpToFileSystemJob.class).withIdentity(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME).withDescription("浠诲姟鍚姩").build();
- warnJob.getJobDataMap().put(PrvncFtpToFileSystemJob.JOB_DATA_TASK_ID, taskId);
+ warnJob.getJobDataMap().put(HcFtpToFileSystemJob.JOB_DATA_CONFIG_NAME, taskCfgName);
+
+ warnJob.getJobDataMap().put(HcFtpToFileSystemJob.JOB_DATA_TASK_ID, taskId);
+
// 瑙﹀彂鏃堕棿鐐�
CronTrigger warnTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName, triggerName).withSchedule(cronScheduleBuilder).build();
@@ -532,7 +528,7 @@
updateTaskInfo.put("taskId", taskId);
updateTaskInfo.put("runFlag", RUNFLAG_START);
// 杩欓噷鏇存柊鐘舵�佹病鏈夋垚鍔熺殑锛屽彧鏄湪鍚庡彴鎵撳嵃鏃ュ織锛屽啀鍓嶅彴涓嶈繘琛屽睍绀�
- int updateTaskStateFlag = getPrvncFtpFileDAO().updateFtpItemByTaskId(updateTaskInfo);
+ int updateTaskStateFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
if (updateTaskStateFlag < 1) {
logger.error("---渚﹀惉銆�" + taskId + "銆戝惎鍔ㄦ垚鍔燂紝浣嗘槸鏇存柊浠诲姟鐘舵�佸け璐�,璇峰叧娉紒锛侊紒", info);
updateTaskStateFailCount++;
@@ -561,15 +557,13 @@
/**
* 鍋滄渚﹀惉
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/stopJob",method = RequestMethod.POST)
- public String stopJob(@RequestBody String stopjobInfo,HttpServletRequest request) {
+ public String stopJob(HttpServletRequest request) {
- JSONObject stopjob = JSONObject.parseObject(stopjobInfo);
// 璇锋眰鍙傛暟涓簕"tasks":[{"taskId":1},{"taskId":2}],"state":"STOP"}
- String ftpItemJson = stopjob.getString("ftpItemJson");
+ String ftpItemJson = request.getParameter("ftpItemJson");
if (logger.isDebugEnabled()) {
logger.debug("---銆怭rvncFtpToFileSystemConfigAction.stopJob銆戝叆鍙備负锛�" + ftpItemJson, ftpItemJson);
}
@@ -614,7 +608,10 @@
info.put("taskIds", taskIds.split(","));
- List<Map> doFtpItems = getPrvncFtpFileDAO().queryFtpItemsByTaskIds(info);
+ List<Map> doFtpItems = iprvncFtpFileDAO.queryFtpItemsByTaskIds(info);
+
+ // 鑾峰彇Spring璋冨害鍣�
+ Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
int linstenCount = 0;
int updateTaskStateFailCount = 0;
@@ -630,13 +627,14 @@
String jobName = prefixJobName + taskId;
String triggerName = prefixJobName + taskId;
- TriggerKey triggerKey = TriggerKey.triggerKey(jobName,PrvncFtpToFileSystemJob.JOB_GROUP_NAME);
+
+ TriggerKey triggerKey = TriggerKey.triggerKey(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME);
// 鍋滄瑙﹀彂鍣�
scheduler.pauseTrigger(triggerKey);
// 绉婚櫎瑙﹀彂鍣�
scheduler.unscheduleJob(triggerKey);
- JobKey jobKey = new JobKey(jobName,PrvncFtpToFileSystemJob.JOB_GROUP_NAME);
+ JobKey jobKey = new JobKey(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME);
// 鍒犻櫎浠诲姟
scheduler.deleteJob(jobKey);
// 淇敼鏁版嵁鐘舵�侊紝灏嗕换鍔℃暟鎹姸鎬佹敼涓鸿繍琛岀姸鎬�
@@ -646,7 +644,7 @@
updateTaskInfo.put("taskId", taskId);
updateTaskInfo.put("runFlag", RUNFLAG_STOP);
// 杩欓噷鏇存柊鐘舵�佹病鏈夋垚鍔熺殑锛屽彧鏄湪鍚庡彴鎵撳嵃鏃ュ織锛屽啀鍓嶅彴涓嶈繘琛屽睍绀�
- int updateTaskStateFlag = getPrvncFtpFileDAO().updateFtpItemByTaskId(updateTaskInfo);
+ int updateTaskStateFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
if (updateTaskStateFlag < 1) {
logger.error("---渚﹀惉銆�" + taskId + "銆戝仠姝㈡垚鍔燂紝浣嗘槸鏇存柊浠诲姟鐘舵�佸け璐�,璇峰叧娉紒锛侊紒", info);
updateTaskStateFailCount++;
@@ -674,13 +672,12 @@
/**
* 鏍规嵁浠诲姟鍚嶇О鎴栦换鍔D妯＄硦鏌ヨ
- *
+ *
* @return
*/
- @RequestMapping(path = "/FtpToFileSystem/searchTaskByNameOrId" , method = RequestMethod.POST)
- public String searchTaskByNameOrId(@RequestBody String searchTaskByNameOrIdInfo,HttpServletRequest request) {
- JSONObject searchTaskByNameOrIdObj = JSONObject.parseObject(searchTaskByNameOrIdInfo);
- String ftpItemJson = searchTaskByNameOrIdObj.getString("ftpItemJson");
+ public String searchTaskByNameOrId(HttpServletRequest request) {
+
+ String ftpItemJson = request.getParameter("ftpItemJson");
JSONObject ftpItemJsonObj = null;
try {
// 鏍￠獙鏍煎紡鏄惁姝ｇ‘
@@ -708,7 +705,7 @@
if (GenericValidator.isInt(taskNameOrTaskId) || GenericValidator.isLong(taskNameOrTaskId)) {
// 鏍规嵁taskId 鏌ヨ璁板綍
paramIn.put("taskId", taskNameOrTaskId);
- Map ftpItem = getPrvncFtpFileDAO().queryFtpItemByTaskId(paramIn);
+ Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
if (ftpItem != null && ftpItem.containsKey("FTP_ITEM_ATTRS")) {
ftpItem.remove("FTP_ITEM_ATTRS");// 鍓嶅彴鏆傛椂鐢ㄤ笉鍒帮紝鎵�浠ヨ繖閲屽皢灞炴�хЩ闄�
@@ -716,7 +713,7 @@
ftpItems.add(ftpItem);
}
} else {
- ftpItems = getPrvncFtpFileDAO().searchFtpItemByTaskName(paramIn);
+ ftpItems = iprvncFtpFileDAO.searchFtpItemByTaskName(paramIn);
}
JSONArray rows = new JSONArray();
@@ -737,7 +734,7 @@
/**
* 鍒涘缓鍏敤杈撳嚭
- *
+ *
* @return
*/
private JSONObject createResultMsg(String resultCode, String resultMsg, String resultInfo) {
@@ -746,13 +743,6 @@
data.put("RESULT_MSG", resultMsg);
data.put("RESULT_INFO", resultInfo);
return data;
- }
-
- public IPrvncFtpFileDAO getPrvncFtpFileDAO() {
- if (this.iprvncFtpFileDAO == null) {
- this.iprvncFtpFileDAO = ((IPrvncFtpFileDAO) SpringBeanInvoker.getBean("provInner.PrvncFtpFileDAO"));
- }
- return iprvncFtpFileDAO;
}
}
--
Gitblit v1.8.0