From e3804feab5c63af6a2c5a7939f2358772e28b5fd Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 04 十二月 2024 11:09:19 +0800
Subject: [PATCH] 调整广东1213-封仓确认单接口
---
/dev/null | 58 -----------------------------
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 38 +++++-------------
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1213.java | 13 +++---
src/main/java/com/fzzy/push/gd2023/ApiCodeConstant.java | 8 ++--
src/main/java/com/fzzy/api/entity/Api1213.java | 2
5 files changed, 23 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1213.java b/src/main/java/com/fzzy/api/entity/Api1213.java
index 754ffe1..e7d4c31 100644
--- a/src/main/java/com/fzzy/api/entity/Api1213.java
+++ b/src/main/java/com/fzzy/api/entity/Api1213.java
@@ -20,7 +20,7 @@
@Table(name = "API_1213")
public class Api1213 implements Serializable {
- public static String SORT_PROP = "fcrq";
+ public static String SORT_PROP = "fcqrdh";
@Id
@PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyMMdd+4浣嶉『搴忕爜锛�212405040001")
diff --git a/src/main/java/com/fzzy/push/gd2023/ApiCodeConstant.java b/src/main/java/com/fzzy/push/gd2023/ApiCodeConstant.java
index 027e110..8d3f74d 100644
--- a/src/main/java/com/fzzy/push/gd2023/ApiCodeConstant.java
+++ b/src/main/java/com/fzzy/push/gd2023/ApiCodeConstant.java
@@ -5,10 +5,6 @@
*/
public class ApiCodeConstant {
-
- public static String API_1023 = "1023";
- public static String API_2001 = "2001";
- public static String API_2002 = "2002";
/**
* 鎺ュ彛缂栫爜-1001 韬唤璁よ瘉鎺ュ彛
*/
@@ -179,6 +175,10 @@
*/
public static String API_CODE_QYXYXX = "qyxyxx";
/**
+ * 鎺ュ彛缂栫爜-1041 璐㈠姟鎶ヨ〃淇℃伅鎺ュ彛
+ */
+ public static String API_CODE_FCQRD = "fcqrd";
+ /**
* 鎺ュ彛缂栫爜-1042 鏂囦欢涓婁紶鎺ュ彛
*/
public static String API_CODE_WJSC = "upload";
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index fda9c26..8fae9e4 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -903,36 +903,18 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (ApiCodeConstant.API_2001.equals(inteId)) {
- Gd2023Api2001 apiData = new Gd2023Api2001();
- BeanUtils.copyProperties(data, apiData);
+ if (Constant.API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213)data;
+ Gd2023Api1213 apiData = new Gd2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
- return JSON.toJSONString(apiData);
- }
- if (ApiCodeConstant.API_2002.equals(inteId)) {
- Gd2023Api2002 apiData = new Gd2023Api2002();
- BeanUtils.copyProperties(data, apiData);
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
- apiData.setTyajbm(tyajbm);
- }
- apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ apiData.setFcsl(api1213.getFcsl());
+ apiData.setFcsrq(api1213.getFcsqr());
return JSON.toJSONString(apiData);
}
return JSON.toJSONString(data);
@@ -1227,6 +1209,8 @@
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_ZMKCXX;
case "1212":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_KHXX;
+ case "1213":
+ return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_FCQRD;
case "1301":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_AQGL;
case "1302":
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2001.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1213.java
similarity index 86%
rename from src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2001.java
rename to src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1213.java
index 94feba6..4529edc 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2001.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1213.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -14,18 +15,18 @@
* @Date 2024/6/29 14:36
*/
@Data
-public class Gd2023Api2001 implements Serializable {
+public class Gd2023Api1213 implements Serializable {
private static final long serialVersionUID = 9157617424050247565L;
@PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyyyMMdd+4浣嶉『搴忕爜锛�21202405040001")
private String fcqrdh;
- @PropertyDef(label = "浠撴埧浠ｇ爜" )
- private String cfdm;
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ private String hwdm;
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
@PropertyDef(label = "灏佷粨鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
@@ -54,7 +55,7 @@
@PropertyDef(label = "灏佷粨鏁伴噺")
@JsonProperty("Fcsl")
- private String Fcsl;
+ private Double Fcsl;
@PropertyDef(label = "灏佷粨鐢宠浜�")
private String fcsrq;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2002.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2002.java
deleted file mode 100644
index 290a0c0..0000000
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api2002.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.fzzy.push.gd2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description 鍑烘竻纭鍗�
- * @Author CZT
- * @Date 2024/6/29 14:54
- */
-@Data
-public class Gd2023Api2002 implements Serializable {
-
- private static final long serialVersionUID = 9157617424050247565L;
-
- @PropertyDef(label = "鍑烘竻纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(22浠ｈ〃鍑烘竻)+yyyyMMdd+4浣嶉『搴忕爜锛�22202405040001")
- private String cqqrdh;
-
- @PropertyDef(label = "浠撴埧浠ｇ爜" )
- private String cfdm;
-
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
-
- @PropertyDef(label = "寤掗棿浠ｇ爜")
- private String ajdm;
-
- @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
- private String tyajbm;
-
- @PropertyDef(label = "鍑烘竻鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date cqrq;
-
- @PropertyDef(label = "鐢宠浜�")
- private String srq;
-
- @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
- private String bmshr;
-
- @PropertyDef(label = "棰嗗瀹℃牳浜�")
- private String ldshr;
-
- @PropertyDef(label = "澶囨敞")
- private String bz;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date zhgxsj;
-
-}
--
Gitblit v1.9.3