From 056d69b6ca918332b76d9e61f65461b6b0605c23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 七月 2021 09:03:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/slcf/filter/UpdateThread.java |   83 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/slcf/filter/UpdateThread.java b/src/main/java/com/slcf/filter/UpdateThread.java
index f62afed..dc86fc9 100644
--- a/src/main/java/com/slcf/filter/UpdateThread.java
+++ b/src/main/java/com/slcf/filter/UpdateThread.java
@@ -47,11 +47,11 @@
 //	private static WaitPakInServiceImpl waitPakInService;
 	@Autowired
 	SapRequestLogService sapRequestLogService;
-	
+
 	Logger logger=Logger.getLogger(UpdateThread.class);
-	
+
 	public static int count=0;
-	
+
 	private WaitPakInService waitPakInService;
 	public WaitPakInService getWaitPakInService() {
 		return waitPakInService;
@@ -67,7 +67,7 @@
 	public void setWaitPakOutService(WaitPakOutService waitPakOutService) {
 		this.waitPakOutService = waitPakOutService;
 	}
-	
+
 	public void run() {
 		waitPakInService = getWaitPakInService();
 		waitPakOutService = getWaitPakOutService();
@@ -85,7 +85,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * 澶勭悊鍏ュ簱閫氱煡妗f暟鎹�
 	 */
@@ -102,7 +102,7 @@
 //			System.out.println(e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * 鍏ュ簱瀹屾垚锛岃皟鐢╯ap鎺ュ彛涓婁紶瀹屾垚淇℃伅
 	 */
@@ -114,7 +114,7 @@
         String encodedPassword;
         String token="";
         String session_value="";
-        
+
         HttpURLConnection connection1 = null;
 		try {
 			encodedPassword = base.encode(input.getBytes("UTF-8"));
@@ -127,8 +127,8 @@
 	        connection1.setRequestMethod("GET");
 	        connection1.setRequestProperty("Authorization", "Basic " + encodedPassword);
 	        connection1.setRequestProperty("x-csrf-token","Fetch");
-	       
-	        
+
+
 	        String sessionCookie = connection1.getHeaderField("Set-Cookie");
 	        if(sessionCookie==null || sessionCookie.length()<1)
 	        {
@@ -164,7 +164,7 @@
 				connection1.disconnect();
 			}
 		}
-        
+
 		try {
 			JSONObject jsObj = new JSONObject();
 			JSONArray arr = new JSONArray();
@@ -174,7 +174,7 @@
 				json.put("tbnum",Long.toString(waitPakIn.getTbnum()));
 				json.put("tbpos",Integer.toString(waitPakIn.getTbpos()));
 				json.put("zmatid",waitPakIn.getZmatid());
-				
+
 				json.put("anfme",Double.toString(waitPakIn.getAnfme()));
 				json.put("altme",waitPakIn.getAltme());
 				json.put("nltyp","A01");
@@ -191,7 +191,7 @@
 //	        	String input = "ZHANGX:654321";
 //	            BASE64Encoder base = new BASE64Encoder();
 //	            String encodedPassword = base.encode(input.getBytes("UTF-8"));
-	            
+
 	        	URL url = new URL(httpUrl);
 		        connection = (HttpURLConnection) url.openConnection();
 		        connection.setDoOutput(true);
@@ -199,7 +199,7 @@
 		        connection.setRequestMethod("POST");
 		        connection.setConnectTimeout(30000);
 		        connection.setReadTimeout(30000);
-//        		connection.setUseCaches(false);            
+//        		connection.setUseCaches(false);
 //        		connection.setInstanceFollowRedirects(true);
 //		        connection.setRequestProperty("Content-Type","text/json;charset=gb2312");
 		        connection.setRequestProperty("Cookie", session_value);
@@ -209,12 +209,12 @@
 		        connection.setRequestProperty("Content-Length","" + buffLen);
 //		        connection.setRequestProperty("Authorization", "Basic " + encodedPassword);
 		        connection.setRequestProperty("x-csrf-token",token);
-		        
+
 		        //POST璇锋眰
 		        OutputStream out = connection.getOutputStream();
 		        out.write(buff);
 				out.close();
-				
+
 		        //璇诲彇鍝嶅簲
 		        BufferedReader reader = new BufferedReader(new InputStreamReader(
 		                connection.getInputStream()));
@@ -233,7 +233,7 @@
 				JSONObject jsonItem = JSONObject.fromObject(Item);
 				String results = jsonItem.get("results").toString();
 				JSONArray array = JSONArray.fromObject(results);
-				
+
 				if(array.size()>0) {
 					for(int i=0;i<array.size();i++){
 						JSONObject job = array.getJSONObject(i);
@@ -298,7 +298,7 @@
 		}
 		return result;
 	}
-	
+
 	/**
 	 * 澶勭悊鍑哄簱閫氱煡妗f暟鎹�
 	 */
@@ -314,7 +314,7 @@
 			logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * 鍑哄簱瀹屾垚锛岃皟鐢╯ap鎺ュ彛涓婁紶瀹屾垚淇℃伅
 	 */
@@ -326,7 +326,7 @@
         String encodedPassword;
         String token="";
         String session_value="";
-        
+
         HttpURLConnection connection1 = null;
 		try {
 			encodedPassword = base.encode(input.getBytes("UTF-8"));
@@ -356,7 +356,7 @@
 	        String[] sessionId = sessionCookie.split(";");
 	        session_value = sessionId[0];
 	        token = connection1.getHeaderField("x-csrf-token");
-	        
+
 //	        Map<String, List<String>> map = connection1.getHeaderFields();
 //	        token = map.get("x-csrf-token").toString();
 		} catch (Exception e1) {
@@ -375,7 +375,7 @@
 				connection1.disconnect();
 			}
 		}
-        
+
 		try {
 			JSONObject jsObj = new JSONObject();
 			JSONArray arr = new JSONArray();
@@ -384,10 +384,10 @@
 				json.put("lgnum",waitPakOut.getLgnum());
 				json.put("tanum",Long.toString(waitPakOut.getTanum()));
 				json.put("tapos",Integer.toString(waitPakOut.getTapos()));
-				
+
 				double nista =  waitPakOut.getNista();
-//				if(nista>0) 				
-				if(nista>=-1 && (int)nista!=0) 
+//				if(nista>0)
+				if(nista>=-1 && (int)nista!=0)
 				{
 					double vsolm = waitPakOut.getVsolm();
 					if( (int)nista == -1 ) {
@@ -417,7 +417,7 @@
 //	        	String input = "ZHANGX:654321";
 //	            BASE64Encoder base = new BASE64Encoder();
 //	            String encodedPassword = base.encode(input.getBytes("UTF-8"));
-	            
+
 	        	URL url = new URL(httpUrl);
 		        connection = (HttpURLConnection) url.openConnection();
 		        connection.setDoOutput(true);
@@ -425,7 +425,7 @@
 		        connection.setConnectTimeout(30000);
 		        connection.setReadTimeout(30000);
 		        connection.setRequestMethod("POST");
-		//        connection.setUseCaches(false);            
+		//        connection.setUseCaches(false);
 		//        connection.setInstanceFollowRedirects(true);
 //		        connection.setRequestProperty("Content-Type","text/json;charset=gb2312");
 		        connection.setRequestProperty("Cookie", session_value);
@@ -435,12 +435,12 @@
 		        connection.setRequestProperty("Content-Length","" + buffLen);
 //		        connection.setRequestProperty("Authorization", "Basic " + encodedPassword);
 		        connection.setRequestProperty("x-csrf-token",token);
-		        
+
 		        //POST璇锋眰
 		        OutputStream out = connection.getOutputStream();
 		        out.write(buff);
 				out.close();
-				
+
 		        //璇诲彇鍝嶅簲
 		        BufferedReader reader = new BufferedReader(new InputStreamReader(
 		                connection.getInputStream()));
@@ -458,7 +458,8 @@
 				JSONObject jsonItem = JSONObject.fromObject(Item);
 				String results = jsonItem.get("results").toString();
 				JSONArray array = JSONArray.fromObject(results);
-				
+
+				logger.info("鍑哄簱閫氱煡妗AP杩斿洖鏁版嵁闆嗗ぇ灏� ===>> " + array.size());
 				if(array.size()>0) {
 					for(int i=0;i<array.size();i++){
 						JSONObject job = array.getJSONObject(i);
@@ -523,7 +524,7 @@
 		}
 		return result;
 	}
-	
+
 	/**
 	 * 澶勭悊鎵撳嵃鏍囩闇�姹�
 	 */
@@ -538,7 +539,7 @@
 			logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * 鎷f枡绔欙紝璋冪敤SAP鎵撳嵃鏍囩鎺ュ彛,action=2
 	 */
@@ -550,7 +551,7 @@
         String encodedPassword;
         String token="";
         String session_value="";
-        
+
         HttpURLConnection connection1 = null;
 		try {
 //			logger.error("sendPrinCommand-----璋冪敤鎵撳嵃鎺ュ彛" + waitPakOut.getMaktx());
@@ -599,7 +600,7 @@
 				connection1.disconnect();
 			}
 		}
-        
+
 		try {
 //			logger.error("sendPrinCommand2-----寮�濮嬭皟鐢ㄦ墦鍗版帴鍙�" + waitPakOut.getMaktx());
 			JSONObject jsObj = new JSONObject();
@@ -609,9 +610,9 @@
 				json.put("lgnum",waitPakOut.getLgnum());
 				json.put("tanum",Long.toString(waitPakOut.getTanum()));
 				json.put("tapos",Integer.toString(waitPakOut.getTapos()));
-				
+
 				double nista =  waitPakOut.getNista();
-				if(nista>0) 
+				if(nista>0)
 				{
 					double vsolm = waitPakOut.getVsolm();
 					double ndifa = vsolm - nista;
@@ -634,7 +635,7 @@
 //	        	String input = "ZHANGX:654321";
 //	            BASE64Encoder base = new BASE64Encoder();
 //	            String encodedPassword = base.encode(input.getBytes("UTF-8"));
-	            
+
 	        	URL url = new URL(httpUrl);
 		        connection = (HttpURLConnection) url.openConnection();
 		        connection.setDoOutput(true);
@@ -642,7 +643,7 @@
 		        connection.setConnectTimeout(30000);
 		        connection.setReadTimeout(30000);
 		        connection.setRequestMethod("POST");
-		//        connection.setUseCaches(false);            
+		//        connection.setUseCaches(false);
 		//        connection.setInstanceFollowRedirects(true);
 //		        connection.setRequestProperty("Content-Type","text/json;charset=gb2312");
 		        connection.setRequestProperty("Cookie", session_value);
@@ -652,7 +653,7 @@
 		        connection.setRequestProperty("Content-Length","" + buffLen);
 //		        connection.setRequestProperty("Authorization", "Basic " + encodedPassword);
 		        connection.setRequestProperty("x-csrf-token",token);
-		        
+
 		        //POST璇锋眰
 		        OutputStream out = connection.getOutputStream();
 		        out.write(buff);
@@ -758,7 +759,7 @@
 		}
 		return result;
 	}
-	
+
 	/**
 	 * 澶勭悊鐩樼偣閫氱煡妗f暟鎹�
 	 */
@@ -766,10 +767,10 @@
 		try {
 //			logger.info("waitCheck:" + count++);
 		}catch(Exception e) {
-			
+
 		}
 	}
-	
+
 	public static void main(String[] args) {
 		UpdateThread Thread1=new UpdateThread();
 		Thread mThread1=new Thread(Thread1,"绾跨▼1");

--
Gitblit v1.9.1