From 3a894ab344295a44fede3d5f9a9a0eaa36280486 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 16 一月 2026 17:57:32 +0800
Subject: [PATCH] 上传日志只保存错误数据
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 4 +
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java | 39 ++++++++++++++++---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 4 +
src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java | 12 +++--
src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java | 4 +
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 4 +
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 4 +
src/main/java/com/fzzy/api/timer/SyncDataScheduled.java | 5 +-
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 4 +
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 8 ++-
src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java | 4 +
src/main/java/com/fzzy/api/timer/PushDataScheduled.java | 2
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 4 +
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 4 +
14 files changed, 76 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
index d6f5042..093416b 100644
--- a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
@@ -123,7 +123,7 @@
if (String.valueOf(minute).equals(conf.getPushMinute99())) {
isExecute = true;
if (!isUpdateStart) {
- start = DateUtils.addHours(start, -2);
+ start = DateUtils.addHours(start, -3);
}
} else {
isExecute = false;
diff --git a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
index e4131f9..9392c2f 100644
--- a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -123,10 +123,11 @@
if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
isExecute = true;
if (!isUpdateStart) {
- start = DateUtils.addHours(start, -2);
+ start = DateUtils.addHours(start, -3);
}
} else {
- isExecute = false;
+ isExecute = true;
+ start = DateUtils.addHours(start, -3);
}
if (!isExecute) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
index a3b2317..1f20a64 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
@@ -3,11 +3,9 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
import java.util.Date;
+import java.util.List;
/**
* 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
@@ -50,6 +48,10 @@
@PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
private String contractName;
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "瀹㈡埛鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+ private String customerName;
+
// 缁撶畻淇℃伅
@Column(name = "PAY_PRICE_")
@PropertyDef(label = "鍗曚环")
@@ -76,7 +78,7 @@
private String payee;
@Column(name = "PAYEE_ID_")
- @PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
+ @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
private String payeeId;
@Column(name = "BANK_CATEGORY_", length = 10)
@@ -102,12 +104,37 @@
@Column(name = "PAY_USER_", length = 40)
@PropertyDef(label = "浠樻鎿嶄綔浜�")
private String payUser;
-
+
+ @Column(name = "fphm", length = 10)
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @Column(name = "fpzt", length = 10)
+ @PropertyDef(label = "鍙戠エ鐘舵��",description = "1锛氭甯�,0锛氫綔搴�")
+ private String fpzt;
+
@Column(name = "REMARKS_", length = 200)
@PropertyDef(label = "澶囨敞淇℃伅")
private String remarks;
+ @Column(name = "INOUT_RECORD_ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String inoutRecordId;
+
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
+
+ /**
+ * 绯荤粺鍐呬笟鍔′娇鐢紝鍙湁鍗曡溅缁撶畻璧嬪��
+ */
+ @Column(name = "PLATE_NUM_", length = 20)
+ @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+ private String plateNum;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+
}
diff --git a/src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java b/src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java
index ff4ce9d..fb57940 100644
--- a/src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java
@@ -332,7 +332,9 @@
}
- apiLogRep.save(apiLog);
+ if (responseDto.getSuccess() > 0) {
+ apiLogRep.save(apiLog);
+ }
return responseDto;
}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 950582c..49e6137 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -126,7 +126,9 @@
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getMsg());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getMsg());
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 8f1ec15..8d1d696 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -129,7 +129,9 @@
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getMsg());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getMsg());
@@ -882,8 +884,8 @@
}
}
- api1403.setRotationInQty(Double.valueOf(String.format("%.3f",lrsl)));
- api1403.setRotationOutQty(Double.valueOf(String.format("%.3f",lcsl)));
+ api1403.setRotationInQty(Double.valueOf(String.format("%.3f", lrsl)));
+ api1403.setRotationOutQty(Double.valueOf(String.format("%.3f", lcsl)));
api1403.setDtls(dtls);
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2023ResponseDto responseDto = GD2023HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 7466bbc..2766156 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -133,7 +133,9 @@
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
index 3ceb289..2e09d02 100644
--- a/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
@@ -131,7 +131,9 @@
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 71f2008..700e8f3 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -165,7 +165,9 @@
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 5307143..3e49f79 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -133,7 +133,9 @@
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getDescription());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 1) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getDescription());
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index 30e14fc..30200fd 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
@@ -147,7 +147,9 @@
SX2023Dto result = JSONObject.parseObject(JSONObject.toJSONString(sx2023RespDto.getMsgBody()), SX2023Dto.class);
apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
apiLog.setResult(result.getVER());
- apiLogRep.save(apiLog);
+ if (!result.getCode().equals("200")) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
resd.setMsg(result.getVER());
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 7cf9c19..dac4099 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -151,7 +151,9 @@
SX2024Dto result = JSONObject.parseObject(JSONObject.toJSONString(sx2024RespDto.getMsgBody()), SX2024Dto.class);
apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
apiLog.setResult(result.getVER());
- apiLogRep.save(apiLog);
+ if (!result.getCode().equals("200")) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
resd.setMsg(result.getVER());
diff --git a/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
index 17b82b3..37d9d02 100644
--- a/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
@@ -148,7 +148,9 @@
SX2025Dto result = sx2025RespDto.getMsgBody();
apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
apiLog.setResult(result.getVER());
- apiLogRep.save(apiLog);
+ if (!result.getCode().equals("200")) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
resd.setMsg(result.getVER());
@@ -389,7 +391,7 @@
}
//璐﹀淇℃伅
if (Constant.API_CODE_1504.equals(inteId)) {
- Api1504 api1504 = (Api1504)data;
+ Api1504 api1504 = (Api1504) data;
SX2025Api1504 apiData = new SX2025Api1504();
BeanUtils.copyProperties(api1504, apiData);
//璁剧疆绲变竴搴撳尯缂栫爜
@@ -406,7 +408,7 @@
}
//绉戠洰淇℃伅
if (Constant.API_CODE_1505.equals(inteId)) {
- Api1505 api1505 = (Api1505)data;
+ Api1505 api1505 = (Api1505) data;
SX2025Api1505 apiData = new SX2025Api1505();
BeanUtils.copyProperties(api1505, apiData);
apiData.setCqunit(api1505.getCqunit() + "");
@@ -956,7 +958,7 @@
cntxwjlj += apiData.getTykqbm() + "/";
cntxwjlj += apiData.getYzwbh() + "/";
cntxwjlj += apiData.getSpjksbid() + "/";
- cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(),"yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm();
+ cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(), "yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm();
apiData.setCntxwjlj(cntxwjlj);
return apiData;
}
@@ -975,7 +977,7 @@
spwjlj += apiData.getTykqbm() + "/";
spwjlj += apiData.getSpjksbid() + "/";
spwjlj += apiData.getSpjksbid() + "/";
- spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(),"yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm();
+ spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(), "yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm();
apiData.setSpwjlj(spwjlj);
return apiData;
}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index c0980f9..d5c2155 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -135,7 +135,9 @@
WhjlRespDto responseDto = whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
--
Gitblit v1.9.3