From 83278aceaaf70ab254afe72da0b7b7373ec71231 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 18 八月 2023 11:47:37 +0800
Subject: [PATCH] 优化广东省平台财务接口
---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java | 7 +------
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1109.java | 2 +-
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java | 2 +-
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1307.java | 2 +-
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 21 ++++++++++-----------
src/main/java/com/fzzy/api/Constant.java | 1 +
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1208.java | 2 +-
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java | 2 +-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 2 +-
9 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index ac53084..981ae0e 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -202,6 +202,7 @@
*/
public static String API_CODE_1405 = "1405";
+ //璐㈠姟鎶ヨ〃鎺ュ彛
public static String API_CODE_1501 = "1501";
public static String API_CODE_1502 = "1502";
public static String API_CODE_1503 = "1503";
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index af8ef14..af6d588 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -11,16 +11,15 @@
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.gd2022.dto.*;
-import com.fzzy.push.gd2022.dto.Api1101;
-import com.fzzy.push.gd2022.dto.Api1109;
-import com.fzzy.push.gd2022.dto.Api1208;
-import com.fzzy.push.gd2022.dto.Api1307;
-import com.fzzy.push.gd2022.dto.Api1308;
+import com.fzzy.push.gd2022.dto.Gd2022Api1101;
+import com.fzzy.push.gd2022.dto.Gd2022Api1109;
+import com.fzzy.push.gd2022.dto.Gd2022Api1208;
+import com.fzzy.push.gd2022.dto.Gd2022Api1307;
+import com.fzzy.push.gd2022.dto.Gd2022Api1308;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -269,12 +268,12 @@
private String getJsonData(String inteId, Object data, String url, GD2022AuthToken authToken) throws Exception {
if (Constant.API_CODE_1101.equals(inteId)) {
- Api1101 api1101 = new Api1101();
+ Gd2022Api1101 api1101 = new Gd2022Api1101();
BeanUtils.copyProperties(data, api1101);
return JSON.toJSONString(api1101);
} else if (Constant.API_CODE_1109.equals(inteId)) {
//灏佽鏁版嵁
- Api1109 api1109 = new Api1109();
+ Gd2022Api1109 api1109 = new Gd2022Api1109();
BeanUtils.copyProperties(data, api1109);
if (null == authToken) {
@@ -286,12 +285,12 @@
api1109.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1109);
} else if (Constant.API_CODE_1208.equals(inteId)) {
- Api1208 api1208 = new Api1208();
+ Gd2022Api1208 api1208 = new Gd2022Api1208();
BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
} else if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
- Api1307 api1307 = new Api1307();
+ Gd2022Api1307 api1307 = new Gd2022Api1307();
BeanUtils.copyProperties(data, api1307);
if (null == authToken) {
@@ -304,7 +303,7 @@
return JSON.toJSONString(api1307);
} else if (Constant.API_CODE_1308.equals(inteId)) {
//灏佽鏁版嵁
- Api1308 api1308 = new Api1308();
+ Gd2022Api1308 api1308 = new Gd2022Api1308();
BeanUtils.copyProperties(data, api1308);
if (null == authToken) {
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
similarity index 93%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1101.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
index 4e9f193..cb39200 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
@@ -18,7 +18,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class Api1101 extends ApiParent implements Serializable {
+public class Gd2022Api1101 extends ApiParent implements Serializable {
/**
*
*/
@@ -103,22 +103,17 @@
@PropertyDef(label = "绾害")
private double wd;
-// @JSONField(serialize = false)
@PropertyDef(label = "澶囨绫诲瀷")
private String balx;
-// @JSONField(serialize = false)
@PropertyDef(label = "浠撳偍涓氬姟绫诲瀷")
private String ccywlx;
-// @JSONField(serialize = false)
@PropertyDef(label = "浠撳偍鍝佺")
private String ccpz;
-// @JSONField(serialize = false)
@PropertyDef(label = "澶囨鐘舵��")
private String bazt;
-
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1109.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1109.java
similarity index 96%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1109.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1109.java
index 2296873..2be5df8 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1109.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1109.java
@@ -14,7 +14,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class Api1109 implements Serializable {
+public class Gd2022Api1109 implements Serializable {
/**
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1500.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java
similarity index 95%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1500.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java
index 68cc647..1d61054 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1500.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java
@@ -14,7 +14,7 @@
*/
@Data
@EqualsAndHashCode(callSuper=false)
-public class Api1500 implements Serializable {
+public class Gd2022Api1114 implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1208.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1208.java
similarity index 97%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1208.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1208.java
index eba3cd6..b97172d 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1208.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1208.java
@@ -18,7 +18,7 @@
@Entity
@Table(name = "API_1208")
@EqualsAndHashCode(callSuper = false)
-public class Api1208 extends ApiParent implements Serializable {
+public class Gd2022Api1208 extends ApiParent implements Serializable {
public static String SORT_PROP = "rcsj";
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1307.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1307.java
similarity index 96%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1307.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1307.java
index 22a8311..88fe697 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1307.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1307.java
@@ -15,7 +15,7 @@
*/
@Data
@EqualsAndHashCode(callSuper=false)
-public class Api1307 implements Serializable {
+public class Gd2022Api1307 implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1308.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
similarity index 96%
rename from src/main/java/com/fzzy/push/gd2022/dto/Api1308.java
rename to src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
index a0ad14d..5f83f13 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1308.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
@@ -15,7 +15,7 @@
*/
@Data
@EqualsAndHashCode(callSuper=false)
-public class Api1308 implements Serializable {
+public class Gd2022Api1308 implements Serializable {
/**
*
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b98350f..d7ce01a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -142,7 +142,7 @@
*/
private String getJsonData(String inteId, Object data) {
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
- if ("1101".equals(inteId)) {
+ if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
return JSON.toJSONString(data);
} else {
return JSON.toJSONString(data);
--
Gitblit v1.9.3