From 2afd0de5d9a8d0a339e26b8084a7d17110a1e84e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 04 一月 2023 14:32:35 +0800
Subject: [PATCH] #中间表对接：日志文件优化
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 2 +-
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 8 ++++----
src/main/webapp/views/apiLog/apiLog.html | 6 ++++++
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 16 +++++++++++++++-
src/main/webapp/static/js/apiLog/apiLog.js | 8 ++++----
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 2 +-
6 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index a3362d8..ded8698 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -194,7 +194,7 @@
}
public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip,
+ apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip,
"璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus(),
response, bool);
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
index 4264d62..1f2fd0f 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
@@ -1,5 +1,7 @@
package com.zy.ints.task.scheduler;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpLk;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
@@ -8,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -22,6 +25,10 @@
*/
@Value("${erp.enabled}")
private Boolean erpEnabled;
+ @Value("${erp.useName.ip}")
+ private String ip;
+ @Autowired
+ private ApiLogService apiLogService;
@Autowired
private ErpSqlServer erpSqlServer;
/**
@@ -51,7 +58,14 @@
}
}
}catch (Exception e){
-
+ Date date = new Date();
+ log.error(date + ": 琛ㄥ悕锛歜as_erp_lk :" + e);
}
}
+
+ public void callApiLogSave(ErpLk erpLk, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip,
+ "鍝佸彿锛�" + erpLk.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpLk.getPrdMark() + "銆佹暟閲忥細" + erpLk.getQty() + "銆佺姸鎬侊細" + erpLk.getStatus(),
+ response, bool);
+ }
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
index c8f0f58..e7d311a 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -141,7 +141,7 @@
}
public void callApiLogSave(Prdt prdt, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", "涓棿琛細" + tableName, "null", ip,
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", ip,
"鍝佸彿锛�" + prdt.getPrdNo() + "銆佸搧鍚嶏細" + prdt.getName() + "銆佺被鍨嬶細" + prdt.getType() + "銆佺姸鎬侊細" + prdt.getStatus(),
response, bool);
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
index 801458c..6f98f01 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -137,25 +137,25 @@
}
public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip,
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
"璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus(),
response, bool);
}
public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip,
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip,
"璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus(),
response, bool);
}
public void callApiLogSaveOrderDetl(OrderDetl orderDetl, String response, Boolean bool) {
- apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", "涓棿琛細lk_det_tb", "null", ip,
+ apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", "lk_det_tb", "null", ip,
"璁㈠崟鍙凤細" + orderDetl.getOrderNo() + "銆佸搧鍙凤細" + orderDetl.getMatnr() + "銆佽揣鍝佺壒寰侊細" + orderDetl.getBatch(),
response, bool);
}
public void callApiLogSaveOrder(Order order, String response, Boolean bool) {
- apiLogService.save("瀹岀粨璁㈠崟淇℃伅涓婃姤瀹屾垚", "涓棿琛細lk_det_tb", "null", ip,
+ apiLogService.save("瀹岀粨璁㈠崟淇℃伅涓婃姤瀹屾垚", "lk_det_tb", "null", ip,
"璁㈠崟鍙凤細" + order.getOrderNo(), response, bool);
}
}
diff --git a/src/main/webapp/static/js/apiLog/apiLog.js b/src/main/webapp/static/js/apiLog/apiLog.js
index 9e7dd31..f406a18 100644
--- a/src/main/webapp/static/js/apiLog/apiLog.js
+++ b/src/main/webapp/static/js/apiLog/apiLog.js
@@ -25,12 +25,12 @@
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
,{field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿'}
- ,{field: 'url', align: 'center',title: '鎺ュ彛鍦板潃'}
- ,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜'}
+ ,{field: 'url', align: 'center',title: '琛ㄥ悕'}
+ ,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜',hide: true}
// ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�'}
- ,{field: 'clientIp', align: 'center',title: '瀹㈡埛绔疘P'}
+ ,{field: 'clientIp', align: 'center',title: '涓棿琛↖P'}
,{field: 'request', align: 'center',title: '璇锋眰鍐呭'}
- ,{field: 'response', align: 'center',title: '鍝嶅簲鍐呭'}
+ ,{field: 'response', align: 'center',title: '鎿嶄綔鍐呭'}
// ,{field: 'err', align: 'center',title: '寮傚父鍐呭'}
,{field: 'result$', align: 'center',title: '缁撴灉', templet: '#resTpl', width: 80}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 9efb25c..e35b6a9 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -23,6 +23,12 @@
<input class="layui-input" type="text" name="namespace" placeholder="璇疯緭鍏�..." autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璇锋眰鍐呭:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="request" placeholder="璇疯緭鍏ワ紙璁㈠崟鍙锋垨鍝佸彿锛�" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
--
Gitblit v1.9.1