From c7da4cf81779a799a6c424ad5356b99d0c5d8721 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 15 九月 2023 14:59:39 +0800
Subject: [PATCH] 熏蒸备案同步修改
---
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index af8ef14..af69ddc 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;
@@ -128,6 +127,64 @@
public ResponseDto pushData(ApiParam param, Object data) {
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());
+// }
+// }
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
@@ -269,12 +326,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) {
@@ -282,16 +339,21 @@
}
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
+ System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
- api1109.setFileStorageId((String) responseDto.getData());
+// 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)) {
- 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 +366,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) {
@@ -326,6 +388,7 @@
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1503.getDwdm());
+ gdFinanceDto.setKqdm(api1503.getKqdm());
gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("03");
gdFinanceDto.setCzbz(api1503.getCzbz());
@@ -377,6 +440,7 @@
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1502.getDwdm());
+ gdFinanceDto.setKqdm(api1502.getKqdm());
gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("02");
gdFinanceDto.setCzbz(api1502.getCzbz());
@@ -429,6 +493,7 @@
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1501.getDwdm());
+ gdFinanceDto.setKqdm(api1501.getKqdm());
gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("01");
gdFinanceDto.setCzbz(api1501.getCzbz());
--
Gitblit v1.9.3