From c972846d9e2c591120ec55c5e1feb277b10969f0 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 21 九月 2023 19:18:14 +0800
Subject: [PATCH] 优化上海接口上报
---
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java | 6 ++++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java | 2 +-
src/main/java/com/fzzy/api/entity/Api1301.java | 2 +-
src/main/java/com/fzzy/api/view/Api1301.view.xml | 1 +
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 4 ++--
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 1 +
7 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index 079ba93..e797676 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -102,7 +102,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺" )
@Column(name = "zgsx", length = 10)
- private String zgsx;
+ private Date zgsx;
@PropertyDef(label = "璐ｄ换鍗曚綅" )
@Column(name = "zrdw", length = 128, nullable = false)
diff --git a/src/main/java/com/fzzy/api/view/Api1301.view.xml b/src/main/java/com/fzzy/api/view/Api1301.view.xml
index 44ac853..fe40b33 100644
--- a/src/main/java/com/fzzy/api/view/Api1301.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1301.view.xml
@@ -79,6 +79,7 @@
<PropertyDef name="zgsx">
<Property></Property>
<Property name="label">鏁存敼鏃堕檺</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="zrdw">
<Property></Property>
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index 95879c1..f78f5bf 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -22,7 +22,7 @@
@Query("update Api1202 set czbz =:czbz where rkywdh=:rkywdh")
int updateStatus(@Param("rkywdh") String rkywdh, @Param("czbz") String czbz);
- @Query("from Api1202 where rkywdh=:hwdm ")
+ @Query("from Api1202 where hwdm=:hwdm ")
List<Api1202> getDataByHwdm(@Param("hwdm") String hwdm);
@Query("from Api1202 where rkywdh=:rkywdh ")
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 0378266..ec1541f 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -55,7 +55,7 @@
// fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
- fzzySync1201.syncData(kqdm, deptId, start, end);
+// fzzySync1201.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱鍚屾
// fzzySync1202.syncData(kqdm, deptId, start, end);
@@ -64,7 +64,7 @@
// fzzySync1203.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱缁撶畻鍚屾
-// fzzySync1204.syncData(kqdm, deptId, start, end);
+ fzzySync1204.syncData(kqdm, deptId, start, end);
//
// //绮鍑哄簱鍚屾
// fzzySync1205.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index bf887fd..8d978d9 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -661,6 +661,7 @@
//TODO 璐т綅浠ｇ爜 绮鎬ц川浠ｇ爜 鏉ョ伯浠ｇ爜
+
api1211.setBjw(ShAreaBjw.getBjw(code));
list.add(api1211);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
index ff2b68f..ccff16f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
@@ -76,7 +76,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺")
- private String zgsx;
+ private Date zgsx;
@PropertyDef(label = "璐ｄ换鍗曚綅")
private String zrdw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
index 508732b..5218221 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
@@ -42,9 +42,11 @@
private String jchcff;
@PropertyDef(label = "鍙戠敓閮ㄤ綅")
- private String fsbw;
+ @JSONField(serialize = true)
+ private String fsbw = "鏃�";
@PropertyDef(label = "瀹宠櫕绉嶇被")
+ @JSONField(serialize = true)
private String hczl;
@PropertyDef(label = "铏彛瀵嗗害鍊奸泦鍚�")
@@ -54,7 +56,7 @@
private String cldjpd;
@PropertyDef(label = "瀹宠櫕鎶楄嵂鎬у垎鏋�")
- private String hckyxfx;
+ private String hckyxfx= "鏃�";
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
--
Gitblit v1.9.3