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/push/gd2022/GD2022ApiRemoteService2022.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 1dc9881..cbf506f 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -128,6 +128,64 @@
return pushData(param, null, data);
}
+// @Override
+// public ResponseDto pushFile(ApiParam param, ApiConfs conf, Object data) {
+//
+// String inteId = param.getInteId();
+// String kqdm = param.getKqdm();
+//
+// try {
+//
+// if (null == conf) {
+// conf = apiCommonService.getConf(kqdm);
+// }
+// //鑾峰彇TOKEN
+// GD2022AuthToken token = getGD2022AuthToken(conf);
+//
+// ApiLog apiLog = new ApiLog();
+// apiLog.setId(ContextUtil.getUUID());
+// apiLog.setInteId(inteId);
+// apiLog.setData(JSON.toJSONString(data));
+// apiLog.setKqdm(kqdm);
+// apiLog.setUploadTime(new Date());
+//
+// String wjdz = "";
+// if (Constant.API_CODE_1109.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1109 api1109 = new Gd2022Api1109();
+// BeanUtils.copyProperties(data, api1109);
+// wjdz = api1109.getWjdz();
+// } else if (Constant.API_CODE_1307.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1307 api1307 = new Gd2022Api1307();
+// BeanUtils.copyProperties(data, api1307);
+// wjdz = api1307.getWjdz();
+// } else if (Constant.API_CODE_1308.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1308 api1308 = new Gd2022Api1308();
+// BeanUtils.copyProperties(data, api1308);
+// wjdz = api1308.getWjdz();
+// }
+// if (StringUtils.isEmpty(wjdz)) {
+// ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版枃浠跺湴鍧�", wjdz);
+// apiLog.setStatus(99);
+// apiLog.setResult("娌℃湁鑾峰彇鍒版枃浠跺湴鍧�");
+// apiLogRep.save(apiLog);
+// return responseDto;
+// }
+// //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+// GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(conf.getApiUrl(), token, wjdz);
+// ResponseDto resd = new ResponseDto();
+// resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+// resd.setBizId((String) responseDto.getData());
+// resd.setMsg(responseDto.getMsg());
+// return resd;
+// } catch (Exception e) {
+// log.error(e.getMessage(), e);
+// return new ResponseDto(99, e.getMessage());
+// }
+// }
+
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
* @param param
@@ -281,9 +339,14 @@
}
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
+ System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1109);
+ }else if (Constant.API_CODE_1111.equals(inteId)) {
+ Gd2022Api1111 api1111 = new Gd2022Api1111();
+ BeanUtils.copyProperties(data, api1111);
+ return JSON.toJSONString(api1111);
} else if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
BeanUtils.copyProperties(data, api1208);
--
Gitblit v1.9.3