diff --git a/code/cpicxim-XMNHSA-repeater/pom.xml b/code/cpicxim-XMNHSA-repeater/pom.xml index 0951dab..260c1db 100644 --- a/code/cpicxim-XMNHSA-repeater/pom.xml +++ b/code/cpicxim-XMNHSA-repeater/pom.xml @@ -45,23 +45,21 @@ - + com.fasterxml.jackson.core jackson-core 2.13.4 - com.fasterxml.jackson.core jackson-annotations 2.13.4 - + --> @@ -80,35 +78,14 @@ 2.20.0 - - - - - - cn.hsa.zephyr zephyr-api-sdk 2.0.1 system - ${project.basedir}/lib/zephyr-api-sdk-from-nhs.jar + ${project.basedir}/lib/zephyr-api-sdk-nhs.jar - - com.mysql mysql-connector-j @@ -125,7 +102,7 @@ commons-logging 1.3.5 - + com.alibaba fastjson 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..a7b23b8 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,10 @@ public class HmbXyxInfo return "HmbXyxInfo [psnName=" + psnName + ", certNo=" + certNo + ", serviceId=" + serviceId + ", status=" + status + ", xyxNo=" + xyxNo + "]"; } - @JsonProperty( "psnName" ) private String psnName; - - @JsonProperty( "certno" ) private String certNo; - - @JsonProperty( "serviceId" ) private String serviceId; - - @JsonProperty( "status" ) private String status; - - @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..8149906 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,7 @@ 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; -@JsonInclude( JsonInclude.Include.NON_EMPTY ) -@JsonPropertyOrder( alphabetic = true ) public class HmbXyxInfoRequest { public HmbXyxInfoRequest() @@ -51,9 +46,6 @@ public class HmbXyxInfoRequest this.hmbList = hmbList; } - @JsonProperty("topic") private String topic; // 业务类型 - - @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..7083039 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 @@ -1,76 +1,101 @@ /* * @Author: Kane + * * @Date: 2025-03-06 14:17:24 + * * @LastEditors: Kane + * * @FilePath: /cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/pojo/NHACommenRequestBody.java + * * @Description: 易联众请求共通报文结构 * * Copyright (c) ${2023} by Kane, All Rights Reserved. */ package com.cpic.xim.huixiabao.data.pojo; -import com.fasterxml.jackson.annotation.JsonProperty; - public class NHACommenRequestBody { - + public String getChs_fjs_appid() { return chs_fjs_appid; } + public void setChs_fjs_appid( String chs_fjs_appid ) { this.chs_fjs_appid = chs_fjs_appid; } + public String getChs_fjs_appsecret() { return chs_fjs_appsecret; } + public void setChs_fjs_appsecret( String chs_fjs_appsecret ) { this.chs_fjs_appsecret = chs_fjs_appsecret; } + public String getChs_fjs_token() { return chs_fjs_token; } + public void setChs_fjs_token( String chs_fjs_token ) { this.chs_fjs_token = chs_fjs_token; } + public String getChs_fjs_funid() { return chs_fjs_funid; } + public void setChs_fjs_funid( String chs_fjs_funid ) { this.chs_fjs_funid = chs_fjs_funid; } + public String getChs_fjs_encdata() { return chs_fjs_encdata; } + public void setChs_fjs_encdata( String chs_fjs_encdata ) { this.chs_fjs_encdata = chs_fjs_encdata; } + public String getChs_fjs_sign() { return chs_fjs_sign; } + public void setChs_fjs_sign( String chs_fjs_sign ) { this.chs_fjs_sign = chs_fjs_sign; } + public int getChs_fjs_timestamp() { return chs_fjs_timestamp; } + public void setChs_fjs_timestamp( int chs_fjs_timestamp ) { this.chs_fjs_timestamp = chs_fjs_timestamp; } + public String getData() + { + return data; + } + + public void setData( String data ) + { + this.data = data; + } + private String chs_fjs_appid; // 渠道id private String chs_fjs_appsecret; // 渠道私钥 private String chs_fjs_token; // 请求时携带的动态令牌 @@ -78,5 +103,6 @@ public class NHACommenRequestBody private String chs_fjs_encdata; // 加密后的数据 private String chs_fjs_sign; // 签名数据串 private String data; // 未加密的数据 - private int chs_fjs_timestamp; // 时间戳 + private int chs_fjs_timestamp; // 时间戳 + } 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..f2c4aa7 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 @@ -258,6 +258,7 @@ public class CpicximToXMNHS DefaultZephyrResponse resp = null; // 数据 + JSONObject data = new JSONObject(); JSONObject requestObject = new JSONObject(); JSONObject xyxInfo = null; JSONArray xyxInfoList = new JSONArray(); @@ -294,6 +295,8 @@ public class CpicximToXMNHS try { + data.remove("data"); + data.put("data", requestObject); logger.info( "发送请求内容:" + requestObject.toJSONString() ); logger.info( "请求地址：" + HuixiabaoConfig.getUrl() ); @@ -302,7 +305,9 @@ public class CpicximToXMNHS if ( resp != null ) { - logger.info( "发送成功，返回消息：" + resp.getData() ); + logger.info( "发送成功，返回消息Body：" + resp.getBody() ); + logger.info( "发送成功，返回消息data：" + resp.getData() ); + logger.info( "发送成功，返回消息message：" + resp.getMessage() ); // 将已发送的数据从HmbXyxInfo_update表中清理掉 removePostedHmbXyxInfo( postedInfo ); 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..af2b6b6 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 @@ -15,7 +15,6 @@ package com.cpic.xim.huixiabao; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.sql.*; import java.util.Vector; import org.junit.jupiter.api.Test;