From dddf8520a10dddd987200080bfd40dd5af7435fe Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Fri, 14 Mar 2025 12:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/cpicxim-XMNHSA-repeater/pom.xml | 20 +++++++--------- .../xim/huixiabao/data/pojo/HmbXyxInfo.java | 20 ++++++++-------- .../data/pojo/HmbXyxInfoRequest.java | 14 +++++------ .../data/pojo/NHACommenRequestBody.java | 2 -- .../xim/huixiabao/nhs/CpicximToXMNHS.java | 24 ++++++++++++------- .../java/com/cpic/xim/huixiabao/AppTest.java | 10 ++++---- 6 files changed, 47 insertions(+), 43 deletions(-) diff --git a/code/cpicxim-XMNHSA-repeater/pom.xml b/code/cpicxim-XMNHSA-repeater/pom.xml index 0951dab..fc32138 100644 --- a/code/cpicxim-XMNHSA-repeater/pom.xml +++ b/code/cpicxim-XMNHSA-repeater/pom.xml @@ -45,23 +45,23 @@ - + - + - + @@ -104,11 +104,9 @@ zephyr-api-sdk 2.0.1 system - ${project.basedir}/lib/zephyr-api-sdk-from-nhs.jar + ${project.basedir}/lib/zephyr-api-sdk-cx.jar - - com.mysql mysql-connector-j @@ -128,8 +126,8 @@ com.alibaba fastjson - - 2.0.56 + 1.2.83 + diff --git a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfo.java b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfo.java index ee5ea05..078e274 100644 --- a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfo.java +++ b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfo.java @@ -13,12 +13,12 @@ */ package com.cpic.xim.huixiabao.data.pojo; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; +// import com.fasterxml.jackson.annotation.JsonInclude; +// import com.fasterxml.jackson.annotation.JsonProperty; +// import com.fasterxml.jackson.annotation.JsonPropertyOrder; -@JsonInclude( JsonInclude.Include.NON_EMPTY ) -@JsonPropertyOrder( alphabetic = true ) +//@JsonInclude( JsonInclude.Include.NON_EMPTY ) +//@JsonPropertyOrder( alphabetic = true ) public class HmbXyxInfo { @@ -91,19 +91,19 @@ public class HmbXyxInfo return "HmbXyxInfo [psnName=" + psnName + ", certNo=" + certNo + ", serviceId=" + serviceId + ", status=" + status + ", xyxNo=" + xyxNo + "]"; } - @JsonProperty( "psnName" ) + //@JsonProperty( "psnName" ) private String psnName; - @JsonProperty( "certno" ) + //@JsonProperty( "certno" ) private String certNo; - @JsonProperty( "serviceId" ) + //@JsonProperty( "serviceId" ) private String serviceId; - @JsonProperty( "status" ) + //@JsonProperty( "status" ) private String status; - @JsonProperty( "xyxNo" ) + //@JsonProperty( "xyxNo" ) private String xyxNo; } \ No newline at end of file diff --git a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfoRequest.java b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfoRequest.java index 7f09dab..841609e 100644 --- a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfoRequest.java +++ b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/HmbXyxInfoRequest.java @@ -10,12 +10,12 @@ package com.cpic.xim.huixiabao.data.pojo; import java.util.Vector; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; +// import com.fasterxml.jackson.annotation.JsonInclude; +// import com.fasterxml.jackson.annotation.JsonProperty; +// import com.fasterxml.jackson.annotation.JsonPropertyOrder; -@JsonInclude( JsonInclude.Include.NON_EMPTY ) -@JsonPropertyOrder( alphabetic = true ) +// @JsonInclude( JsonInclude.Include.NON_EMPTY ) +// @JsonPropertyOrder( alphabetic = true ) public class HmbXyxInfoRequest { public HmbXyxInfoRequest() @@ -51,9 +51,9 @@ public class HmbXyxInfoRequest this.hmbList = hmbList; } - @JsonProperty("topic") + //@JsonProperty("topic") private String topic; // 业务类型 - @JsonProperty("hmbList") + //@JsonProperty("hmbList") private Vector hmbList; } \ No newline at end of file diff --git a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/NHACommenRequestBody.java b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/NHACommenRequestBody.java index 0b6de44..5fbba1d 100644 --- a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/NHACommenRequestBody.java +++ b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/NHACommenRequestBody.java @@ -9,8 +9,6 @@ */ package com.cpic.xim.huixiabao.data.pojo; -import com.fasterxml.jackson.annotation.JsonProperty; - public class NHACommenRequestBody { diff --git a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/nhs/CpicximToXMNHS.java b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/nhs/CpicximToXMNHS.java index 9ad59dc..37498c9 100644 --- a/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/nhs/CpicximToXMNHS.java +++ b/code/cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/nhs/CpicximToXMNHS.java @@ -24,14 +24,18 @@ import java.util.Vector; import com.cpic.xim.huixiabao.data.pojo.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import cn.hsa.zephyr.apisdk.DefaultZephyrClient; import cn.hsa.zephyr.apisdk.internal.exception.ZephyrApiException; import cn.hsa.zephyr.apisdk.internal.util.encrypt.EncryptionModeEnum; import cn.hsa.zephyr.apisdk.internal.util.encrypt.SignTypeEnum; -import cn.hsa.zephyr.apisdk.request.DefaultZephyrRequest; -import cn.hsa.zephyr.apisdk.response.DefaultZephyrResponse; +import cn.hsa.zephyr.apisdk.request.ZephyrCommonRequest; +import cn.hsa.zephyr.apisdk.response.ZephyrCommonResponse; +import cn.hsa.zephyr.apisdk.ZephyrRequest; +import cn.hsa.zephyr.apisdk.ZephyrResponse; import com.cpic.xim.huixiabao.data.config.HuixiabaoConfig; @SuppressWarnings( @@ -254,10 +258,11 @@ public class CpicximToXMNHS signKey, encType, encKey ); - DefaultZephyrRequest req = new DefaultZephyrRequest(); - DefaultZephyrResponse resp = null; + ZephyrCommonRequest req = new ZephyrCommonRequest(); + ZephyrCommonResponse resp = null; // 数据 + JSONObject data = new JSONObject(); JSONObject requestObject = new JSONObject(); JSONObject xyxInfo = null; JSONArray xyxInfoList = new JSONArray(); @@ -294,18 +299,21 @@ public class CpicximToXMNHS try { - logger.info( "发送请求内容:" + requestObject.toJSONString() ); + data.remove("data"); + data.put( "data", requestObject ); + + logger.info( "发送请求内容:" + data.toJSONString() ); logger.info( "请求地址：" + HuixiabaoConfig.getUrl() ); - req.setData( requestObject ); + req.setData( data ); resp = client.execute( req ); if ( resp != null ) { - logger.info( "发送成功，返回消息：" + resp.getData() ); + logger.info( "发送成功，返回消息：" + resp.getBody() ); // 将已发送的数据从HmbXyxInfo_update表中清理掉 - removePostedHmbXyxInfo( postedInfo ); + // removePostedHmbXyxInfo( postedInfo ); } else { diff --git a/code/cpicxim-XMNHSA-repeater/src/test/java/com/cpic/xim/huixiabao/AppTest.java b/code/cpicxim-XMNHSA-repeater/src/test/java/com/cpic/xim/huixiabao/AppTest.java index b338103..5350056 100644 --- a/code/cpicxim-XMNHSA-repeater/src/test/java/com/cpic/xim/huixiabao/AppTest.java +++ b/code/cpicxim-XMNHSA-repeater/src/test/java/com/cpic/xim/huixiabao/AppTest.java @@ -30,8 +30,8 @@ import cn.hsa.zephyr.apisdk.DefaultZephyrClient; import cn.hsa.zephyr.apisdk.internal.exception.ZephyrApiException; import cn.hsa.zephyr.apisdk.internal.util.encrypt.EncryptionModeEnum; import cn.hsa.zephyr.apisdk.internal.util.encrypt.SignTypeEnum; -import cn.hsa.zephyr.apisdk.request.DefaultZephyrRequest; -import cn.hsa.zephyr.apisdk.response.DefaultZephyrResponse; +import cn.hsa.zephyr.apisdk.request.ZephyrCommonRequest; +import cn.hsa.zephyr.apisdk.response.ZephyrCommonResponse; /** @@ -88,9 +88,9 @@ public class AppTest encType, encKey ); - DefaultZephyrRequest req = new DefaultZephyrRequest(); + ZephyrCommonRequest req = new ZephyrCommonRequest(); JSONObject jsonObject1 = new JSONObject(); - DefaultZephyrResponse resp = null; + ZephyrCommonResponse resp = null; jsonObject1.put( "code", "XXXXXXXXXXXXXXXXXX" ); jsonObject1.put( "scene_code", "XXX" ); @@ -98,7 +98,7 @@ public class AppTest req.setData( jsonObject1 ); resp = client.execute( req ); - System.out.println( resp.getData() ); + System.out.println( resp.getBody() ); } catch ( ZephyrApiException e ) {