页面数据加载正常 新增功能已完成测试

JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java

@@ -5,7 +5,8 @@ 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.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
+import com.java110.job.smo.DownloadFileFromFtpToTable;
 import com.java110.job.task.HcFtpToFileSystemJob;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.commons.validator.util.ValidatorUtils;
@@ -18,10 +19,8 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 /**
  * 将ftp上的文件保存到支持的文件系统
  *
@@ -44,7 +43,7 @@ public class HcFtpToFileSystemConfigAction {
 	private static final String RUNFLAG_STOP = "0";
 
 	@Autowired
-	private IHccFtpFileDAO iprvncFtpFileDAO;
+	private IHcFtpFileDAO iHcFtpFileDAO;
 	@Autowired
 	private Scheduler scheduler;
 
@@ -57,6 +56,7 @@ public class HcFtpToFileSystemConfigAction {
 	 *
 	 */
 	private static final long serialVersionUID = 1L;
+    private DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
 	/**
 	 * 查询配置的需要下载任务的列表
@@ -72,7 +72,7 @@ public class HcFtpToFileSystemConfigAction {
 		Map info = new HashMap();
 		info.put("curPage", (Integer.parseInt(curPage)-1)*pageSize);
 		info.put("pageSize", pageSize*Integer.parseInt(curPage));
-		Map resultInfo = iprvncFtpFileDAO.queryFtpItems(info);
+		Map resultInfo = iHcFtpFileDAO.queryFtpItems(info);
 
 		// 获取总数据数
 		int dataCount = resultInfo.get("ITEMSCOUNT") == null ? 0 : Integer.parseInt(resultInfo.get("ITEMSCOUNT").toString());
@@ -93,12 +93,11 @@ public class HcFtpToFileSystemConfigAction {
 		data.put("currentPage", curPage);
 		if (ftpItems != null && ftpItems.size() > 0) {
 			JSONArray rows = new JSONArray();
-			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 			for (int itemIndex = 0; itemIndex < ftpItems.size(); itemIndex++) {
 
 				// 处理时间显示和界面显示传输类型
 				Map ftpItemMap = ftpItems.get(itemIndex);
-				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(ftpItems.get(itemIndex))));
 			}
@@ -137,7 +136,7 @@ public class HcFtpToFileSystemConfigAction {
 		Object dealClassObj = null;
 		// 在prvncCrm.properties 文件中获取对应处理类
 		if ("DT".equals(paramIn.get("uOrD").toString())) {
-			 dealClassObj = CustomizedPropertyPlaceholderConfigurer.getContextProperty("com.java110.job.smo.DownloadFileFromFtpToTable");
+			 dealClassObj = DownloadFileFromFtpToTable.class;
 		}else{
 			resultMsg = this.createResultMsg("1999", "对应模板不存在，请联系管理员", "");
 			return resultMsg;
@@ -149,12 +148,12 @@ public class HcFtpToFileSystemConfigAction {
 		}
 		String dealClass = dealClassObj.toString();
 
-		long taskId = Long.parseLong(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_HCJOBId));
+		String taskId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_HCJOBId);
 		// 保存数据
 		paramIn.put("taskId", taskId);
 		paramIn.put("dealClass", dealClass);
 
-		int addFtpItemFlag = iprvncFtpFileDAO.addFtpItem(paramIn);
+		int addFtpItemFlag = iHcFtpFileDAO.addFtpItem(paramIn);
 
 		if (addFtpItemFlag > 0) {
 			// #taskId#,#itemSpecId#,#value#
@@ -169,7 +168,7 @@ public class HcFtpToFileSystemConfigAction {
 				taskAttrMap.put("value", taskAttr.get("value"));
 				taskAttrsList.add(taskAttrMap);
 			}
-			int addFtpItemAttrFlag = iprvncFtpFileDAO.addFtpItemAttrs(taskAttrsList);
+			int addFtpItemAttrFlag = iHcFtpFileDAO.addFtpItemAttrs(taskAttrsList);
 			if (addFtpItemAttrFlag > 0) {
 				resultMsg = this.createResultMsg("0000", "成功", ftpItemJson);
 			} else {
@@ -215,14 +214,14 @@ public class HcFtpToFileSystemConfigAction {
 		paramIn.put("dealClass", dealClass);
 
 		// 根据taskId 查询记录是否存在，如果不存在直接返回失败
-		Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
+		Map ftpItem = iHcFtpFileDAO.queryFtpItemByTaskId(paramIn);
 		// 判断是否有对应的数据
 		if (ftpItem != null && ftpItem.containsKey("TASKID")) {
 			// 更新数据
-			int updateFtpItemFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(paramIn);
+			int updateFtpItemFlag = iHcFtpFileDAO.updateFtpItemByTaskId(paramIn);
 			if (updateFtpItemFlag > 0) {
 				// 首先先删除
-				iprvncFtpFileDAO.deleteFtpItemAttrsbyTaskId(paramIn);
+				iHcFtpFileDAO.deleteFtpItemAttrsbyTaskId(paramIn);
 				// 保存属性信息
 				JSONArray taskAttrs = ftpItemJsonObj.getJSONArray("taskAttrs");
 				List<Map> taskAttrsList = new ArrayList<Map>();
@@ -234,7 +233,7 @@ public class HcFtpToFileSystemConfigAction {
 					taskAttrMap.put("value", taskAttr.get("value"));
 					taskAttrsList.add(taskAttrMap);
 				}
-				int addFtpItemAttrFlag = iprvncFtpFileDAO.addFtpItemAttrs(taskAttrsList);
+				int addFtpItemAttrFlag = iHcFtpFileDAO.addFtpItemAttrs(taskAttrsList);
 				if (addFtpItemAttrFlag > 0) {
 					resultMsg = this.createResultMsg("0000", "成功", ftpItemJson);
 				} else {
@@ -302,7 +301,7 @@ public class HcFtpToFileSystemConfigAction {
 		Map paramInfo = new HashMap();
 		paramInfo.put("taskIds", taskIds.split(","));
 		// 更新数据
-		int updateFtpItemFlag = iprvncFtpFileDAO.deleteFtpItemByTaskId(paramInfo);
+		int updateFtpItemFlag = iHcFtpFileDAO.deleteFtpItemByTaskId(paramInfo);
 		if (updateFtpItemFlag > 0) {
 			resultMsg = this.createResultMsg("0000", "成功", ftpItemJson);
 			return "deleteFtpItem";
@@ -340,7 +339,7 @@ public class HcFtpToFileSystemConfigAction {
 		Map paramIn = JSONObject.parseObject(ftpItemJson, Map.class);
 
 		// 根据taskId 查询记录是否存在，如果不存在直接返回失败
-		Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
+		Map ftpItem = iHcFtpFileDAO.queryFtpItemByTaskId(paramIn);
 		// 判断是否有对应的数据
 		if (ftpItem != null && ftpItem.containsKey("TASKID")) {
 			// 更新数据
@@ -357,7 +356,7 @@ public class HcFtpToFileSystemConfigAction {
 	 *
 	 * @return
 	 */
