From 8eee61286b82a95777b809f9e72572bb367d9f9f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 21 十月 2023 15:35:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/apiLog/apiLog.js | 4
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java | 72 ++++++++++++++----------
src/main/resources/application.yml | 8 +-
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 42 +++++++------
4 files changed, 70 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 0bc7bd1..a548629 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -87,7 +87,7 @@
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
//鐗╂枡鐘舵�� FUseOrgId .FNumber
FDocumentStatus="C";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(tag.getUpdateTime())+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='201'");
+ jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(tag.getUpdateTime())+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='100'");
jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
// FName : 鐗╂枡鍚嶇О 锛�
// FNumber 锛氱墿鏂欑紪鍙凤紱
@@ -134,7 +134,7 @@
for (int j = 0; j < data.size(); j++) {
JSONArray jsonArray = data.getJSONArray(j);
//瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- Date date = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
+ Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
//鐢熸垚鍟嗗搧妗ｆ
//鍟嗗搧缂栧彿
Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
@@ -144,7 +144,7 @@
mat.setMaktx(jsonArray.get(0).toString());
mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
mat.setTagId(tag.getId());
- mat.setCreateTime(date);//鍟嗗搧鍒涘缓鏃堕棿
+ mat.setCreateTime(jsonDate);//鍟嗗搧鍒涘缓鏃堕棿
mat.setUpdateTime(new Date());
mat.setStatus(1);
//鏈�鏂版姄鍙栧晢鍝佹椂闂�
@@ -157,10 +157,12 @@
// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
}else {
- callApiLogSaveMat(mat,kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:"+mat.getMatnr(), false);
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}],鍟嗗搧缂栧彿閲嶅锛侊紒锛�", mat.getMatnr());
+ if (!jsonDate.equals(tag.getUpdateTime())){
+ callApiLogSaveMat(mat,kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:"+mat.getMatnr(), false);
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}],鍟嗗搧缂栧彿閲嶅锛侊紒锛�", mat.getMatnr());
+ }
}
- tag.setUpdateTime(date);
+ tag.setUpdateTime(jsonDate);
}
tagService.updateById(tag);
} else {
@@ -251,20 +253,20 @@
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "杞鏁版嵁",
- URL + inaddress,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "杞鏁版嵁",
+// URL + inaddress,
+// null,
+// "127.0.0.1",
+// add,
+// response,
+// success
+// );
+// } catch (Exception e) {
+// log.error("", e);
+// }
}
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
index a7f19ce..3530b48 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
@@ -5,11 +5,13 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
import com.zy.erp.kingdee.entity.param.LoginParam;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -79,54 +81,64 @@
if (Cools.isEmpty(jsonObject.getString("Message"))) {
success = true;
} else {
+ callApiLogSaveLog(JSON.toJSONString(loginParam),false);
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
- throw new CoolException("鐧诲綍閲戣澏澶辫触");
+// throw new CoolException("鐧诲綍閲戣澏澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
+ callApiLogSaveLog(JSON.toJSONString(loginParam),false);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鐧诲綍閲戣澏",
- URL + loginaddress,
- null,
- "127.0.0.1",
- JSON.toJSONString(loginParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鐧诲綍閲戣澏",
+// URL + loginaddress,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(loginParam),
+// response,
+// success
+// );
+// } catch (Exception e) { log.error("", e); }
}
return SUCCESS.setContent(cookie);
}
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
- return result;
- }
- }
- } else if (v instanceof JSONObject){
- Object result = findValueByKey((JSONObject) v, key);
+ public static Object findValueByKey(JSONObject json, String key) {
+ Set<String> keySet = json.keySet();
+ for (String k : keySet) {
+ Object v = json.get(k);
+ if (k.equals(key)) {
+ return v;
+ } else if (v instanceof JSONArray) {
+ int size = ((JSONArray) v).size();
+ for (int i = 0; i <= size - 1; i++) {
+ Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
if (result != null){
return result;
}
}
+ } else if (v instanceof JSONObject){
+ Object result = findValueByKey((JSONObject) v, key);
+ if (result != null){
+ return result;
+ }
}
- return null;
}
+ return null;
+ }
+
+ public void callApiLogSaveLog(String response, Boolean bool) {
+ apiLogService.save("鐧诲綍閲戣澏澶辫触", URL, "null", loginaddress,
+ "濂楄处ID锛�"+acctID+"銆佽处鍙凤細"+username+"銆佸瘑鐮侊細"+password,
+ response, bool);
+ }
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4cdec92..c21bb59 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -71,7 +71,7 @@
ReviewOrderSwitch: false
# 鍦板潃
address:
- URL: http://ht01.wlgear.com:16001
+ URL: http://58.210.10.90:28090
#鐧诲綍鍦板潃
loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
#鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
@@ -80,7 +80,7 @@
outaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
# 鐧诲綍璐﹀彿绠＄悊
login :
- acctID: "64c7666b20caf2"
- username: "cs"
- password: "123456"
+ acctID: "647e849ab6fa0f"
+ username: "llw"
+ password: "666666"
lcid: 2052
\ No newline at end of file
diff --git a/src/main/webapp/static/js/apiLog/apiLog.js b/src/main/webapp/static/js/apiLog/apiLog.js
index f406a18..1d24b5e 100644
--- a/src/main/webapp/static/js/apiLog/apiLog.js
+++ b/src/main/webapp/static/js/apiLog/apiLog.js
@@ -25,10 +25,10 @@
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
,{field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿'}
- ,{field: 'url', align: 'center',title: '琛ㄥ悕'}
+ ,{field: 'url', align: 'center',title: '琛ㄥ崟ID'}
,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜',hide: true}
// ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�'}
- ,{field: 'clientIp', align: 'center',title: '涓棿琛↖P'}
+ ,{field: 'clientIp', align: 'center',title: 'URL',hide: true}
,{field: 'request', align: 'center',title: '璇锋眰鍐呭'}
,{field: 'response', align: 'center',title: '鎿嶄綔鍐呭'}
// ,{field: 'err', align: 'center',title: '寮傚父鍐呭'}
--
Gitblit v1.9.1