diff --git a/box-bps/pom.xml b/box-bps/pom.xml index 729e8ff11..5cc6d8bad 100644 --- a/box-bps/pom.xml +++ b/box-bps/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 4.6.1 + 4.6.2 4.0.0 diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java index d9e9a4fcc..c462fd961 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpSubsPushResp.java @@ -106,240 +106,229 @@ public class ExpSubsPushResp extends BaseEntity @Excel(name = "目的国快递流转信息") 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; } - public Long getSid() - { - return sid; + public String getStatus() { + return status; } - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - public String getStatus() - { - return status; + public String getBillStatus() { + return billStatus; } - public void setBillStatus(String billStatus) - { + + public void setBillStatus(String billStatus) { this.billStatus = billStatus; } - public String getBillStatus() - { - return billStatus; + public String getMessage() { + return message; } - public void setMessage(String message) - { + + public void setMessage(String message) { this.message = message; } - public String getMessage() - { - return message; + public String getAutoCheck() { + return autoCheck; } - public void setAutoCheck(String autoCheck) - { + + public void setAutoCheck(String autoCheck) { this.autoCheck = autoCheck; } - public String getAutoCheck() - { - return autoCheck; + public String getComOld() { + return comOld; } - public void setComOld(String comOld) - { + + public void setComOld(String comOld) { this.comOld = comOld; } - public String getComOld() - { - return comOld; + public String getComNew() { + return comNew; } - public void setComNew(String comNew) - { + + public void setComNew(String comNew) { this.comNew = comNew; } - public String getComNew() - { - return comNew; + public String getLastResultMessage() { + return lastResultMessage; } - public void setLastResultMessage(String lastResultMessage) - { + + public void setLastResultMessage(String lastResultMessage) { this.lastResultMessage = lastResultMessage; } - public String getLastResultMessage() - { - return lastResultMessage; + public String getLastResultState() { + return lastResultState; } - public void setLastResultState(String lastResultState) - { + + public void setLastResultState(String lastResultState) { this.lastResultState = lastResultState; } - public String getLastResultState() - { - return lastResultState; + public String getLastResulStatus() { + return lastResulStatus; } - public void setLastResulStatus(String lastResulStatus) - { + + public void setLastResulStatus(String lastResulStatus) { this.lastResulStatus = lastResulStatus; } - public String getLastResulStatus() - { - return lastResulStatus; + public String getLastResultCondition() { + return lastResultCondition; } - public void setLastResultCondition(String lastResultCondition) - { + + public void setLastResultCondition(String lastResultCondition) { this.lastResultCondition = lastResultCondition; } - public String getLastResultCondition() - { - return lastResultCondition; + public String getLastResultIsCheck() { + return lastResultIsCheck; } - public void setLastResultIsCheck(String lastResultIsCheck) - { + + public void setLastResultIsCheck(String lastResultIsCheck) { this.lastResultIsCheck = lastResultIsCheck; } - public String getLastResultIsCheck() - { - return lastResultIsCheck; + public String getLastResultCom() { + return lastResultCom; } - public void setLastResultCom(String lastResultCom) - { + + public void setLastResultCom(String lastResultCom) { this.lastResultCom = lastResultCom; } - public String getLastResultCom() - { - return lastResultCom; + public String getLastResultNu() { + return lastResultNu; } - public void setLastResultNu(String lastResultNu) - { + + public void setLastResultNu(String lastResultNu) { this.lastResultNu = lastResultNu; } - public String getLastResultNu() - { - return lastResultNu; + public String getLastResultData() { + return lastResultData; } - public void setLastResultData(String lastResultData) - { + + public void setLastResultData(String lastResultData) { this.lastResultData = lastResultData; } - public String getLastResultData() - { - return lastResultData; + public String getDestResultMessage() { + return destResultMessage; } - public void setDestResultMessage(String destResultMessage) - { + + public void setDestResultMessage(String destResultMessage) { this.destResultMessage = destResultMessage; } - public String getDestResultMessage() - { - return destResultMessage; + public String getDestResultState() { + return destResultState; } - public void setDestResultState(String destResultState) - { + + public void setDestResultState(String destResultState) { this.destResultState = destResultState; } - public String getDestResultState() - { - return destResultState; + public String getDestResultStatus() { + return destResultStatus; } - public void setDestResultStatus(String destResultStatus) - { + + public void setDestResultStatus(String destResultStatus) { this.destResultStatus = destResultStatus; } - public String getDestResultStatus() - { - return destResultStatus; + public String getDestResultCondition() { + return destResultCondition; } - public void setDestResultCondition(String destResultCondition) - { + + public void setDestResultCondition(String destResultCondition) { this.destResultCondition = destResultCondition; } - public String getDestResultCondition() - { - return destResultCondition; + public String getDestResultIsCheck() { + return destResultIsCheck; } - public void setDestResultIsCheck(String destResultIsCheck) - { + + public void setDestResultIsCheck(String destResultIsCheck) { this.destResultIsCheck = destResultIsCheck; } - public String getDestResultIsCheck() - { - return destResultIsCheck; + public String getDestResultCom() { + return destResultCom; } - public void setDestResultCom(String destResultCom) - { + + public void setDestResultCom(String destResultCom) { this.destResultCom = destResultCom; } - public String getDestResultCom() - { - return destResultCom; + public String getDestResultNu() { + return destResultNu; } - public void setDestResultNu(String destResultNu) - { + + public void setDestResultNu(String destResultNu) { this.destResultNu = destResultNu; } - public String getDestResultNu() - { - return destResultNu; + public String getDestResultData() { + return destResultData; } - public void setDestResultData(String destResultData) - { + + public void setDestResultData(String destResultData) { this.destResultData = destResultData; } - public String getDestResultData() - { - return destResultData; + public String getLastResponseTime() { + return lastResponseTime; + } + + public void setLastResponseTime(String lastResponseTime) { + this.lastResponseTime = lastResponseTime; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("sid", getSid()) - .append("status", getStatus()) - .append("billStatus", getBillStatus()) - .append("message", getMessage()) - .append("autoCheck", getAutoCheck()) - .append("comOld", getComOld()) - .append("comNew", getComNew()) - .append("lastResultMessage", getLastResultMessage()) - .append("lastResultState", getLastResultState()) - .append("lastResulStatus", getLastResulStatus()) - .append("lastResultCondition", getLastResultCondition()) - .append("lastResultIsCheck", getLastResultIsCheck()) - .append("lastResultCom", getLastResultCom()) - .append("lastResultNu", getLastResultNu()) - .append("lastResultData", getLastResultData()) - .append("destResultMessage", getDestResultMessage()) - .append("destResultState", getDestResultState()) - .append("destResultStatus", getDestResultStatus()) - .append("destResultCondition", getDestResultCondition()) - .append("destResultIsCheck", getDestResultIsCheck()) - .append("destResultCom", getDestResultCom()) - .append("destResultNu", getDestResultNu()) - .append("destResultData", getDestResultData()) - .toString(); + return "ExpSubsPushResp{" + + "sid=" + sid + + ", status='" + status + '\'' + + ", billStatus='" + billStatus + '\'' + + ", message='" + message + '\'' + + ", autoCheck='" + autoCheck + '\'' + + ", comOld='" + comOld + '\'' + + ", comNew='" + comNew + '\'' + + ", lastResultMessage='" + lastResultMessage + '\'' + + ", lastResultState='" + lastResultState + '\'' + + ", lastResulStatus='" + lastResulStatus + '\'' + + ", lastResultCondition='" + lastResultCondition + '\'' + + ", lastResultIsCheck='" + lastResultIsCheck + '\'' + + ", lastResultCom='" + lastResultCom + '\'' + + ", lastResultNu='" + lastResultNu + '\'' + + ", lastResultData='" + lastResultData + '\'' + + ", destResultMessage='" + destResultMessage + '\'' + + ", destResultState='" + destResultState + '\'' + + ", destResultStatus='" + destResultStatus + '\'' + + ", destResultCondition='" + destResultCondition + '\'' + + ", destResultIsCheck='" + destResultIsCheck + '\'' + + ", destResultCom='" + destResultCom + '\'' + + ", destResultNu='" + destResultNu + '\'' + + ", destResultData='" + destResultData + '\'' + + ", lastResponseTime='" + lastResponseTime + '\'' + + '}'; } } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java index 271cedff7..50b3ede50 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java @@ -1,12 +1,5 @@ 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.kuaidi100.sdk.api.Subscribe; 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.utils.PropertiesReader; 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.stereotype.Service; @@ -224,6 +224,7 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService { expSubsPushResp.setDestResultNu(subscribePushDestResult.getNu()); expSubsPushResp.setDestResultData(SubscribePushDataToString(subscribePushDestResult.getData())); } + expSubsPushResp.setLastResponseTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); return expSubsPushResp; } diff --git a/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml index 0c10253a7..3c8b7e752 100644 --- a/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml +++ b/box-bps/src/main/resources/mapper/bps/ExpSubsPushRespMapper.xml @@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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 +
+ +
+ +
+
diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html index b437c8e0d..3326a905b 100644 --- a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -47,7 +47,7 @@
- + 导出 @@ -200,6 +200,10 @@ field: 'destResultData', title: '目的国快递流转信息' },*/ + { + field: 'lastResponseTime', + title: '最新推送时间' + }, { title: '操作', align: 'center', diff --git a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html index 7cd1a621b..be3e4f9c8 100644 --- a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html +++ b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html @@ -33,12 +33,16 @@
  • - +
  • -
  • +
  •  搜索  重置 @@ -120,7 +124,14 @@ }, { field: 'result', - title: '订阅结果' + title: '订阅结果', + formatter: function(value, row, index) { + if(value=="true") + { return "成功";} + if(value=="false") + {return "失败";} + return value; + } }, { field: 'returnCode', diff --git a/box-test/pom.xml b/box-test/pom.xml index d7a5addf2..5f7780f26 100644 --- a/box-test/pom.xml +++ b/box-test/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 4.6.1 + 4.6.2 4.0.0