From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:45:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/view/Api1111.view.xml | 12 ++++++++++++
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java | 9 +++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java | 3 ---
src/main/java/com/fzzy/api/entity/Api1111.java | 12 ++++++++++++
src/main/java/com/fzzy/api/view/Api1108.view.xml | 4 ++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 4 ----
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 2 +-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 2 --
8 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1111.java b/src/main/java/com/fzzy/api/entity/Api1111.java
index d2b1d97..e32784b 100644
--- a/src/main/java/com/fzzy/api/entity/Api1111.java
+++ b/src/main/java/com/fzzy/api/entity/Api1111.java
@@ -67,6 +67,18 @@
@Column(name = "spjklx", length = 1)
private String spjklx;
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷" )
+ @Column(name = "spdwlx", length = 2)
+ private String spdwlx;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜" )
+ @Column(name = "cfdm", length = 25)
+ private String cfdm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜" )
+ @Column(name = "ajdm", length = 28)
+ private String ajdm;
+
@PropertyDef(label = "娴峰悍璁惧鍞竴鏍囪瘑" )
@Column(name = "hkCameraIndexCode", length = 36)
private String hkCameraIndexCode;
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 0a0f29a..f90c3e8 100644
--- a/src/main/java/com/fzzy/api/view/Api1108.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1108.view.xml
@@ -5,6 +5,10 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1108</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">涓婚敭id</Property>
+ </PropertyDef>
<PropertyDef name="bizId">
<Property></Property>
<Property name="label">涓氬姟id</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1111.view.xml b/src/main/java/com/fzzy/api/view/Api1111.view.xml
index c2275e5..fa078c0 100644
--- a/src/main/java/com/fzzy/api/view/Api1111.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1111.view.xml
@@ -63,6 +63,18 @@
<Property></Property>
<Property name="label">瑙嗛鐩戞帶绫诲瀷</Property>
</PropertyDef>
+ <PropertyDef name="spdwlx">
+ <Property></Property>
+ <Property name="label">瑙嗛鐐逛綅绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="cfdm">
+ <Property></Property>
+ <Property name="label">浠撴埧浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="ajdm">
+ <Property></Property>
+ <Property name="label">寤掗棿浠ｇ爜</Property>
+ </PropertyDef>
<PropertyDef name="syncTime">
<Property name="dataType">Date</Property>
<Property name="label">鍚屾鏃堕棿</Property>
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 ec13f9f..1d86dd8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -13,10 +13,8 @@
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.ConcreteTypeMunger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -32,8 +30,6 @@
private ApiLogRep apiLogRep;
@Autowired
private Fzzy40Sync1311Rep fzzy40Sync1311Rep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private ApiInfoDataRep apiInfoDataRep;
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
index 892275e..7509796 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
@@ -14,15 +14,12 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotConfRep;
-import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotRep;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import com.fzzy.push.sh2023.dto.ShAreaBjw;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index af69ddc..cbf506f 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -341,7 +341,7 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
-// api1109.setFileStorageId((String) responseDto.getData());
+ api1109.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1109);
}else if (Constant.API_CODE_1111.equals(inteId)) {
Gd2022Api1111 api1111 = new Gd2022Api1111();
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
index 4626120..5b9b1b6 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java
@@ -49,6 +49,15 @@
@PropertyDef(label = "鎿嶄綔鏍囧織" )
private String czbz;
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷" )
+ private String spdwlx;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜" )
+ private String cfdm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜" )
+ private String ajdm;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index e04e9bf..bf887fd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -259,8 +259,6 @@
* @throws Exception
*/
private String getJsonData(String inteId, Object data, String code) {
-
-
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
SH2023Api1101 api1101;
--
Gitblit v1.9.3