From 267f8b50e6c33dd41ff82705ce906a8c605e7e54 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期五, 25 十月 2024 18:25:27 +0800
Subject: [PATCH] 升级广东省平台接口规范3
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 18 ++++++++++--------
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java | 3 +--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index c0a924c..8bbe665 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -687,7 +687,7 @@
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,26));
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -702,24 +702,26 @@
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0,26));
+ String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0,28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1306.equals(inteId)) {
- Gd2023Api1306 apiData = (Gd2023Api1306) data;
+ Api1306 apiData = (Api1306) data;
+ Gd2023Api1306 api1306 = new Gd2023Api1306();
+ BeanUtils.copyProperties(apiData, api1306);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
-// if (StringUtils.isEmpty(apiData.getTyajbm())) {
-// String tyajbm = apiCommonService.getTyajbm();
-// apiData.setTyajbm(tyajbm);
-// }
+// 鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1306.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ api1306.setTyajbm(tyajbm);
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
index 045fe01..533431d 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
@@ -5,12 +5,11 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
/**
- * 鎺ュ彛琛�-閫氶浣滀笟鎺ュ彛
+ * 鎺ュ彛琛�-鐔忚捀浣滀笟鎺ュ彛
*
* @author czt
*/
--
Gitblit v1.9.3