优化:ftp响应时间慢。

src/main/java/com/hywa/banktest/bankframework/schedule/TransSchedule.java

@@ -155,6 +155,7 @@ public class TransSchedule {
 		}
 		//邮储已经回盘文件下载到本地
 		List<String> localNewFiles = ftpUtil.localNewFiles(ftpDownloadDir, resFiles, baseDir + File.separator);
+		log.info("------>本次新回盘文件"+ JSONObject.toJSONString(localNewFiles));
 
 		//执行回盘业务处理
 		if (localNewFiles != null && localNewFiles.size() > 0) {
@@ -163,6 +164,7 @@ public class TransSchedule {
 				bankService.updateOrderInfoPaymentRec(trans,newFile,newFile.replaceFirst("res", "qut"));
 			}
 		}
+		log.info("结束调度回盘任务");
 	}
 
 	public String getClearText(String fileName){
@@ -179,4 +181,55 @@ public class TransSchedule {
 		}
 		return null;
 	}
+
+	//@Scheduled(cron = "0 0/2 * * * ?")
+	public void checkClearOtherText(){
+		log.info("--->手动解析回盘文件");
+		//String checkTime = DateUtils.formatDate(new Date(),DateUtils.DEFAULT_FORMAT);
+		//得到转账中oderInfo的转账文件
+		//List<String> transFiles = clearingRecordService.getBankClearingFilesByTimed(checkTime);
+		List<String> transFiles = new ArrayList<>();
+		transFiles.add("20220616qut368.txt");
+		/*transFiles.add("20180418qut006.txt");
+		transFiles.add("20180418qut007.txt");
+		transFiles.add("20220523qut203.txt");*/
+		log.info("------>有没有文件"+ JSONObject.toJSONString(transFiles));
+		List<String> resFiles = new ArrayList<>();
+		if(null!=transFiles && transFiles.size()>0){
+			for (String transFile : transFiles) {
+				//回盘文件名称
+				String transRetFile = transFile.replaceFirst("qut", "res");
+				resFiles.add(transRetFile);
+			}
+		}
+		//邮储已经回盘文件下载到本地
+		List<String> localNewFiles = ftpUtil.localNewFiles(ftpDownloadDir, resFiles, baseDir + File.separator);
+
+		//执行回盘业务处理
+		if (localNewFiles != null && localNewFiles.size() > 0) {
+			for (String newFile : localNewFiles){
+				List<TransVo> trans = TransUtils.fileToTransVo(baseDir, newFile);
+				bankService.updateOrderInfoPaymentRec(trans,newFile   ,newFile.replaceFirst("res", "qut"));
+			}
+		}
+	}
+
+	/**
+	 * 手动解析回盘文件
+	 */
+	//@Scheduled(cron = "0 0/2 * * * ?")
+	public void checkClearWriterText(){
+		log.info("--->手动解析回盘文件");
+		//邮储已经回盘文件下载到本地
+		List<String> localNewFiles = new ArrayList<>();
+		localNewFiles.add("20220616res368.txt");
+
+		//执行回盘业务处理
+		if (localNewFiles != null && localNewFiles.size() > 0) {
+			for (String newFile : localNewFiles){
+				List<TransVo> trans = TransUtils.fileToTransVo(baseDir, newFile);
+				bankService.updateOrderInfoPaymentRec(trans,newFile   ,newFile.replaceFirst("res", "qut"));
+			}
+		}
+	}
 }

src/main/java/com/hywa/banktest/bankframework/utils/FtpUtil.java

@@ -10,6 +10,7 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
@@ -20,6 +21,7 @@ import templateservice.FileKit;
 
 
 @Component
+@Slf4j
 public class FtpUtil {
 	
 	@Value("${bank.post.ftp.address}")
@@ -41,6 +43,7 @@ public class FtpUtil {
 			if (!FTPReply.isPositiveCompletion(replyCode)) {
 				throw new RuntimeException("登陆ftp服务器失败");
 			}
+			log.info(ftpClient.getReplyString());
 			return ftpClient;
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
@@ -55,6 +58,7 @@ public class FtpUtil {
 		if (null != ftpClient) {
 			try {
 				ftpClient.logout();
+				log.info(ftpClient.getReplyString());
 			} catch (IOException e) {
 			}
 			if (ftpClient.isConnected()) {
@@ -95,6 +99,7 @@ public class FtpUtil {
 			ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
 			ftpClient.makeDirectory(pathname);
 			ftpClient.changeWorkingDirectory(pathname);
+			ftpClient.enterLocalPassiveMode();
 			ftpClient.storeFile(fileName, inputStream);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -125,6 +130,7 @@ public class FtpUtil {
 			ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
 			ftpClient.makeDirectory(pathname);
 			ftpClient.changeWorkingDirectory(pathname);
+			ftpClient.enterLocalPassiveMode();
 			ftpClient.storeFile(fileName, inputStream);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -238,6 +244,7 @@ public class FtpUtil {
 
 			for (String ftpFileName:ftpFileNames) {
 				try {
+					ftpClient.enterLocalPassiveMode();
 					FTPFile[] ftpFileArr = ftpClient.listFiles(ftpFileName);
 					//文件存在下载到本地
 					if (null == ftpFileArr || ftpFileArr.length > 0) {

src/main/java/com/hywa/banktest/controller/ApplyClearingController.java

@@ -227,7 +227,14 @@ public class ApplyClearingController  {
 
     @GetMapping("/checkService")
     public AjaxJson checkService(){
+        log.info("连接服务正常");
         return new AjaxJson("连接服务正常");
     }
+
+    /*@GetMapping("/checkClearing")
+    public AjaxJson checkService(@RequestParam("recordId") String recordId){
+        int i = orderInfoService.dealClearingRecordByRid(recordId,"1");
+        return new AjaxJson(ResponseEnum.SUCCESS);
+    }*/
 }
 

src/main/resources/mappers/clearing/ClearingRecordDetailMapper.xml

@@ -135,10 +135,8 @@
       SET aa.bank_receipt_file =#{bean.bankReceiptFile},
       aa.bank_deal_state = #{bean.bankDealState},
       aa.clearing_state = #{bean.clearingState},
-      aa.bank_deal_msg = #{bean.bankDealMsg}
-      <if test="bean.bankReceiptFile != null and bean.bankReceiptFile != ''">
-        ,aa.payment_time = DATE_FORMAT(SUBSTRING_INDEX(#{bean.bankReceiptFile},"res",1),"%Y-%m-%d %T")
-      </if>
+      aa.bank_deal_msg = #{bean.bankDealMsg},
+      aa.payment_time = #{bean.clearingTimed}
       WHERE aa.id = #{bean.id}
     </foreach>
   </insert>