-	public String questTaskTample(HttpServletRequest request) {
+	public JSONObject questTaskTample(HttpServletRequest request) {
 
 		// 请求参数为{"taskId":"12"}
 		String ftpItemJson = request.getParameter("ftpItemJson");
@@ -372,7 +371,7 @@ public class HcFtpToFileSystemConfigAction {
 		} catch (Exception e) {
 			logger.error("传入参数格式不正确：" + ftpItemJson, e);
 			resultMsg = createResultMsg("1999", "传入参数格式不正确：" + ftpItemJson, "");
-			return "questTaskTample";
+			return resultMsg;
 		}
 
 		String tample = paramIn.getString("uOrD");
@@ -380,11 +379,11 @@ public class HcFtpToFileSystemConfigAction {
 		Map info = new HashMap();
 		info.put("domain", tample);
 
-		List<Map> itemSpecs = iprvncFtpFileDAO.queryItemSpec(info);
+		List<Map> itemSpecs = iHcFtpFileDAO.queryItemSpec(info);
 		String taskItems = JSONObject.toJSONString(itemSpecs);
 
 		resultMsg = this.createResultMsg("0000", "成功", "{\"U_OR_D\":\"" + tample + "\",\"TASK_ITEMS\":" + taskItems + "}");
-		return "questTaskTample";
+		return resultMsg;
 	}
 
 	/**
@@ -392,7 +391,7 @@ public class HcFtpToFileSystemConfigAction {
 	 *
 	 * @return
 	 */
-	public String queryTaskAttrs(HttpServletRequest request) {
+	public JSONObject queryTaskAttrs(HttpServletRequest request) {
 
 		// 请求参数为{"taskId":"12"}
 		String ftpItemJson = request.getParameter("ftpItemJson");
@@ -406,7 +405,7 @@ public class HcFtpToFileSystemConfigAction {
 		} catch (Exception e) {
 			logger.error("传入参数格式不正确：" + ftpItemJson, e);
 			resultMsg = createResultMsg("1999", "传入参数格式不正确：" + ftpItemJson, "");
-			return "questTaskTample";
+			return resultMsg;
 		}
 
 		long taskId = paramIn.getLong("taskId");
@@ -414,11 +413,11 @@ public class HcFtpToFileSystemConfigAction {
 		Map info = new HashMap();
 		info.put("taskId", taskId);
 
-		List<Map> itemAttrs = iprvncFtpFileDAO.queryFtpItemAttrsByTaskId(info);
+		List<Map> itemAttrs = iHcFtpFileDAO.queryFtpItemAttrsByTaskId(info);
 		String itemsAttrs = JSONObject.toJSONString(itemAttrs);
 
 		resultMsg = this.createResultMsg("0000", "成功", "{\"TASK_ATTRS\":" + itemsAttrs + "}");
-		return "queryTaskAttrs";
+		return resultMsg;
 	}
 
 	/**
@@ -474,7 +473,7 @@ public class HcFtpToFileSystemConfigAction {
 
 		info.put("taskIds", taskIds.split(","));
 
-		List<Map> doFtpItems = iprvncFtpFileDAO.queryFtpItemsByTaskIds(info);
+		List<Map> doFtpItems = iHcFtpFileDAO.queryFtpItemsByTaskIds(info);
 
 		// 获取Spring调度器
 		Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
@@ -528,7 +527,7 @@ public class HcFtpToFileSystemConfigAction {
 					updateTaskInfo.put("taskId", taskId);
 					updateTaskInfo.put("runFlag", RUNFLAG_START);
 					// 这里更新状态没有成功的，只是在后台打印日志，再前台不进行展示
-					int updateTaskStateFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
+					int updateTaskStateFlag = iHcFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
 					if (updateTaskStateFlag < 1) {
 						logger.error("---侦听【" + taskId + "】启动成功，但是更新任务状态失败,请关注！！！", info);
 						updateTaskStateFailCount++;
@@ -608,7 +607,7 @@ public class HcFtpToFileSystemConfigAction {
 
 		info.put("taskIds", taskIds.split(","));
 
-		List<Map> doFtpItems = iprvncFtpFileDAO.queryFtpItemsByTaskIds(info);
+		List<Map> doFtpItems = iHcFtpFileDAO.queryFtpItemsByTaskIds(info);
 
 		// 获取Spring调度器
 		Scheduler scheduler = (Scheduler) SpringBeanInvoker.getBean("schedulerFactoryBean");
@@ -644,7 +643,7 @@ public class HcFtpToFileSystemConfigAction {
 				updateTaskInfo.put("taskId", taskId);
 				updateTaskInfo.put("runFlag", RUNFLAG_STOP);
 				// 这里更新状态没有成功的，只是在后台打印日志，再前台不进行展示
-				int updateTaskStateFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
+				int updateTaskStateFlag = iHcFtpFileDAO.updateFtpItemByTaskId(updateTaskInfo);
 				if (updateTaskStateFlag < 1) {
 					logger.error("---侦听【" + taskId + "】停止成功，但是更新任务状态失败,请关注！！！", info);
 					updateTaskStateFailCount++;
@@ -705,7 +704,7 @@ public class HcFtpToFileSystemConfigAction {
 		if (GenericValidator.isInt(taskNameOrTaskId) || GenericValidator.isLong(taskNameOrTaskId)) {
 			// 根据taskId 查询记录
 			paramIn.put("taskId", taskNameOrTaskId);
-			Map ftpItem = iprvncFtpFileDAO.queryFtpItemByTaskId(paramIn);
+			Map ftpItem = iHcFtpFileDAO.queryFtpItemByTaskId(paramIn);
 			if (ftpItem != null && ftpItem.containsKey("FTP_ITEM_ATTRS")) {
 				ftpItem.remove("FTP_ITEM_ATTRS");// 前台暂时用不到，所以这里将属性移除
 
@@ -713,7 +712,7 @@ public class HcFtpToFileSystemConfigAction {
 				ftpItems.add(ftpItem);
 			}
 		} else {
-			ftpItems = iprvncFtpFileDAO.searchFtpItemByTaskName(paramIn);
+			ftpItems = iHcFtpFileDAO.searchFtpItemByTaskName(paramIn);
 		}
 
 		JSONArray rows = new JSONArray();

JobService/src/main/java/com/java110/job/controller/JobController.java

@@ -64,4 +64,28 @@ public class JobController extends BaseController {
         return JSON.toJSONString();
     }
 
+    /**
+     * 获取任务属性
+     * @return
+     */
+    @RequestMapping(path = "/questTaskTample")
+    @ResponseBody
+    public String questTaskTample(HttpServletRequest request) {
+        logger.debug("请求流程 {},{}", new StringBuffer("questTaskTample  我看到请求了"), new Date());
+        JSONObject JSON = ftpToFileSystemConfigAction.questTaskTample(request);
+        return JSON.toJSONString();
+    }
+
+    /**
+     * 根据TaskId 获取任务属性
+     * @return
+     */
+    @RequestMapping(path = "/queryTaskAttrs")
+    @ResponseBody
+    public String queryTaskAttrs(HttpServletRequest request) {
+        logger.debug("请求流程 {},{}", new StringBuffer("queryTaskAttrs  我看到请求了"), new Date());
+        JSONObject JSON = ftpToFileSystemConfigAction.queryTaskAttrs(request);
+        return JSON.toJSONString();
+    }
+
 }

JobService/src/main/java/com/java110/job/dao/IHccFtpFileDAO.java

@@ -5,7 +5,7 @@ import com.java110.job.model.*;
 import java.util.List;
 import java.util.Map;
 
-public interface IHccFtpFileDAO {
+public interface IHcFtpFileDAO {
 
 
 	/**

JobService/src/main/java/com/java110/job/dao/impl/HcFtpFileDAOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.job.dao.impl;
 
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
 import com.java110.job.model.FtpTaskLog;
 import com.java110.job.model.FtpTaskLogDetail;
 import org.springframework.stereotype.Service;
@@ -11,29 +11,29 @@ import java.util.HashMap;
 
 import java.util.List;
 import java.util.Map;
-@Service("IPrvncFtpFileDAO")
+@Service("IHcFtpFileDAO")
 @Transactional
-public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
+public class HcFtpFileDAOImpl extends BaseServiceDao implements IHcFtpFileDAO {
 
 	public long saveTaskRunLog(FtpTaskLog loginfo){
 		// TODO Auto-generated method stub
-		return sqlSessionTemplate.insert("IPrvncFtpFileDAO.saveTaskRunLog",loginfo);
+		return sqlSessionTemplate.insert("IHcFtpFileDAO.saveTaskRunLog",loginfo);
 	}
 
 	public void updateTaskRunLog(FtpTaskLog loginfo){
 		// TODO Auto-generated method stub
-		sqlSessionTemplate.update("IPrvncFtpFileDAO.updateTaskRunLog",loginfo);
+		sqlSessionTemplate.update("IHcFtpFileDAO.updateTaskRunLog",loginfo);
 	}
 	public int saveTaskRunDetailLog(FtpTaskLogDetail logdetail){
 		// TODO Auto-generated method stub
-		return sqlSessionTemplate.insert("IPrvncFtpFileDAO.saveTaskRunDetailLog",logdetail);
+		return sqlSessionTemplate.insert("IHcFtpFileDAO.saveTaskRunDetailLog",logdetail);
 	}
 
 
 
 	@Override
 	public List execConfigSql(String dbsql){
-		return  sqlSessionTemplate.selectList("IPrvncFtpFileDAO.execConfigSql", dbsql);
+		return  sqlSessionTemplate.selectList("IHcFtpFileDAO.execConfigSql", dbsql);
 	}
 	/**
 	 * 查询文件下载在文件系统的配置任务列表
@@ -43,9 +43,9 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	public Map queryFtpItems(Map info){
 		Map resultInfo = new HashMap();
 		//1.0查询总数
-		Integer allCNT = (Integer) sqlSessionTemplate.selectOne("IPrvncFtpFileDAO.queryFtpItemsCount", info);
+		Integer allCNT = (Integer) sqlSessionTemplate.selectOne("IHcFtpFileDAO.queryFtpItemsCount", info);
 		resultInfo.put("ITEMSCOUNT", allCNT);
-		List datas = sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryFtpItems",info);
+		List datas = sqlSessionTemplate.selectList("IHcFtpFileDAO.queryFtpItems",info);
 		resultInfo.put("DATA", datas);
 		return resultInfo;
 	}
@@ -54,7 +54,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public long newCreateTaskId(){
-		Long tastId = (Long) sqlSessionTemplate.selectOne("IPrvncFtpFileDAO.newCreateTaskId");
+		Long tastId = (Long) sqlSessionTemplate.selectOne("IHcFtpFileDAO.newCreateTaskId");
 		return tastId;
 	}
 	/**
@@ -63,8 +63,8 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int addFtpItem(Map info){
-//		return  Integer.parseInt(sqlSessionTemplate.insert("IPrvncFtpFileDAO.addFtpItem", info).toString());
-		sqlSessionTemplate.insert("IPrvncFtpFileDAO.addFtpItem", info);
+//		return  Integer.parseInt(sqlSessionTemplate.insert("IHcFtpFileDAO.addFtpItem", info).toString());
+		sqlSessionTemplate.insert("IHcFtpFileDAO.addFtpItem", info);
 		return 1;
 	}
 	/**
@@ -73,12 +73,12 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public Map queryFtpItemByTaskId(Map info){
-		Object data = sqlSessionTemplate.selectOne("IPrvncFtpFileDAO.queryFtpItemByTaskId", info);
+		Object data = sqlSessionTemplate.selectOne("IHcFtpFileDAO.queryFtpItemByTaskId", info);
 		Map ftpItem = null ;
 		if(data != null){
 			ftpItem = (Map)data;
 			//查ftpitem属性
-			List<Map> ftpItemAttrs = sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryFtpItemAttrsByTaskId",info);
+			List<Map> ftpItemAttrs = sqlSessionTemplate.selectList("IHcFtpFileDAO.queryFtpItemAttrsByTaskId",info);
 			ftpItem.put("FTP_ITEM_ATTRS", ftpItemAttrs);
 		}
 
@@ -91,7 +91,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public List<Map> searchFtpItemByTaskName(Map info){
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.searchFtpItemByTaskName",info);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.searchFtpItemByTaskName",info);
 	}
 	/**
 	 * 修改ftp配置信息
@@ -99,7 +99,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int updateFtpItemByTaskId(Map info){
-		return sqlSessionTemplate.update("IPrvncFtpFileDAO.updateFtpItemByTaskId", info);
+		return sqlSessionTemplate.update("IHcFtpFileDAO.updateFtpItemByTaskId", info);
 	}
 	/**
 	 * 删除ftp配置信息
@@ -107,7 +107,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int deleteFtpItemByTaskId(Map info){
-		return sqlSessionTemplate.update("IPrvncFtpFileDAO.deleteFtpItemByTaskId", info);
+		return sqlSessionTemplate.update("IHcFtpFileDAO.deleteFtpItemByTaskId", info);
 	}
 
 	/**
@@ -116,7 +116,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public List<Map> queryFtpItemsByTaskIds(Map info){
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryFtpItemsByTaskIds",info);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.queryFtpItemsByTaskIds",info);
 	}
 
 	/**
@@ -125,7 +125,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public List<Map> queryFtpItemAttrsByTaskId(Map info){
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryFtpItemAttrsByTaskId",info);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.queryFtpItemAttrsByTaskId",info);
 	}
 
 	/**
@@ -134,7 +134,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int deleteFtpItemAttrsbyTaskId(Map info){
-		return sqlSessionTemplate.delete("IPrvncFtpFileDAO.deleteFtpItemAttrsbyTaskId", info);
+		return sqlSessionTemplate.delete("IHcFtpFileDAO.deleteFtpItemAttrsbyTaskId", info);
 	}
 
 	@Override
@@ -148,7 +148,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 		}
 		para.put("tablename", tablename.toUpperCase());
 		para.put("colnames", "'"+colnames.toUpperCase().replaceAll(",", "','")+"'");
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryTableColInfo",para);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.queryTableColInfo",para);
 	}
 
 	/**
@@ -157,7 +157,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 */
 	public int addFtpItemAttrs(List<Map> infos){
 		for(Map info :infos){
-			sqlSessionTemplate.insert("IPrvncFtpFileDAO.addFtpItemAttrs",info);
+			sqlSessionTemplate.insert("IHcFtpFileDAO.addFtpItemAttrs",info);
 		}
 
 		return 1;
@@ -169,7 +169,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public List<Map> queryFileNamesWithOutFtpLog(Map info){
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryFileNamesWithOutFtpLog",info);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.queryFileNamesWithOutFtpLog",info);
 	}
 	/**
 	 * 查询ItemSpec
@@ -177,7 +177,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public List<Map> queryItemSpec(Map info){
-		return sqlSessionTemplate.selectList("IPrvncFtpFileDAO.queryItemSpec",info);
+		return sqlSessionTemplate.selectList("IHcFtpFileDAO.queryItemSpec",info);
 	}
 
 	/**
@@ -186,7 +186,7 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int updateFtpItemRunState(Map info){
-		return sqlSessionTemplate.update("IPrvncFtpFileDAO.updateFtpItemRunState", info);
+		return sqlSessionTemplate.update("IHcFtpFileDAO.updateFtpItemRunState", info);
 	}
 
 	/**
@@ -195,9 +195,9 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	 * @return
 	 */
 	public int addDownloadFileName(Map info){
-//		return  Integer.parseInt(getSqlMapClientTemplate().insert("IPrvncFtpFileDAO.addDownloadFileName", info).toString());
+//		return  Integer.parseInt(getSqlMapClientTemplate().insert("IHcFtpFileDAO.addDownloadFileName", info).toString());
 
-		return  sqlSessionTemplate.insert("IPrvncFtpFileDAO.addDownloadFileName", info);
+		return  sqlSessionTemplate.insert("IHcFtpFileDAO.addDownloadFileName", info);
 	}
 
 	/**
@@ -206,18 +206,18 @@ public class HcFtpFileDAOImpl extends BaseServiceDao implements IHccFtpFileDAO {
 	public void saveDbFunction(String function){
 		Map para=new HashMap();
 		para.put("functionname", function);
-		sqlSessionTemplate.selectOne("IPrvncFtpFileDAO.calltaskfunction",para);
+		sqlSessionTemplate.selectOne("IHcFtpFileDAO.calltaskfunction",para);
 	}
 
 	/**
 	 * 执行存过(带参数)，处理任务执行前后的事情
 	 */
 	public void saveDbFunctionWithParam(Map info){
-		sqlSessionTemplate.selectOne("IPrvncFtpFileDAO.calltaskfunctionwithparam",info);
+		sqlSessionTemplate.selectOne("IHcFtpFileDAO.calltaskfunctionwithparam",info);
 	}
 
 	public void insertFileData2Table(String insertSQL){
 		// TODO Auto-generated method stub
-		sqlSessionTemplate.update("IPrvncFtpFileDAO.insertFileData2Table",insertSQL);
+		sqlSessionTemplate.update("IHcFtpFileDAO.insertFileData2Table",insertSQL);
 	}
 }

JobService/src/main/java/com/java110/job/smo/HcFtpToFileSystemQuartz.java

@@ -2,7 +2,7 @@ package com.java110.job.smo;
 import com.java110.common.constant.RuleDomain;
 import com.java110.common.util.DateUtil;
 import com.java110.common.util.StringUtil;
-import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
 
 import com.java110.job.model.FtpTaskLog;
 import com.java110.job.model.FtpTaskLogDetail;
@@ -28,9 +28,9 @@ public abstract class HcFtpToFileSystemQuartz {
 
 	protected static final Logger logger = LoggerFactory.getLogger(HcFtpToFileSystemQuartz.class);
 	@Autowired
-	private IHccFtpFileDAO iprvncFtpFileDAO;
+	private IHcFtpFileDAO iHcFtpFileDAO;
 	@Autowired
-	private IHcFtpFileSMO iprvncFtpFileSMO;
+	private IHcFtpFileSMO iHcFtpFileSMO;
 
 	/*private IPrvncDumpSMO prvncDumpSMO;*/
 	// 运行状态，R：正在执行 T：等待运行 TD1:文件下载失败 TD2:文件内容保存失败 TU1:数据文件生成失败 TU2:数据文件上传失败
@@ -46,7 +46,7 @@ public abstract class HcFtpToFileSystemQuartz {
 		Map paramIn = new HashMap();
 		paramIn.put("oldRunState", "R");
 		paramIn.put("runState", "T");
-		int updateFtpItemRunStateFlag = iprvncFtpFileDAO.updateFtpItemRunState(paramIn);
+		int updateFtpItemRunStateFlag = iHcFtpFileDAO.updateFtpItemRunState(paramIn);
 		if (updateFtpItemRunStateFlag < 1) {
 			logger.error("--【PrvncFtpToFileSystemQuartz.initTask】,没有需要更新的内容（没有下载一半后停止应用的情况）", paramIn);
 		}
@@ -153,7 +153,7 @@ public abstract class HcFtpToFileSystemQuartz {
 
 		if (taskInfo.containsKey("PREFUNCTION") && taskInfo.get("PREFUNCTION") != null && !"".equals(taskInfo.get("PREFUNCTION"))) {
 			try {
-				iprvncFtpFileSMO.saveDbFunction(taskInfo.get("PREFUNCTION").toString());
+				iHcFtpFileSMO.saveDbFunction(taskInfo.get("PREFUNCTION").toString());
 				taskInfo.put("threadrunstate", "T");
 				taskInfo.put("remark", "调用事前存过结束");
 				saveTaskLogDetail(taskInfo);
@@ -181,7 +181,7 @@ public abstract class HcFtpToFileSystemQuartz {
 			try {
 				taskInfo.put("functionname", taskInfo.get("AFTERFUNCTION"));
 				// taskInfo 参数param需要在process方法中需要自己写入
-				iprvncFtpFileSMO.saveDbFunctionWithParam(taskInfo);
+				iHcFtpFileSMO.saveDbFunctionWithParam(taskInfo);
 				taskInfo.put("threadrunstate", "T");
 				taskInfo.put("remark", "调用事后存过结束");
 				saveTaskLogDetail(taskInfo);
@@ -205,7 +205,7 @@ public abstract class HcFtpToFileSystemQuartz {
 
 		info.put("taskId", taskId);
 		info.put("runState", state);
-		int updateFtpItemFlag = iprvncFtpFileDAO.updateFtpItemByTaskId(info);
+		int updateFtpItemFlag = iHcFtpFileDAO.updateFtpItemByTaskId(info);
 		// 这里只是后台提示，不进行日志保存
 		if (updateFtpItemFlag < 1) {
 			logger.error("---【PrvncFtpToFileSystemQuartz.updateTaskState】修改任务【" + taskId + "】的状态失败", info);
@@ -219,7 +219,7 @@ public abstract class HcFtpToFileSystemQuartz {
 		FtpTaskLog loginfo = new FtpTaskLog();
 		loginfo.setLogid(Long.valueOf(taskInfo.get("logid").toString()));
 		loginfo.setState(taskInfo.get("threadrunstate").toString());
-		iprvncFtpFileSMO.updateTaskRunLog(loginfo);
+		iHcFtpFileSMO.updateTaskRunLog(loginfo);
 	}
 
 	/**
@@ -245,7 +245,7 @@ public abstract class HcFtpToFileSystemQuartz {
 		logdetail.setData(taskInfo.get("data") == null ? "" : taskInfo.get("data").toString());
 		logdetail.setServerfilename(taskInfo.get("serverfilename") == null ? "" : taskInfo.get("serverfilename").toString());
 		logdetail.setLocalfilename(taskInfo.get("localfilename") == null ? "" : taskInfo.get("localfilename").toString());
-		int logdetailid = iprvncFtpFileSMO.saveTaskRunDetailLog(logdetail);
+		int logdetailid = iHcFtpFileSMO.saveTaskRunDetailLog(logdetail);
 		taskInfo.put("logdetailid", logdetailid);
 	}
 
@@ -273,7 +273,7 @@ public abstract class HcFtpToFileSystemQuartz {
 		loginfo.setServerfilename("");// taskInfo.get("serverfilename").toString()
 		loginfo.setLocalfilename("");// taskInfo.get("localfilename").toString()
 		loginfo.setUord(taskInfo.get("U_OR_D").toString());
-		return iprvncFtpFileSMO.saveTaskRunLog(loginfo);
+		return iHcFtpFileSMO.saveTaskRunLog(loginfo);
 	}
 
 	/**
@@ -349,20 +349,20 @@ public abstract class HcFtpToFileSystemQuartz {
 
 	}
 
-	public IHccFtpFileDAO getPrvncFtpFileDAO() {
-		return iprvncFtpFileDAO;
+	public IHcFtpFileDAO getPrvncFtpFileDAO() {
+		return iHcFtpFileDAO;
 	}
 
-	public void setPrvncFtpFileDAO(IHccFtpFileDAO prvncFtpFileDAO) {
-		this.iprvncFtpFileDAO = prvncFtpFileDAO;
+	public void setPrvncFtpFileDAO(IHcFtpFileDAO prvncFtpFileDAO) {
+		this.iHcFtpFileDAO = prvncFtpFileDAO;
 	}
 
 	public IHcFtpFileSMO getPrvncFtpFileSMO() {
-		return iprvncFtpFileSMO;
+		return iHcFtpFileSMO;
 	}
 
 	public void setPrvncFtpFileSMO(IHcFtpFileSMO prvncFtpFileSMO) {
-		this.iprvncFtpFileSMO = prvncFtpFileSMO;
+		this.iHcFtpFileSMO = prvncFtpFileSMO;
 	}
 
 	/*public IPrvncDumpSMO getPrvncDumpSMO() {

JobService/src/main/java/com/java110/job/smo/impl/PrvncFtpFileSMOImpl.java

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Map;
 @Service("prvncFtpFileSMOImpl")
 @Transactional
-public class PrvncFtpFileSMOImpl implements IHcFtpFileSMO {
+public class HcFtpFileSMOImpl implements IHcFtpFileSMO {
     /** logger */  
     protected final Logger log= Logger.getLogger(getClass());
 	@Autowired

JobService/src/main/java/com/java110/job/smo/impl/PrvncFtpFileBMOImpl.java

@@ -1,6 +1,6 @@
 package com.java110.job.smo.impl;
 
-import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
 import com.java110.job.model.*;
 import com.java110.job.smo.IHcFtpFileBMO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,43 +10,43 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Map;
 @Service("prvncFtpFileBMOImpl")
 @Transactional
-public class PrvncFtpFileBMOImpl implements IHcFtpFileBMO {
+public class HcPrvncFtpFileBMOImpl implements IHcFtpFileBMO {
 	@Autowired
-	private IHccFtpFileDAO iprvncFtpFileDAO;
+	private IHcFtpFileDAO iHcFtpFileDAO;
 
 	@Override
 	public long saveTaskRunLog(FtpTaskLog loginfo) {
 		// TODO Auto-generated method stub
-		return iprvncFtpFileDAO.saveTaskRunLog(loginfo);
+		return iHcFtpFileDAO.saveTaskRunLog(loginfo);
 	}
 
 	public void updateTaskRunLog(FtpTaskLog loginfo) {
 		// TODO Auto-generated method stub
-		iprvncFtpFileDAO.updateTaskRunLog(loginfo);
+		iHcFtpFileDAO.updateTaskRunLog(loginfo);
 	}
 	public int saveTaskRunDetailLog(FtpTaskLogDetail logdetail) {
 		// TODO Auto-generated method stub
-		return iprvncFtpFileDAO.saveTaskRunDetailLog(logdetail);
+		return iHcFtpFileDAO.saveTaskRunDetailLog(logdetail);
 	}
 
 	/**
 	 * 执行存过，处理任务执行前后的事情
 	 */
 	public void saveDbFunction(String function){
-		iprvncFtpFileDAO.saveDbFunction(function);
+		iHcFtpFileDAO.saveDbFunction(function);
 	}
 
 	/**
 	 * 执行存过(带参数)，处理任务执行前后的事情
 	 */
 	public void saveDbFunctionWithParam(Map info){
-		iprvncFtpFileDAO.saveDbFunctionWithParam(info);
+		iHcFtpFileDAO.saveDbFunctionWithParam(info);
 	}
 
 	@Override
 	public void insertFileData2Table(String insertSQL) {
 		// TODO Auto-generated method stub
-		iprvncFtpFileDAO.insertFileData2Table(insertSQL);
+		iHcFtpFileDAO.insertFileData2Table(insertSQL);
 	}
 	
 }

JobService/src/main/java/com/java110/job/task/HcFtpToFileSystemJob.java

@@ -1,7 +1,7 @@
 package com.java110.job.task;
 
 import com.java110.common.util.SpringBeanInvoker;
-import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
 import com.java110.job.smo.HcFtpToFileSystemQuartz;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
@@ -29,9 +29,9 @@ public class HcFtpToFileSystemJob implements Job {
 	public static String JOB_DATA_TASK_ID = "ftpToFileSystemTaskID";
 	public static String JOB_GROUP_NAME = "ftpToFileSystemJobGroup"; // 任务的 分组名称
 	@Autowired
-	private IHccFtpFileDAO prvncFtpFileDAO;
+	private IHcFtpFileDAO iHcFtpFileDAO;
 	@Autowired
-	private HcFtpToFileSystemQuartz prvncDumpQuartz;
+	private HcFtpToFileSystemQuartz hcFtpToFileSystemQuartz;
 
 	protected void executeInternal(JobExecutionContext context) {
 		try {
@@ -56,8 +56,8 @@ public class HcFtpToFileSystemJob implements Job {
 			}
 
 			String dealClass = ftpItemConfigInfo.get("DEAL_CLASS").toString();
-			prvncDumpQuartz = (HcFtpToFileSystemQuartz) SpringBeanInvoker.getBean(dealClass);
-			prvncDumpQuartz.startFtpTask(ftpItemConfigInfo);
+			hcFtpToFileSystemQuartz = (HcFtpToFileSystemQuartz) SpringBeanInvoker.getBean(dealClass);
+			hcFtpToFileSystemQuartz.startFtpTask(ftpItemConfigInfo);
 		} catch (Throwable ex) {
 			logger.error("执行任务失败：", ex);
 		}
@@ -72,7 +72,7 @@ public class HcFtpToFileSystemJob implements Job {
 	private Map getFtpConfigInfo(long taskId) {
 		Map info = new HashMap();
 		info.put("taskId", taskId);
-		Map ftpItem = getPrvncFtpFileDAO().queryFtpItemByTaskId(info);
+		Map ftpItem = getiHcFtpFileDAO().queryFtpItemByTaskId(info);
 		if (logger.isDebugEnabled()) {
 			logger.debug(
 					"---【PrvncFtpToFileSystemQuartz.getFtpConfigInfo】查询到的配置数据为："
@@ -81,12 +81,12 @@ public class HcFtpToFileSystemJob implements Job {
 		return ftpItem;
 	}
 
-	public IHccFtpFileDAO getPrvncFtpFileDAO() {
-		if (this.prvncFtpFileDAO == null) {
-			this.prvncFtpFileDAO = ((IHccFtpFileDAO) SpringBeanInvoker
-					.getBean("provInner.PrvncFtpFileDAO"));
+	public IHcFtpFileDAO getiHcFtpFileDAO() {
+		if (this.iHcFtpFileDAO == null) {
+			this.iHcFtpFileDAO = ((IHcFtpFileDAO) SpringBeanInvoker
+					.getBean("provInner.iHcFtpFileDAO"));
 		}
-		return prvncFtpFileDAO;
+		return iHcFtpFileDAO;
 	}
 
 	@Override

JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java

@@ -1,7 +1,7 @@
 package com.java110.job.util;
 
 import com.java110.common.util.SpringBeanInvoker;
-import com.java110.job.dao.IHccFtpFileDAO;
+import com.java110.job.dao.IHcFtpFileDAO;
 import com.java110.job.model.FtpTaskLogDetail;
 import com.java110.job.smo.IHcFtpFileSMO;
 import org.apache.commons.net.PrintCommandListener;
@@ -48,9 +48,9 @@ public class FTPClientTemplate implements Callable<Map> {
     private String transferflag;											//传输类型
     private Map threadpara;												//线程执行参数
     @Autowired
-    private IHccFtpFileDAO prvncFtpFileDAO;
+    private IHcFtpFileDAO iHcFtpFileDAO;
     @Autowired
-    private IHcFtpFileSMO prvncFtpFileSMO;
+    private IHcFtpFileSMO iHcFtpFileSMO;
     public static String SPECIAL_SINGLESPLIT_a="+*|";										//字符串分隔符特殊字符需要用加"\\"来转译
     //传输类型（“U"是上传      upload     ”D“是下载   download）
     public static class TransferType{
@@ -104,8 +104,8 @@ public class FTPClientTemplate implements Callable<Map> {
 		init();
 	}
 	private void init(){
-		this.prvncFtpFileDAO = ((IHccFtpFileDAO) SpringBeanInvoker.getBean("provInner.PrvncFtpFileDAO"));
-		this.prvncFtpFileSMO=((IHcFtpFileSMO) SpringBeanInvoker.getBean("provInner.PrvncFtpFileSMO"));
+		this.iHcFtpFileDAO = ((IHcFtpFileDAO) SpringBeanInvoker.getBean("provInner.iHcFtpFileDAO"));
+		this.iHcFtpFileSMO=((IHcFtpFileSMO) SpringBeanInvoker.getBean("provInner.iHcFtpFileSMO"));
 	}
 	public Map call() throws Exception {
 		Map result=null;
@@ -500,7 +500,7 @@ public class FTPClientTemplate implements Callable<Map> {
     		tablename=tablename.trim();
     		tablename=tablename.substring(tablename.lastIndexOf(" "), tablename.length());
     		//查字段的数据类型
-    		List<Map> collist=prvncFtpFileDAO.queryTableColInfo(tablename.trim(), colnames.trim());
+    		List<Map> collist=iHcFtpFileDAO.queryTableColInfo(tablename.trim(), colnames.trim());
 			RandomAccessFile raf = new RandomAccessFile(localfilename, "r");
 			long filelen=raf.length();
 			if (filelen != 0L) {  
@@ -569,7 +569,7 @@ public class FTPClientTemplate implements Callable<Map> {
 		logdetail.setRemark((String)threadpara.get("remark"));
 		logdetail.setServerfilename((String)threadpara.get("serverfilename"));
 		logdetail.setLocalfilename((String)threadpara.get("localfilename"));
-		prvncFtpFileSMO.saveTaskRunDetailLog(logdetail);
+		iHcFtpFileSMO.saveTaskRunDetailLog(logdetail);
 	}
     public void saveStringToData(String data, String insertsql, String colnames, List<Map> collist){
 		//拼接数据保存的SQL语句，日期型的值要格式化下
@@ -588,7 +588,7 @@ public class FTPClientTemplate implements Callable<Map> {
 		}
 		insertsql=getInsertTableSQL(colnames,collist,datarows,insertsql);
 		//执行SQL语句，保存数据
-		prvncFtpFileSMO.insertFileData2Table(insertsql);
+		iHcFtpFileSMO.insertFileData2Table(insertsql);
     }
     /**
      * 拼接数据保存的SQL语句，日期型的值要格式化下

JobService/src/main/resources/static/js/HcFtpToFileSystemConfigList.js

@@ -8,7 +8,7 @@ $(document).ready(function(){
 function loadTaskDataPage(curPage){
 	$.ajax({
 	      type: 'POST',
-	      url: '/FtpToFileSystemConfigList/queryFtpItems',
+	      url: '/HcFtpToFileSystemConfigList/queryFtpItems',
 	      data: {
 	    	curPage:curPage
 	      },
@@ -457,7 +457,7 @@ function queryTaskAttrData(taskId){
 
         $.ajax({
           type: 'POST',
-          url: '../FtpToFileSystem_queryTaskAttrs.action',
+          url: '/HcFtpToFileSystemConfigList/queryTaskAttrs',
           data: {
                 ftpItemJson:requestParam
           },
@@ -513,7 +513,7 @@ function queryTaskAttr(obj,doType){
     // 请求处理
      $.ajax({
           type: 'POST',
-          url: '../FtpToFileSystem_questTaskTample.action',
+          url: '/HcFtpToFileSystemConfigList/questTaskTample',
           data: {
                 ftpItemJson:requestParam
           },
@@ -587,7 +587,7 @@ function saveTaskInfo(doType){
     var uOrDNew = $('#uOrD'+doType).val();
     var fileNameNew = $('#fileName'+doType).val();
     var taskId = -1;
-    var url = "/FtpToFileSystemConfigList/addFtpItem";// 新增时的URL
+    var url = "/HcFtpToFileSystemConfigList/addFtpItem";// 新增时的URL
     if(doType == 'Edit'){
         url = '../FtpToFileSystem_editFtpItem.action';// 编辑时的URL
         taskId = $('#taskId'+doType).val();

JobService/src/main/resources/templates/HcFtpToFileSystemConfigList.html

@@ -1,7 +1,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<title>通用FTP数据文件与TFS传接</title>
+		<title>通用定时任务处理</title>
 		<!--    <link rel="stylesheet" href="../ftpcss/bootstrap-combined.min.css"/>-->
 		<link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css" />
 		<link rel="stylesheet" type="text/css" href="../css/HcFtpToFileSystemConfigList.css" />
@@ -16,7 +16,7 @@
 						<a href="https://demo.java110.com">HC平台</a>
 						<span class="glyphicon glyphicon-menu-right "
 							style="font-size: 6px;"></span>
-						<span>通用FTP数据文件与TFS传接</span>
+						<span>通用定时任务处理</span>
 					</p>
 				</div>
 			</div>

java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml

@@ -28,13 +28,13 @@
 	        ]]>
         </selectKey>
         insert into
-        HC_FTP_TASKLOG(logid,taskid,u_or_d,create_date,state,serverfilename,localfilename,filelength)
+        hc_ftp_tasklog(logid,taskid,u_or_d,create_date,state,serverfilename,localfilename,filelength)
         values(#logid#,#taskid#,#uord#,sysdate,#state#,#serverfilename#,#localfilename#,#filelength#)
     </insert>
 
     <update id="updateTaskRunLog"
     >
-        update HC_FTP_TASKLOG set update_date=sysdate
+        update hc_ftp_tasklog set update_date=sysdate
         <if test="state !=null and state != ''">,state = #{state}
         </if>
         where logid=#logid#
@@ -48,13 +48,13 @@
 	        ]]>
         </selectKey>
         insert into
-        HC_FTP_TASKLOG_DETAIL(id,logid,taskid,create_date,state,tnum,begin,end,data,havedown,remark,SERVERFILENAME,LOCALFILENAME)
+        hc_ftp_tasklog_detail(id,logid,taskid,create_date,state,tnum,begin,end,data,havedown,remark,SERVERFILENAME,LOCALFILENAME)
         values(#id#,#logid#,#taskid#,sysdate,#state#,#tnum#,#begin#,#end#,#data#,#havedown#,#remark#,#serverfilename#,#localfilename#)
     </insert>
 
 
             <insert id="addFtpItem" parameterType="Map">
-                insert into HC_FTP_TASK(taskid,
+                insert into hc_ftp_task(taskid,
                 taskname,
                 file_name,
                 u_or_d,
@@ -89,7 +89,7 @@
 
             <select id="queryTaskDetailInfo" parameterType="long"
                 resultType="Map">
-                select * from HC_FTP_TASKLOG_DETAIL
+                select * from hc_ftp_tasklog_detail
                 where detailid=#{value}
             </select>
             <select id="queryFtpUserInfo" parameterType="long" resultType="Map">
@@ -111,7 +111,7 @@
             <select id="queryFtpItemsCount" parameterType="Map"
                 resultType="Integer">
                 SELECT count(1)
-                FROM HC_FTP_TASK A
+                FROM hc_ftp_task A
                 WHERE A.STATE = 'A'
 
             </select>
@@ -136,7 +136,7 @@
                        A.AFTERFUNCTION,
                        A.DEAL_CLASS,
                        A.CREATE_DATE
-                  FROM HC_FTP_TASK A
+                  FROM hc_ftp_task A
                  WHERE A.STATE = 'A') A1
                  where  1 = 1 limit #{curPage},#{pageSize}
             ]]>
@@ -167,7 +167,7 @@
                 A.AFTERFUNCTION,
                 A.DEAL_CLASS,
                 A.CREATE_DATE
-                FROM HC_FTP_TASK A
+                FROM hc_ftp_task A
                 WHERE A.STATE = 'A'
                 and A.TASKID = #{taskId}
             </select>
@@ -192,7 +192,7 @@
                 A.AFTERFUNCTION,
                 A.DEAL_CLASS,
                 A.CREATE_DATE
-                FROM HC_FTP_TASK A
+                FROM hc_ftp_task A
                 WHERE A.STATE = 'A'
                 and A.TASKNAME like '%' || #{taskName} || '%'
                 and rownum < 1000
@@ -200,7 +200,7 @@
             </select>
             <!-- 修改ftp配置信息 -->
             <update id="updateFtpItemByTaskId" parameterType="Map">
-                update HC_FTP_TASK sft
+                update hc_ftp_task sft
                 set update_date = sysdate
                 <if test="taskName !=null and taskName != ''">,sft.taskname = #{taskName}
                 </if>
@@ -232,7 +232,7 @@
             <!-- 修改ftp配置信息 -->
             <update id="updateFtpItemRunState" parameterType="Map">
                 update
-                HC_FTP_TASK sft
+                hc_ftp_task sft
                 set update_date = sysdate,sft.run_state= #{runState}
                 where sft.run_state = #{oldRunState}
             </update>
@@ -240,7 +240,7 @@
             <!-- 删除ftp配置信息 -->
             <update id="deleteFtpItemByTaskId" parameterType="Map">
                 update
-                HC_FTP_TASK sft
+                hc_ftp_task sft
                 set sft.state = 'R'
                 where sft.state = 'A'
                 and sft.taskid in
@@ -268,7 +268,7 @@
                 A.AFTERFLAG,
                 A.AFTERFUNCTION,
                 A.DEAL_CLASS
-                FROM HC_FTP_TASK A
+                FROM hc_ftp_task A
                 WHERE A.STATE = 'A'
                 AND A.TASKID in
                 <foreach open="(" close=")"
@@ -280,13 +280,13 @@
             <select id="queryFtpItemAttrsByTaskId" parameterType="Map"
                 resultType="Map">
                 SELECT A.TASKID, A.ITEM_SPEC_ID, A.VALUE
-                FROM HC_FTP_TASK_ATTR A
+                FROM hc_ftp_task_attr A
                 WHERE A.TASKID = #{taskId}
             </select>
             <!-- 保存FTPItem的属性信息 -->
             <insert id="addFtpItemAttrs" parameterType="Map">
                 insert into
-                HC_FTP_TASK_ATTR(taskid,item_spec_id,value)
+                hc_ftp_task_attr(taskid,item_spec_id,value)
                 values(#{taskId},#{itemSpecId},#{value})
             </insert>
             <!-- 查询没有下载过的文件名 -->
@@ -295,7 +295,7 @@
                 <![CDATA[
                 SELECT #{fileNames} AS fileNames FROM DUAL
                  where #{fileNames} not in
-                       (select sfl.file_name from saop_ftp_log sfl where sfl.taskId = #{taskId})
+                       (select sfl.file_name from hc_ftp_log sfl where sfl.taskId = #{taskId})
                 ]]>
             </select>
 
@@ -305,7 +305,7 @@
                     SELECT seq_cep_taskid.NEXTVAL  AS logid from dual
                     ]]>
                 </selectKey>
-            insert into saop_ftp_log(
+            insert into hc_ftp_log(
             log_id,
             taskid,
             file_name,
@@ -321,8 +321,8 @@
 
 
             <select id="queryItemSpec" parameterType="Map" resultType="Map">
-                select a.item_spec_cd, a.domain, a.name, a.describes, a.create_date
-                from saop_ftp_item_spec a
+                select a.item_spec_cd as ITEM_SPEC_CD, a.domain as DOMAIN, a.name as NAME, a.describes as DESCRIBES, a.create_date as CREATE_DATE
+                from hc_ftp_item_spec a
                 where a.status_cd = '0'
                 <if test="domain != null and domain !='' "> and a.domain = #{domain}</if>
                 <if test="name != null and name !='' "> and a.name = #{name}</if>