From e2e5e0ab26cd7840eb8b1376070f50ffe3f4438f Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Sun, 27 Apr 2025 17:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AF=B9=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/IncomeInvoiceEntity.java | 18 +++
.../entity/IncomeInvoiceEntity.xml | 6 +
.../FinancialReportPluginInitializer.java | 4 +-
.../impl/IncomeInvoiceServiceImpl.java | 141 ++++++++----------
4 files changed, 92 insertions(+), 77 deletions(-)
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java
index 27f90943..de25701b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java
@@ -15,6 +15,8 @@ public class IncomeInvoiceEntity extends BaseEntity {
private String field0128;
private String field0129;
private String field0130;
+ private String field0138;
+ private String field0139;
private String field0003;
@@ -121,5 +123,21 @@ public class IncomeInvoiceEntity extends BaseEntity {
public void setField0003(String field0003) {
this.field0003 = field0003;
}
+
+ public String getField0138() {
+ return field0138;
+ }
+
+ public void setField0138(String field0138) {
+ this.field0138 = field0138;
+ }
+
+ public String getField0139() {
+ return field0139;
+ }
+
+ public void setField0139(String field0139) {
+ this.field0139 = field0139;
+ }
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
index 4646593b..0b3d5204 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml
@@ -195,6 +195,8 @@
field0128 = #{field0128},
field0129 = #{field0129},
field0130 = #{field0130},
+ field0138 = #{field0138},
+ field0139 = #{field0139},
where id = #{dataId}
@@ -208,6 +210,8 @@
field0128 ,
field0129 ,
field0130 ,
+ field0138 ,
+ field0139 ,
)values(
@@ -218,6 +222,8 @@
#{field0128} ,
#{field0129} ,
#{field0130} ,
+ #{field0138} ,
+ #{field0139} ,
)
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java
index d1b275a1..d10e99f8 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java
@@ -54,8 +54,8 @@ public class FinancialReportPluginInitializer extends PluginBaseEntity{
public JsonResultEntity executeBusiness(JSONObject requestJson) {
try {
logger.info("======开始执行财务信息同步========");
- //return BaseResult.getSuccessMessageEntity("数据获取成功");
- return incomeInvoiceService.sendFinancialReportPlugin(requestJson);
+ return BaseResult.getSuccessMessageEntity("数据获取成功");
+ //return incomeInvoiceService.sendFinancialReportPlugin(requestJson);
}catch (Exception e){
logger.info("======执行财务同步失败:{}========",e.getMessage());
e.printStackTrace();
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
index c6608631..e7eb8030 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
@@ -63,13 +63,23 @@ public class IncomeInvoiceServiceImpl extends BaseService parametersMap = new HashMap<>();
- parametersMap.put("accessKey",accessKey);
- parametersMap.put("timestamp",timestamp);
- String a = YzfSignUtil.signRequest(parametersMap,accessSecret);
- dayabody.put("sign",a);
+ if(flags) {
+ Map parametersMap = new HashMap<>();
+ parametersMap.put("accessKey",accessKey);
+ parametersMap.put("timestamp",timestamp);
+ String a = YzfSignUtil.signRequest(parametersMap,accessSecret);
+ dayabody.put("sign",a);
+ }
Map headers = new HashMap<>();
headers.put("Content-Type", "application/json; charset=utf-8");
String returndata = sendPost(url, headers, dayabody.toJSONString());
@@ -409,56 +427,6 @@ public class IncomeInvoiceServiceImpl extends BaseService headers) {
- SSLContext sslContext = null;
- try {
- sslContext = new SSLContextBuilder()
- .loadTrustMaterial(null, TrustAllStrategy.INSTANCE)
- .build();
- } catch (Exception e) {
-
- }
- CloseableHttpClient closeableHttpClient = HttpClients.custom()
- .setSSLContext(sslContext)
- .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
- .build();
- // HttpClient
- HttpGet get = new HttpGet(url);
- CloseableHttpResponse response = null;
-
- RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
- get.setConfig(requestConfig);//设置请求参数【超时时间】
- if (headers != null && headers.size() > 0) {
- for (String key : headers.keySet()) {
- get.setHeader(key, headers.get(key));
- }
- }
- StringBuilder body = new StringBuilder();
-
- try {
- response = closeableHttpClient.execute(get);
- HttpEntity entity = response.getEntity();
- body.append(EntityUtils.toString(entity,"UTF-8"));
- logger.info("返回结果：" + body);
- } catch (Exception e) {
- logger.error("请求错误：" + e.getMessage());
- body.append(e.getMessage());
- } finally {
- try {
- // 关闭响应对象
- if (response != null) {
- response.close();
- }
- // 关闭响应对象
- if (closeableHttpClient != null) {
- closeableHttpClient.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return body.toString();
- }
/**
@@ -492,7 +460,9 @@ public class IncomeInvoiceServiceImpl extends BaseService list = incomeInvoiceDao.queryOaZb(incomeInvoiceEntity);
if(list != null && list.size() == 1){
incomeInvoiceEntity.setFormmainId(list.get(0).getDataId());
@@ -543,7 +513,9 @@ public class IncomeInvoiceServiceImpl extends BaseService");
stringBuffer.append("");
stringBuffer.append("");
- stringBuffer.append("");
+ stringBuffer.append("");
+ stringBuffer.append("");
+ stringBuffer.append("");
stringBuffer.append("");
stringBuffer.append("");
@@ -635,8 +607,19 @@ public class IncomeInvoiceServiceImpl extends BaseService":"");
stringBuffer.append("").append("");
- stringBuffer.append("").append("");
- stringBuffer.append(jsonObject.getString("fpwj") != null?"":"");
+ stringBuffer.append("").append("");
+ //stringBuffer.append(jsonObject.getString("url") != null?"":"");
+ stringBuffer.append("");
+ stringBuffer.append("").append("");
+
+ stringBuffer.append("").append("");
+ //stringBuffer.append(jsonObject.getString("ofdurl") != null?"":"");
+ stringBuffer.append("");
+ stringBuffer.append("").append("");
+
+ stringBuffer.append("").append("");
+ //stringBuffer.append(jsonObject.getString("xmlurl") != null?"":"");
+ stringBuffer.append("");
stringBuffer.append("").append("");
@@ -749,10 +732,14 @@ public class IncomeInvoiceServiceImpl extends BaseService headers = new HashMap<>();
headers.put("Content-Type", "application/json; charset=utf-8");
String returndata = sendPost(url, headers, sendData.toJSONString());