ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

快递订阅推送增加记录最新推送日期

This commit is contained in:
bo.yang 2021-07-01 14:13:29 +08:00
parent 5e5e682e58
commit 308bff6c3e
8 changed files with 171 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
box-bps/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<version>4.6.1</version> <version>4.6.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

269
box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java
View File

@ -106,240 +106,229 @@ public class ExpSubsPushResp extends BaseEntity
@Excel(name = "目的国快递流转信息") @Excel(name = "目的国快递流转信息")
private String destResultData; private String destResultData;
public void setSid(Long sid) /** 最后更新时间 */
{ @Excel(name = "最后更新时间")
private String lastResponseTime;
public Long getSid() {
return sid;
}
public void setSid(Long sid) {
this.sid = sid; this.sid = sid;
} }
public Long getSid() public String getStatus() {
{ return status;
return sid;
} }
public void setStatus(String status)
{ public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getStatus() public String getBillStatus() {
{ return billStatus;
return status;
} }
public void setBillStatus(String billStatus)
{ public void setBillStatus(String billStatus) {
this.billStatus = billStatus; this.billStatus = billStatus;
} }
public String getBillStatus() public String getMessage() {
{ return message;
return billStatus;
} }
public void setMessage(String message)
{ public void setMessage(String message) {
this.message = message; this.message = message;
} }
public String getMessage() public String getAutoCheck() {
{ return autoCheck;
return message;
} }
public void setAutoCheck(String autoCheck)
{ public void setAutoCheck(String autoCheck) {
this.autoCheck = autoCheck; this.autoCheck = autoCheck;
} }
public String getAutoCheck() public String getComOld() {
{ return comOld;
return autoCheck;
} }
public void setComOld(String comOld)
{ public void setComOld(String comOld) {
this.comOld = comOld; this.comOld = comOld;
} }
public String getComOld() public String getComNew() {
{ return comNew;
return comOld;
} }
public void setComNew(String comNew)
{ public void setComNew(String comNew) {
this.comNew = comNew; this.comNew = comNew;
} }
public String getComNew() public String getLastResultMessage() {
{ return lastResultMessage;
return comNew;
} }
public void setLastResultMessage(String lastResultMessage)
{ public void setLastResultMessage(String lastResultMessage) {
this.lastResultMessage = lastResultMessage; this.lastResultMessage = lastResultMessage;
} }
public String getLastResultMessage() public String getLastResultState() {
{ return lastResultState;
return lastResultMessage;
} }
public void setLastResultState(String lastResultState)
{ public void setLastResultState(String lastResultState) {
this.lastResultState = lastResultState; this.lastResultState = lastResultState;
} }
public String getLastResultState() public String getLastResulStatus() {
{ return lastResulStatus;
return lastResultState;
} }
public void setLastResulStatus(String lastResulStatus)
{ public void setLastResulStatus(String lastResulStatus) {
this.lastResulStatus = lastResulStatus; this.lastResulStatus = lastResulStatus;
} }
public String getLastResulStatus() public String getLastResultCondition() {
{ return lastResultCondition;
return lastResulStatus;
} }
public void setLastResultCondition(String lastResultCondition)
{ public void setLastResultCondition(String lastResultCondition) {
this.lastResultCondition = lastResultCondition; this.lastResultCondition = lastResultCondition;
} }
public String getLastResultCondition() public String getLastResultIsCheck() {
{ return lastResultIsCheck;
return lastResultCondition;
} }
public void setLastResultIsCheck(String lastResultIsCheck)
{ public void setLastResultIsCheck(String lastResultIsCheck) {
this.lastResultIsCheck = lastResultIsCheck; this.lastResultIsCheck = lastResultIsCheck;
} }
public String getLastResultIsCheck() public String getLastResultCom() {
{ return lastResultCom;
return lastResultIsCheck;
} }
public void setLastResultCom(String lastResultCom)
{ public void setLastResultCom(String lastResultCom) {
this.lastResultCom = lastResultCom; this.lastResultCom = lastResultCom;
} }
public String getLastResultCom() public String getLastResultNu() {
{ return lastResultNu;
return lastResultCom;
} }
public void setLastResultNu(String lastResultNu)
{ public void setLastResultNu(String lastResultNu) {
this.lastResultNu = lastResultNu; this.lastResultNu = lastResultNu;
} }
public String getLastResultNu() public String getLastResultData() {
{ return lastResultData;
return lastResultNu;
} }
public void setLastResultData(String lastResultData)
{ public void setLastResultData(String lastResultData) {
this.lastResultData = lastResultData; this.lastResultData = lastResultData;
} }
public String getLastResultData() public String getDestResultMessage() {
{ return destResultMessage;
return lastResultData;
} }
public void setDestResultMessage(String destResultMessage)
{ public void setDestResultMessage(String destResultMessage) {
this.destResultMessage = destResultMessage; this.destResultMessage = destResultMessage;
} }
public String getDestResultMessage() public String getDestResultState() {
{ return destResultState;
return destResultMessage;
} }
public void setDestResultState(String destResultState)
{ public void setDestResultState(String destResultState) {
this.destResultState = destResultState; this.destResultState = destResultState;
} }
public String getDestResultState() public String getDestResultStatus() {
{ return destResultStatus;
return destResultState;
} }
public void setDestResultStatus(String destResultStatus)
{ public void setDestResultStatus(String destResultStatus) {
this.destResultStatus = destResultStatus; this.destResultStatus = destResultStatus;
} }
public String getDestResultStatus() public String getDestResultCondition() {
{ return destResultCondition;
return destResultStatus;
} }
public void setDestResultCondition(String destResultCondition)
{ public void setDestResultCondition(String destResultCondition) {
this.destResultCondition = destResultCondition; this.destResultCondition = destResultCondition;
} }
public String getDestResultCondition() public String getDestResultIsCheck() {
{ return destResultIsCheck;
return destResultCondition;
} }
public void setDestResultIsCheck(String destResultIsCheck)
{ public void setDestResultIsCheck(String destResultIsCheck) {
this.destResultIsCheck = destResultIsCheck; this.destResultIsCheck = destResultIsCheck;
} }
public String getDestResultIsCheck() public String getDestResultCom() {
{ return destResultCom;
return destResultIsCheck;
} }
public void setDestResultCom(String destResultCom)
{ public void setDestResultCom(String destResultCom) {
this.destResultCom = destResultCom; this.destResultCom = destResultCom;
} }
public String getDestResultCom() public String getDestResultNu() {
{ return destResultNu;
return destResultCom;
} }
public void setDestResultNu(String destResultNu)
{ public void setDestResultNu(String destResultNu) {
this.destResultNu = destResultNu; this.destResultNu = destResultNu;
} }
public String getDestResultNu() public String getDestResultData() {
{ return destResultData;
return destResultNu;
} }
public void setDestResultData(String destResultData)
{ public void setDestResultData(String destResultData) {
this.destResultData = destResultData; this.destResultData = destResultData;
} }
public String getDestResultData() public String getLastResponseTime() {
{ return lastResponseTime;
return destResultData; }
public void setLastResponseTime(String lastResponseTime) {
this.lastResponseTime = lastResponseTime;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "ExpSubsPushResp{" +
.append("sid", getSid()) "sid=" + sid +
.append("status", getStatus()) ", status='" + status + '\'' +
.append("billStatus", getBillStatus()) ", billStatus='" + billStatus + '\'' +
.append("message", getMessage()) ", message='" + message + '\'' +
.append("autoCheck", getAutoCheck()) ", autoCheck='" + autoCheck + '\'' +
.append("comOld", getComOld()) ", comOld='" + comOld + '\'' +
.append("comNew", getComNew()) ", comNew='" + comNew + '\'' +
.append("lastResultMessage", getLastResultMessage()) ", lastResultMessage='" + lastResultMessage + '\'' +
.append("lastResultState", getLastResultState()) ", lastResultState='" + lastResultState + '\'' +
.append("lastResulStatus", getLastResulStatus()) ", lastResulStatus='" + lastResulStatus + '\'' +
.append("lastResultCondition", getLastResultCondition()) ", lastResultCondition='" + lastResultCondition + '\'' +
.append("lastResultIsCheck", getLastResultIsCheck()) ", lastResultIsCheck='" + lastResultIsCheck + '\'' +
.append("lastResultCom", getLastResultCom()) ", lastResultCom='" + lastResultCom + '\'' +
.append("lastResultNu", getLastResultNu()) ", lastResultNu='" + lastResultNu + '\'' +
.append("lastResultData", getLastResultData()) ", lastResultData='" + lastResultData + '\'' +
.append("destResultMessage", getDestResultMessage()) ", destResultMessage='" + destResultMessage + '\'' +
.append("destResultState", getDestResultState()) ", destResultState='" + destResultState + '\'' +
.append("destResultStatus", getDestResultStatus()) ", destResultStatus='" + destResultStatus + '\'' +
.append("destResultCondition", getDestResultCondition()) ", destResultCondition='" + destResultCondition + '\'' +
.append("destResultIsCheck", getDestResultIsCheck()) ", destResultIsCheck='" + destResultIsCheck + '\'' +
.append("destResultCom", getDestResultCom()) ", destResultCom='" + destResultCom + '\'' +
.append("destResultNu", getDestResultNu()) ", destResultNu='" + destResultNu + '\'' +
.append("destResultData", getDestResultData()) ", destResultData='" + destResultData + '\'' +
.toString(); ", lastResponseTime='" + lastResponseTime + '\'' +
'}';
} }
} }

