From c8da60159006d077c23927442659a3d75db579cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=BB=B4=E4=BC=9F?= Date: Fri, 10 Nov 2023 15:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BE=85=E5=8A=9E=E3=80=81?= =?UTF-8?q?=E6=92=A4=E9=94=80=E5=BE=85=E5=8A=9E=E5=85=A5=E5=8F=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4identityCode=E6=94=B9=E4=B8=BArequestNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PendingMessageNewController.java | 8 ++++---- .../service/PendingMessageNewService.java | 8 ++++---- .../impl/PendingMessageNewServiceImpl.java | 20 +++++++++---------- .../pending/client/PendingMessageClient.java | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java index 503f86bb..8a4d479a 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java @@ -65,12 +65,12 @@ public class PendingMessageNewController implements PendingMessageClient { } @Override - public CommonResponse complete(String msgIdentityCode) { - return CommonResponse.success(pendingMessageNewService.complete(msgIdentityCode)); + public CommonResponse complete(String requestNo) { + return CommonResponse.success(pendingMessageNewService.complete(requestNo)); } @Override - public CommonResponse revoke(String msgIdentityCode) { - return CommonResponse.success(pendingMessageNewService.revoke(msgIdentityCode)); + public CommonResponse revoke(String requestNo) { + return CommonResponse.success(pendingMessageNewService.revoke(requestNo)); } } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java index 7f8045cc..22f77c5d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java @@ -51,16 +51,16 @@ public interface PendingMessageNewService { /** * 完成代办 * - * @param msgIdentityCode 代办唯一标识 + * @param requestNo 代办唯一标识 * @return 成功返回 {@code true} 失败返回 {@code false} */ - Boolean complete(String msgIdentityCode); + Boolean complete(String requestNo); /** * 撤销代办 * - * @param msgIdentityCode 代办唯一标识 + * @param requestNo 代办唯一标识 * @return 成功返回 {@code true} 失败返回 {@code false} */ - Boolean revoke(String msgIdentityCode); + Boolean revoke(String requestNo); } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index 7aeb1a05..27300f1d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -130,30 +130,30 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { } @Override - public Boolean complete(String msgIdentityCode) { - if (StringUtils.isBlank(msgIdentityCode)) { - log.warn("the message identity code is blank."); + public Boolean complete(String requestNo) { + if (StringUtils.isBlank(requestNo)) { + log.warn("the message requestNo is blank."); return false; } - log.info("the [{}] record is updated complete.", msgIdentityCode); + log.info("the [{}] record is updated complete.", requestNo); return pendingMessageRecordDao.lambdaUpdate() .set(PendingMessageRecord::getState, PendingMessageStateEnum.COMPLETED) - .eq(PendingMessageRecord::getIdentityCode, msgIdentityCode) + .eq(PendingMessageRecord::getRequestNo, requestNo) .eq(PendingMessageRecord::getState, PendingMessageStateEnum.HAS_BEEN_SENT) .eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value) .update(); } @Override - public Boolean revoke(String msgIdentityCode) { - if (StringUtils.isBlank(msgIdentityCode)) { - log.warn("the message identity code is blank."); + public Boolean revoke(String requestNo) { + if (StringUtils.isBlank(requestNo)) { + log.warn("the message requestNo is blank."); return false; } - log.info("the [{}] record is updated retract.", msgIdentityCode); + log.info("the [{}] record is updated retract.", requestNo); return pendingMessageRecordDao.lambdaUpdate() .set(PendingMessageRecord::getState, PendingMessageStateEnum.RETRACT) - .eq(PendingMessageRecord::getIdentityCode, msgIdentityCode) + .eq(PendingMessageRecord::getRequestNo, requestNo) .eq(PendingMessageRecord::getState, PendingMessageStateEnum.HAS_BEEN_SENT) .eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value) .update(); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java index 2b853cce..a6d601b4 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java @@ -68,18 +68,18 @@ public interface PendingMessageClient { /** * 完成代办 * - * @param msgIdentityCode 代办唯一标识 + * @param requestNo 代办唯一标识 * @return 成功返回 {@code true} 失败返回 {@code false} */ @PostMapping(value = "/pending-message/complete", produces = {MediaType.APPLICATION_JSON_VALUE}) - CommonResponse complete(@RequestParam("msgIdentityCode") String msgIdentityCode); + CommonResponse complete(@RequestParam("requestNo") String requestNo); /** * 撤销代办 * - * @param msgIdentityCode 代办唯一标识 + * @param requestNo 代办唯一标识 * @return 成功返回 {@code true} 失败返回 {@code false} */ @PostMapping(value = "/pending-message/revoke", produces = {MediaType.APPLICATION_JSON_VALUE}) - CommonResponse revoke(@RequestParam("msgIdentityCode") String msgIdentityCode); + CommonResponse revoke(@RequestParam("requestNo") String requestNo); } \ No newline at end of file