From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index a4c413e..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":
@@ -1263,7 +1247,7 @@
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
- case "1023":
+ case "9201":
return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
--
Gitblit v1.9.3