15
box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java
View File

@ -1,12 +1,5 @@
package com.ruoyi.bps.service.impl; package com.ruoyi.bps.service.impl;
import com.ruoyi.bps.domain.ExpSubsPushResp;
import com.ruoyi.bps.domain.ExpSubscribe;
import com.ruoyi.bps.service.IExpSubsPushApiService;
import com.ruoyi.bps.service.IExpSubsPushRespService;
import com.ruoyi.bps.service.IExpSubscribeService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.kuaidi100.sdk.api.Subscribe; import com.kuaidi100.sdk.api.Subscribe;
import com.kuaidi100.sdk.contant.ApiInfoConstant; import com.kuaidi100.sdk.contant.ApiInfoConstant;
@ -21,6 +14,13 @@ import com.kuaidi100.sdk.response.SubscribePushResult;
import com.kuaidi100.sdk.response.SubscribeResp; import com.kuaidi100.sdk.response.SubscribeResp;
import com.kuaidi100.sdk.utils.PropertiesReader; import com.kuaidi100.sdk.utils.PropertiesReader;
import com.kuaidi100.sdk.utils.SignUtils; import com.kuaidi100.sdk.utils.SignUtils;
import com.ruoyi.bps.domain.ExpSubsPushResp;
import com.ruoyi.bps.domain.ExpSubscribe;
import com.ruoyi.bps.service.IExpSubsPushApiService;
import com.ruoyi.bps.service.IExpSubsPushRespService;
import com.ruoyi.bps.service.IExpSubscribeService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -224,6 +224,7 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
expSubsPushResp.setDestResultNu(subscribePushDestResult.getNu()); expSubsPushResp.setDestResultNu(subscribePushDestResult.getNu());
expSubsPushResp.setDestResultData(SubscribePushDataToString(subscribePushDestResult.getData())); expSubsPushResp.setDestResultData(SubscribePushDataToString(subscribePushDestResult.getData()));
} }
expSubsPushResp.setLastResponseTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
return expSubsPushResp; return expSubsPushResp;
} }

