From 0970d25c1ecc9a832d4f240298540695398a98d2 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:42:49 +0800
Subject: [PATCH] 优化上海接口上报
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 2 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java | 14 +++++++-------
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java | 7 -------
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 1 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java | 4 ++--
8 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
index 0eba4ae..ec13f9f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -65,7 +65,7 @@
continue;
}
sh2023Api1311 = new SH2023Api1311();
- sh2023Api1311.setSxtbh(dataID);
+ sh2023Api1311.setSpjksbid(dataID);
sh2023Api1311.setTdbh(sysData.getChanNum());
sh2023Api1311.setTdmc(sysData.getChanNum() + "鍙烽�氶亾");
sh2023Api1311.setJksbmc(sysData.getName());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 3b3a07b..e04e9bf 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -822,7 +822,6 @@
for (Api1401 apiData : api1401List) {
api1401 = new SH2023Api1401();
BeanUtils.copyProperties(apiData, api1401);
- api1401.setBjw(ShAreaBjw.getBjw(code));
list.add(api1401);
}
return JSON.toJSONString(list);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
index 96d7a02..065bc2a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -45,7 +45,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "妫�楠屾棩鏈�")
- private String jyrq;
+ private Date jyrq;
@PropertyDef(label = "妫�楠屽崟浣�")
private String jydw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
index e9c0b01..17e7ea2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
@@ -25,11 +25,6 @@
*/
private static final long serialVersionUID = 1L;
-
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- @Column(name = "kqdm", length = 21)
- private String kqdm;
-
@PropertyDef(label = "骞翠唤")
private String nf;
@@ -61,7 +56,5 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "鏍囪浣�")
- private String bjw;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
index 34c449b..02eb499 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -37,9 +37,11 @@
@PropertyDef(label = "璁″垝骞村害")
private String jhnd;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�")
private Date kszxrq;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鎴鎵ц鏃ユ湡")
private Date jzzxrq;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
index a844a58..6ab6a95 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
@@ -47,7 +47,7 @@
private String lhhwdm;
@PropertyDef(label = "杞崲鏁伴噺")
- private Double lhsl;
+ private double lhsl;
@PropertyDef(label = "杞崲绫诲瀷")
private String lhlx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
index 7bd9f11..99ff952 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
@@ -54,25 +54,25 @@
private String smfqc;
@PropertyDef(label = "鎴愪氦鏁伴噺")
- private Double cjsl;
+ private double cjsl;
@PropertyDef(label = "鎴愪氦閲戦")
- private Double cjje;
+ private double cjje;
@PropertyDef(label = "璧锋媿浠�")
- private Double qpj;
+ private double qpj;
@PropertyDef(label = "鎴愪氦浠�")
- private Double cjj;
+ private double cjj;
@PropertyDef(label = "婧环骞呭害")
- private Double yjfd;
+ private double yjfd;
@PropertyDef(label = "涔版柟鎵嬬画璐�")
- private Double bmfsxf;
+ private double bmfsxf;
@PropertyDef(label = "鍗栨柟鎵嬬画璐�")
- private Double smfsxf;
+ private double smfsxf;
@PropertyDef(label = "閲囪喘/閿�鍞被鍨�")
private String lx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
index fb3e25f..3550c86 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
@@ -46,10 +46,10 @@
private String jyyj;
@PropertyDef(label = "姘村垎")
- private Double sf;
+ private double sf;
@PropertyDef(label = "鍏ュ簱姘村垎")
- private Double rksf;
+ private double rksf;
@PropertyDef(label = "鎵︽牱鏃堕棿")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3