保存进度!

This commit is contained in:
Kane Wang 2025-03-14 16:22:32 +08:00
parent a42d742a5e
commit 22b6ed81bd
6 changed files with 45 additions and 55 deletions

View File

@ -45,23 +45,21 @@
</dependency>
<!--jackson-->
<dependency>
<!-- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.4</version>
</dependency>
</dependency> -->
<!-- log-4j -->
<dependency>
@ -80,35 +78,14 @@
<version>2.20.0</version>
</dependency>
<!-- POI -->
<!-- <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
</dependency> -->
<!-- mybatis -->
<!-- <dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.19</version>
</dependency> -->
<dependency>
<groupId> cn.hsa.zephyr</groupId>
<artifactId>zephyr-api-sdk</artifactId>
<version>2.0.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/zephyr-api-sdk-from-nhs.jar</systemPath>
<systemPath>${project.basedir}/lib/zephyr-api-sdk-nhs.jar</systemPath>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@ -125,7 +102,7 @@
<artifactId>commons-logging</artifactId>
<version>1.3.5</version>
</dependency>
<dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<!-- <version>1.2.83</version> -->

View File

@ -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;
}

View File

@ -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<HmbXyxInfo> hmbList;
}

View File

@ -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; // 时间戳
}

View File

@ -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 );

View File

@ -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;