wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1634' into 'dev'

Browse Source 
+修改待办

See merge request universal/infrastructure/backend/msg-center-plat!98
This commit is contained in:
邬宇 2023-11-28 09:40:19 +00:00
commit 57c50b436d
6 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
View File

@ -114,4 +114,9 @@ public class PendingMessageNewController implements PendingMessageClient {
public CommonResponse<Boolean> revokeById(RevokePendingMessageByIdRequest param) {
return CommonResponse.success(pendingMessageNewService.revokeById(param));
}
@Override
public CommonResponse<Boolean> updateById(RevokePendingMessageByIdRequest param) {
return CommonResponse.success(pendingMessageNewService.updateById(param));
}
}

8
inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java
View File

@ -145,4 +145,12 @@ public interface PendingMessageNewService {
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
Boolean revokeById(RevokePendingMessageByIdRequest param);
/**
* 通过ID编辑代办bizParam
*
* @param param
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
Boolean updateById(RevokePendingMessageByIdRequest param);
}

10
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -405,6 +405,16 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
.update();
}
@Override
public Boolean updateById(RevokePendingMessageByIdRequest param) {
log.info("the [{}] record is RevokePendingMessageByIdRequest.", param);
return pendingMessageRecordDao.lambdaUpdate()
.set(PendingMessageRecord::getBizExtParam, param.getBizParam())
.eq(PendingMessageRecord::getId, param.getId())
.eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.update();
}
private PendingMessageDTO convert(PendingMessageRecord pendingMessageRecord, List<MessageTemplateDTO> messageTemplates) {
PendingMessageDTO pendingMessage = PendingMessageDTO.from(pendingMessageRecord);
// 对应模板的路由策略

9
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
View File

@ -161,4 +161,13 @@ public interface PendingMessageClient {
*/
@PostMapping(value = "/pending-message/revokeById", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<Boolean> revokeById(RevokePendingMessageByIdRequest param);
/**
* 通过ID撤销代办
*
* @param param
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
@PostMapping(value = "/pending-message/update/byId", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<Boolean> updateById(RevokePendingMessageByIdRequest param);
}

6
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java
View File

@ -109,4 +109,10 @@ public class PendingMessageClientFallback implements PendingMessageClient {
log.error("fall back while revoking pending message by ID. param:[{}]", param);
return CommonResponse.error("fall back while revoking pending message by ID");
}
@Override
public CommonResponse<Boolean> updateById(RevokePendingMessageByIdRequest param) {
log.error("fall back while revoking pending message update by ID. param:[{}]", param);
return CommonResponse.error("fall back while revoking pending message update by ID");
}
}

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/RevokePendingMessageByIdRequest.java
View File

@ -21,5 +21,10 @@ public class RevokePendingMessageByIdRequest {
*/
@NotNull(message = "消息ID不能为空")
private Long id;
/**
* 关联业务主键
*/
@NotNull(message = "bizParam不能为空")
private String bizParam;
}