From 7add7aa4ca3105fcc742d5f42bdc11a3ff322a03 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 07 九月 2023 10:03:23 +0800
Subject: [PATCH] 优化接口信息
---
src/main/java/com/fzzy/api/view/pr/Api1107PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api1108PR.java | 2
src/main/java/com/fzzy/api/view/Api1108.view.xml | 1
src/main/java/com/fzzy/api/view/pr/Api1110PR.java | 2
src/main/java/com/fzzy/api/entity/Api1202.java | 34 ++++++++--------
src/main/java/com/fzzy/api/entity/Api1108.java | 5 +-
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java | 14 +++++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 5 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 2
9 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index 9b7d610..a49e5d8 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -92,9 +92,8 @@
private String czclfs;
@PropertyDef(label = "淇濊川鏈�")
- @Column(name = "bzq", length = 20)
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date bzq;
+ @Column(name = "bzq", length = 40)
+ private String bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index be445d6..128c4d7 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -166,7 +166,7 @@
@PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
@Column(name = "bzbdbz")
- private double bzbdbz = 25;
+ private Double bzbdbz = 25.0;
@PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
@Column(name = "bzbjs")
@@ -174,55 +174,55 @@
@PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
@Column(name = "zjklxj")
- private double zjklxj;
+ private Double zjklxj;
@PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
@Column(name = "qzsfzkl")
- private double qzsfzkl;
+ private Double qzsfzkl;
@PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
@Column(name = "qzzzzkl")
- private double qzzzzkl;
+ private Double qzzzzkl;
@PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
@Column(name = "qzbwslkl")
- private double qzbwslkl;
+ private Double qzbwslkl;
@PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
@Column(name = "qzhhkl")
- private double qzhhkl;
+ private Double qzhhkl;
@PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
@Column(name = "qzsmlkl")
- private double qzsmlkl;
+ private Double qzsmlkl;
@PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
@Column(name = "qzzjmlkl")
- private double qzzjmlkl;
+ private Double qzzjmlkl;
@PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
@Column(name = "qzgwcmkl")
- private double qzgwcmkl;
+ private Double qzgwcmkl;
@PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
@Column(name = "qzhlmkl")
- private double qzhlmkl;
+ private Double qzhlmkl;
@PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
@Column(name = "qzqtkl")
- private double qzqtkl;
+ private Double qzqtkl;
@PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
@Column(name = "zlfyzkl")
- private double zlfyzkl;
+ private Double zlfyzkl;
@PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
@Column(name = "bzwkl")
- private double bzwkl;
+ private Double bzwkl;
@PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
@Column(name = "qtkl")
- private double qtkl;
+ private Double qtkl;
@PropertyDef(label = "鎵ｉ噺鍘熷洜")
@Column(name = "klyy", length = 512)
@@ -230,11 +230,11 @@
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
@Column(name = "xckl")
- private double xckl;
+ private Double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
@Column(name = "zkj")
- private double zkj;
+ private Double zkj;
@PropertyDef(label = "澧炴墸浠峰師鍥�")
@Column(name = "zkhyy", length = 27)
@@ -242,7 +242,7 @@
@PropertyDef(label = "鍑�閲�(鍏枻)")
@Column(name = "jz")
- private double jz;
+ private Double jz;
@PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
@Column(name = "zxzydw", length = 256)
diff --git a/src/main/java/com/fzzy/api/view/Api1108.view.xml b/src/main/java/com/fzzy/api/view/Api1108.view.xml
index b040226..32fcc8d 100644
--- a/src/main/java/com/fzzy/api/view/Api1108.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1108.view.xml
@@ -99,7 +99,6 @@
<Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="id">
- <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="yjbh">
<Property></Property>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1107PR.java b/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
index 8ddb463..592b31a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
@@ -125,7 +125,7 @@
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(d.getCzbz())) {
- api1107Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ api1107Rep.updateStatus(data.getBizId(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
index 23e2d4a..30fd443 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
@@ -55,7 +55,7 @@
Api1108 data = new Api1108();
BeanUtils.copyProperties(entity, data);
- data.setId(data.getId().trim());
+ data.setId(data.getBizId().trim());
api1108Rep.save(data);
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1110PR.java b/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
index e1daf72..83dd31a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
@@ -122,7 +122,7 @@
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(d.getCzbz())) {
- api1110Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ api1110Rep.updateStatus(data.getHwdm(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
index 7491323..91c5aa1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
@@ -46,6 +46,20 @@
//璐ㄦ鍚屾
fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+// /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
+// //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
+// //鐔忚捀澶囨鏁版嵁鍚屾
+// fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+//
+// }
+//
+// //閫氶浣滀笟淇℃伅鍚屾
+// fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+//
+// //鐔忚捀浣滀笟淇℃伅鍚屾
+// fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
index 2103ef8..f241393 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -112,7 +112,7 @@
api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
}
- api1302.setZhgxsj(syncTime);
+ api1302.setZhgxsj(fz35Grain.getReceiveDate());
api1302.setBizId(fz35Grain.getBatchId());
api1302.setKqdm(api1105.getKqdm());
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
index 80def0e..94ea5ff 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
@@ -89,10 +89,9 @@
@PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
private String czclfs;
- @Column(name = "bzq", length = 20)
+ @Column(name = "bzq", length = 40)
@PropertyDef(label = "淇濊川鏈�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date bzq;
+ private String bzq;
// @Column(name = "SPEC_", length = 50)
// @PropertyDef(label = "瑙勬牸璇存槑")
--
Gitblit v1.9.3