6
box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml
View File

@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="destResultCom" column="destResultCom" /> <result property="destResultCom" column="destResultCom" />
<result property="destResultNu" column="destResultNu" /> <result property="destResultNu" column="destResultNu" />
<result property="destResultData" column="destResultData" /> <result property="destResultData" column="destResultData" />
<result property="lastResponseTime" column="lastResponseTime" />
</resultMap> </resultMap>
<sql id="selectExpSubsPushRespVo"> <sql id="selectExpSubsPushRespVo">
select sid, status, billStatus, message, autoCheck, comOld, comNew, lastResultMessage, lastResultState, lastResulStatus, lastResultCondition, lastResultIsCheck, lastResultCom, lastResultNu, lastResultData, destResultMessage, destResultState, destResultStatus, destResultCondition, destResultIsCheck, destResultCom, destResultNu, destResultData from exp_subs_push_resp select sid, status, billStatus, message, autoCheck, comOld, comNew, lastResultMessage, lastResultState, lastResulStatus, lastResultCondition, lastResultIsCheck, lastResultCom, lastResultNu, lastResultData, destResultMessage, destResultState, destResultStatus, destResultCondition, destResultIsCheck, destResultCom, destResultNu, destResultData, lastResponseTime from exp_subs_push_resp
</sql> </sql>
<select id="selectExpSubsPushRespList" parameterType="ExpSubsPushResp" resultMap="ExpSubsPushRespResult"> <select id="selectExpSubsPushRespList" parameterType="ExpSubsPushResp" resultMap="ExpSubsPushRespResult">
@ -79,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="destResultCom != null">destResultCom,</if> <if test="destResultCom != null">destResultCom,</if>
<if test="destResultNu != null">destResultNu,</if> <if test="destResultNu != null">destResultNu,</if>
<if test="destResultData != null">destResultData,</if> <if test="destResultData != null">destResultData,</if>
<if test="lastResponseTime != null">lastResponseTime,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
@ -103,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="destResultCom != null">#{destResultCom},</if> <if test="destResultCom != null">#{destResultCom},</if>
<if test="destResultNu != null">#{destResultNu},</if> <if test="destResultNu != null">#{destResultNu},</if>
<if test="destResultData != null">#{destResultData},</if> <if test="destResultData != null">#{destResultData},</if>
<if test="lastResponseTime != null">#{lastResponseTime},</if>
</trim> </trim>
</insert> </insert>
@ -131,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="destResultCom != null">destResultCom = #{destResultCom},</if> <if test="destResultCom != null">destResultCom = #{destResultCom},</if>
<if test="destResultNu != null">destResultNu = #{destResultNu},</if> <if test="destResultNu != null">destResultNu = #{destResultNu},</if>
<if test="destResultData != null">destResultData = #{destResultData},</if> <if test="destResultData != null">destResultData = #{destResultData},</if>
<if test="lastResponseTime != null">lastResponseTime = #{lastResponseTime},</if>
</trim> </trim>
where sid = #{sid} where sid = #{sid}
</update> </update>

