From 76a70a7d31c11a03b56c7696375be3492e298373 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期五, 22 七月 2022 19:42:52 +0800
Subject: [PATCH] #
---
src/main/java/com/slcf/filter/UpdateThread.java | 113 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/slcf/filter/UpdateThread.java b/src/main/java/com/slcf/filter/UpdateThread.java
index 6debabb..dc714a1 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();
@@ -79,13 +79,13 @@
// 娓呯┖2澶╁墠鐨勬棩蹇�
sapRequestLogService.clearSapLog();
// updateWaitCheckData();
- Thread.sleep(5000);
+ Thread.sleep(15000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
-
+
/**
* 澶勭悊鍏ュ簱閫氱煡妗ｆ暟鎹�
*/
@@ -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)
{
@@ -140,7 +140,7 @@
logInfo.setResponse("SAP ERROR-----璋冪敤涓婃灦瀹屾垚鎺ュ彛锛実et璇锋眰鑾峰彇cookie澶辫触");
logInfo.setCreate_time(new Date());
logInfo.setType(2);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
return result;
}
String[] sessionId = sessionCookie.split(";");
@@ -157,16 +157,16 @@
logInfo.setResponse("SAP ERROR-----璋冪敤涓婃灦瀹屾垚鎺ュ彛1锛実et璇锋眰鑾峰彇cookie澶辫触銆�" + e1.getMessage());
logInfo.setCreate_time(new Date());
logInfo.setType(2);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
// e1.printStackTrace();
}finally {
if(connection1!=null){
connection1.disconnect();
}
}
-
+
+ JSONObject jsObj = new JSONObject();
try {
- JSONObject jsObj = new JSONObject();
JSONArray arr = new JSONArray();
for(int i=0;i<1;i++) {
JSONObject json = new JSONObject();
@@ -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);
@@ -254,7 +254,7 @@
logInfo.setCreate_time(new Date());
logInfo.setRemark("涓婃灦瀹屾垚鎺ュ彛:" + message);
logInfo.setType(1);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
// if(zstatus.equals("s")) {
waitPakIn.setIo_status("Y");
waitPakInService.upWaitPakIn(waitPakIn);
@@ -268,7 +268,7 @@
logInfo.setCreate_time(new Date());
logInfo.setRemark("涓婃灦瀹屾垚鎺ュ彛:" + message);
logInfo.setType(2);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
waitPakIn.setIo_status("X");
waitPakIn.setMemo(message);
waitPakInService.upWaitPakIn(waitPakIn);
@@ -283,6 +283,7 @@
waitPakIn.setMemo(e.getMessage());
waitPakInService.upWaitPakIn(waitPakIn);
logger.error("SAP Error sendPakInStatus--"+waitPakIn.getMatnr()+"---" + e.getMessage());
+ logger.error("1鍏ュ簱瀹屾垚鍥炴姤寮傚父鏃禔SRS璇锋眰JSON锛�" + jsObj.toString());
// System.out.println(e.getMessage());
}finally {
if(connection!=null){
@@ -294,11 +295,12 @@
waitPakIn.setMemo(e.getMessage());
waitPakInService.upWaitPakIn(waitPakIn);
logger.error("SAP Error sendPakInStatus--"+waitPakIn.getMatnr()+"---" + e.getMessage());
+ logger.error("2鍏ュ簱瀹屾垚鍥炴姤寮傚父鏃禔SRS璇锋眰JSON锛�" + jsObj.toString());
// System.out.println(e.getMessage());
}
return result;
}
-
+
/**
* 澶勭悊鍑哄簱閫氱煡妗ｆ暟鎹�
*/
@@ -314,7 +316,7 @@
logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
}
}
-
+
/**
* 鍑哄簱瀹屾垚锛岃皟鐢╯ap鎺ュ彛涓婁紶瀹屾垚淇℃伅
*/
@@ -326,7 +328,7 @@
String encodedPassword;
String token="";
String session_value="";
-
+
HttpURLConnection connection1 = null;
try {
encodedPassword = base.encode(input.getBytes("UTF-8"));
@@ -350,13 +352,13 @@
logInfo.setResponse("璋冪敤鍑哄簱瀹屾垚鎺ュ彛锛実et璇锋眰鑾峰彇cookie澶辫触");
logInfo.setCreate_time(new Date());
logInfo.setType(2);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
return result;
}
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) {
@@ -368,26 +370,26 @@
logInfo.setResponse("璋冪敤鍑哄簱瀹屾垚鎺ュ彛锛実et璇锋眰鑾峰彇cookie澶辫触");
logInfo.setCreate_time(new Date());
logInfo.setType(2);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
// e1.printStackTrace();
}finally{
if(connection1!=null){
connection1.disconnect();
}
}
-
+
+ JSONObject jsObj = new JSONObject();
try {
- JSONObject jsObj = new JSONObject();
JSONArray arr = new JSONArray();
for(int i=0;i<1;i++) {
JSONObject json = new JSONObject();
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 +419,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 +427,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 +437,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 +460,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);
@@ -478,7 +481,7 @@
logInfo.setCreate_time(new Date());
logInfo.setType(1);
logInfo.setRemark("鍑哄簱瀹屾垚鎺ュ彛:" + message);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
// if(zstatus.equals("s")) {//涓婃姤SAP鎴愬姛,杞巻鍙叉。
waitPakOut.setIo_status("Y");
waitPakOutService.upWaitPakOut(waitPakOut,0);
@@ -492,7 +495,7 @@
logInfo.setCreate_time(new Date());
logInfo.setType(2);
logInfo.setRemark("鍑哄簱瀹屾垚鎺ュ彛:" + message);
- sapRequestLogService.addSapLog(logInfo);
+// sapRequestLogService.addSapLog(logInfo);
waitPakOut.setIo_status("X");
waitPakOut.setMemo(message);
waitPakOutService.upWaitPakOut(waitPakOut,0);
@@ -507,7 +510,8 @@
waitPakOut.setIo_status("X");
waitPakOut.setMemo(e.getMessage());
waitPakOutService.upWaitPakOut(waitPakOut,0);
- logger.error("鍑哄簱閫氱煡妗ｅ洖鎶ュ紓甯�--"+waitPakOut.getMatnr() + "---" + e.getMessage());
+ logger.error("鍑哄簱閫氱煡妗ｅ洖鎶ュ紓甯�1--"+waitPakOut.getMatnr() + "---" + e.getMessage());
+ logger.error("1鍑哄簱瀹屾垚鍥炴姤寮傚父鏃禔SRS璇锋眰JSON锛�" + jsObj.toString());
// System.out.println(e.getMessage());
}finally{
if(connection!=null){
@@ -518,12 +522,13 @@
waitPakOut.setIo_status("X");
waitPakOut.setMemo(e.getMessage());
waitPakOutService.upWaitPakOut(waitPakOut,0);
- logger.error("鍑哄簱閫氱煡妗ｅ洖鎶ュ紓甯�--"+waitPakOut.getMatnr() + "---" + e.getMessage());
+ logger.error("鍑哄簱閫氱煡妗ｅ洖鎶ュ紓甯�2--"+waitPakOut.getMatnr() + "---" + e.getMessage());
+ logger.error("2鍑哄簱瀹屾垚鍥炴姤寮傚父鏃禔SRS璇锋眰JSON锛�" + jsObj.toString());
// System.out.println(e.getMessage());
}
return result;
}
-
+
/**
* 澶勭悊鎵撳嵃鏍囩闇�姹�
*/
@@ -538,7 +543,7 @@
logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
}
}
-
+
/**
* 鎷ｆ枡绔欙紝璋冪敤SAP鎵撳嵃鏍囩鎺ュ彛,action=2
*/
@@ -550,7 +555,7 @@
String encodedPassword;
String token="";
String session_value="";
-
+
HttpURLConnection connection1 = null;
try {
// logger.error("sendPrinCommand-----璋冪敤鎵撳嵃鎺ュ彛" + waitPakOut.getMaktx());
@@ -599,7 +604,7 @@
connection1.disconnect();
}
}
-
+
try {
// logger.error("sendPrinCommand2-----寮�濮嬭皟鐢ㄦ墦鍗版帴鍙�" + waitPakOut.getMaktx());
JSONObject jsObj = new JSONObject();
@@ -609,9 +614,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 +639,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 +647,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 +657,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 +763,7 @@
}
return result;
}
-
+
/**
* 澶勭悊鐩樼偣閫氱煡妗ｆ暟鎹�
*/
@@ -766,10 +771,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