From f425ca4f837d9aec07670d4feefbde0a411f3a8a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期四, 06 二月 2020 19:05:07 +0800
Subject: [PATCH] 巡检点表sql
---
JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java b/JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java
index d19a5a3..a0c92ca 100644
--- a/JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java
+++ b/JobService/src/main/java/com/java110/job/util/FTPClientTemplate.java
@@ -1,17 +1,18 @@
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 com.java110.job.smo.impl.HcFtpFileSMOImpl;
import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
import java.io.*;
import java.net.SocketException;
import java.util.*;
@@ -27,8 +28,8 @@
//---------------------------------------------------------------------
// Instance data
//---------------------------------------------------------------------
- /** logger */
- protected final Logger log = Logger.getLogger(getClass());
+ /** logger */
+ private static final Logger logger = LoggerFactory.getLogger(HcFtpFileSMOImpl.class);
private static ThreadLocal<FTPClient> ftpClientThreadLocal = new ThreadLocal<FTPClient>();
private String host;
private int port;
@@ -47,10 +48,10 @@
private String localfilename; //鏈湴淇濆瓨鐨勬枃浠跺悕
private String transferflag; //浼犺緭绫诲瀷
private Map threadpara; //绾跨▼鎵ц鍙傛暟
- @Autowired
- private IHccFtpFileDAO prvncFtpFileDAO;
- @Autowired
- private IHcFtpFileSMO prvncFtpFileSMO;
+ @Resource(name = "hcFtpFileDAOImpl")
+ private IHcFtpFileDAO hcFtpFileDAOImpl;
+ @Resource(name = "hcFtpFileSMOImpl")
+ private IHcFtpFileSMO hcFtpFileSMOImpl;
public static String SPECIAL_SINGLESPLIT_a="+*|"; //瀛楃涓插垎闅旂鐗规畩瀛楃闇�瑕佺敤鍔�"\\"鏉ヨ浆璇�
//浼犺緭绫诲瀷锛堚�淯"鏄笂浼� upload 鈥滵鈥滄槸涓嬭浇 download锛�
public static class TransferType{
@@ -104,8 +105,7 @@
init();
}
private void init(){
- this.prvncFtpFileDAO = ((IHccFtpFileDAO) SpringBeanInvoker.getBean("provInner.PrvncFtpFileDAO"));
- this.prvncFtpFileSMO=((IHcFtpFileSMO) SpringBeanInvoker.getBean("provInner.PrvncFtpFileSMO"));
+
}
public Map call() throws Exception {
Map result=null;
@@ -346,7 +346,7 @@
//澶勭悊浼犺緭
input = new FileInputStream(localAbsoluteFile);
getFTPClient().storeFile(remoteAbsoluteFile, input);
- log.debug("put " + localAbsoluteFile);
+ logger.debug("put " + localAbsoluteFile);
return true;
} catch (FileNotFoundException e) {
throw new Exception("local file not found.", e);
@@ -455,8 +455,8 @@
}
} catch (IOException e) {
result.put("flag", "0");
- log.debug(" not upload !!! ");
- log.debug("uploadFileFrom IOException : {}", e);
+ logger.debug(" not upload !!! ");
+ logger.debug("uploadFileFrom IOException : {}", e);
throw e;
} catch (Exception e1) {
result.put("flag", "0");
@@ -500,7 +500,7 @@
tablename=tablename.trim();
tablename=tablename.substring(tablename.lastIndexOf(" "), tablename.length());
//鏌ュ瓧娈电殑鏁版嵁绫诲瀷
- List<Map> collist=prvncFtpFileDAO.queryTableColInfo(tablename.trim(), colnames.trim());
+ List<Map> collist=hcFtpFileDAOImpl.queryTableColInfo(tablename.trim(), colnames.trim());
RandomAccessFile raf = new RandomAccessFile(localfilename, "r");
long filelen=raf.length();
if (filelen != 0L) {
@@ -569,7 +569,7 @@
logdetail.setRemark((String)threadpara.get("remark"));
logdetail.setServerfilename((String)threadpara.get("serverfilename"));
logdetail.setLocalfilename((String)threadpara.get("localfilename"));
- prvncFtpFileSMO.saveTaskRunDetailLog(logdetail);
+ hcFtpFileSMOImpl.saveTaskRunDetailLog(logdetail);
}
public void saveStringToData(String data, String insertsql, String colnames, List<Map> collist){
//鎷兼帴鏁版嵁淇濆瓨鐨凷QL璇彞锛屾棩鏈熷瀷鐨勫�艰鏍煎紡鍖栦笅
@@ -588,7 +588,7 @@
}
insertsql=getInsertTableSQL(colnames,collist,datarows,insertsql);
//鎵цSQL璇彞锛屼繚瀛樻暟鎹�
- prvncFtpFileSMO.insertFileData2Table(insertsql);
+ hcFtpFileSMOImpl.insertFileData2Table(insertsql);
}
/**
* 鎷兼帴鏁版嵁淇濆瓨鐨凷QL璇彞锛屾棩鏈熷瀷鐨勫�艰鏍煎紡鍖栦笅
@@ -829,7 +829,7 @@
if(end>=filelength){
end=filelength-1;
}
- log.debug("绾跨▼:" + tnum +"浠�"+start+"寮�濮嬩笂浼犲埌"+end+ "缁撴潫锛屽叡闇�涓婁紶:"+(end-start+1));
+ logger.debug("绾跨▼:" + tnum +"浠�"+start+"寮�濮嬩笂浼犲埌"+end+ "缁撴潫锛屽叡闇�涓婁紶:"+(end-start+1));
accessFile = new RandomAccessFile(file, "rwd");
ftpClient = getFTPClient();
ftpClient.setRestartOffset(start);
@@ -846,7 +846,7 @@
while ((len =accessFile.read(data)) != -1 && downedlength < threadDownSize) {
downedlength = downedlength + len;
out.write(data,0,len);
- log.debug("绾跨▼:" + tnum + "宸蹭笂浼�:"+downedlength);
+ logger.debug("绾跨▼:" + tnum + "宸蹭笂浼�:"+downedlength);
if(downedlength==threadDownSize){
break;
}
@@ -854,11 +854,11 @@
data = new byte[Integer.valueOf(Long.toString(threadDownSize-downedlength))];
}
}
- log.debug("绾跨▼:" + tnum + "涓婁紶瀹屾垚!鍏变笂浼�"+downedlength);
+ logger.debug("绾跨▼:" + tnum + "涓婁紶瀹屾垚!鍏变笂浼�"+downedlength);
} catch (IOException e) {
flag = "0";
- log.debug(" not upload !!! ");
- log.debug("uploadFileFrom IOException : {}", e);
+ logger.debug(" not upload !!! ");
+ logger.debug("uploadFileFrom IOException : {}", e);
} catch (Exception e1) {
// TODO Auto-generated catch block
flag="0";
@@ -902,7 +902,7 @@
if(end>=filelength){
end=filelength-1;
}
- log.debug("绾跨▼:" + tnum +"浠�"+start+"寮�濮嬩笅杞藉埌"+end+ "缁撴潫锛屽叡闇�涓嬭浇:"+(end-start+1));
+ logger.debug("绾跨▼:" + tnum +"浠�"+start+"寮�濮嬩笅杞藉埌"+end+ "缁撴潫锛屽叡闇�涓嬭浇:"+(end-start+1));
ftpClient = getFTPClient();
accessFile = new RandomAccessFile(file, "rwd");
ftpClient.setRestartOffset(start);
@@ -915,7 +915,7 @@
while ((len = in.read(data)) != -1 && downedlength < threadDownSize) {
downedlength = downedlength + len;
accessFile.write(data, 0, len);
- log.debug("绾跨▼:" + tnum + "宸蹭笅杞�:"+downedlength);
+ logger.debug("绾跨▼:" + tnum + "宸蹭笅杞�:"+downedlength);
if(downedlength==threadDownSize){
break;
}
@@ -923,15 +923,15 @@
data = new byte[Integer.valueOf(Long.toString(threadDownSize-downedlength))];
}
}
- log.debug("绾跨▼:" + tnum + "涓嬭浇瀹屾垚!鍏变笅杞�"+downedlength);
+ logger.debug("绾跨▼:" + tnum + "涓嬭浇瀹屾垚!鍏变笅杞�"+downedlength);
} catch (IOException e1) {
// TODO Auto-generated catch block
flag="0";
- log.error("涓嬭浇绾跨▼寮傚父", e1);
+ logger.error("涓嬭浇绾跨▼寮傚父", e1);
} catch (Exception e1) {
// TODO Auto-generated catch block
flag="0";
- log.error("涓嬭浇绾跨▼寮傚父", e1);
+ logger.error("涓嬭浇绾跨▼寮傚父", e1);
} finally {
try {
// ftpClient.logout();
--
Gitblit v1.8.0