6
box-bps/src/main/resources/templates/bps/expsubspushresp/detail.html
View File

@ -29,6 +29,12 @@
<input name="lastResultComDictLabel" id="lastResultComDictLabel" class="form-control" type="text" readonly> <input name="lastResultComDictLabel" id="lastResultComDictLabel" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">最新推送时间：</label>
<div class="col-sm-8">
<input name="lastResponseTime" th:field="*{lastResponseTime}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">快递单号：</label> <label class="col-sm-3 control-label">快递单号：</label>
<div class="col-sm-8"> <div class="col-sm-8">

8
box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html
View File

@ -47,7 +47,7 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="bps:expsubspushresp:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="bps:expsubspushresp:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="bps:expsubspushresp:edit"> <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="bps:expsubspushresp:edit">
@ -55,7 +55,7 @@
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="bps:expsubspushresp:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="bps:expsubspushresp:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="bps:expsubspushresp:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="bps:expsubspushresp:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
@ -200,6 +200,10 @@
field: 'destResultData', field: 'destResultData',
title: '目的国快递流转信息' title: '目的国快递流转信息'
},*/ },*/
{
field: 'lastResponseTime',
title: '最新推送时间'
},
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',

19
box-bps/src/main/resources/templates/bps/subscribe/subscribe.html
View File

@ -33,12 +33,16 @@
</li> </li>
<li> <li>
<label>订阅结果：</label> <label>订阅结果：</label>
<input type="text" name="result"/> <select class="form-control" name="result">
<option value="">---所有---</option>
<option value="true">成功</option>
<option value="false">失败</option>
</select>
</li> </li>
<li> <!-- <li>
<label>返回码：</label> <label>返回码：</label>
<input type="text" name="returnCode"/> <input type="text" name="returnCode"/>
</li> </li>-->
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search();"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search();"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -120,7 +124,14 @@
}, },
{ {
field: 'result', field: 'result',
title: '订阅结果' title: '订阅结果',
formatter: function(value, row, index) {
if(value=="true")
{ return "成功";}
if(value=="false")
{return "失败";}
return value;
}
}, },
{ {
field: 'returnCode', field: 'returnCode',

2
box-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<version>4.6.1</version> <version>4.6.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>