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 
+bizCode查询

See merge request universal/infrastructure/backend/msg-center-plat!106
This commit is contained in:
邬宇 2023-11-30 01:35:33 +00:00
commit 594bea861f
6 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ public class PendingMessageNewController implements PendingMessageClient {
}
@Override
public CommonResponse<PendingMessageSimpleDTO> getLatestByBizCode(String bizCode) {
public CommonResponse<List<PendingMessageSimpleDTO>> getLatestByBizCode(PendingMessageByBizCodeRequest bizCode) {
return CommonResponse.success(pendingMessageNewService.getLatestByBizCode(bizCode));
}
}

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

@ -160,5 +160,5 @@ public interface PendingMessageNewService {
* @param bizCode
* @return
*/
PendingMessageSimpleDTO getLatestByBizCode(String bizCode);
List<PendingMessageSimpleDTO> getLatestByBizCode(PendingMessageByBizCodeRequest bizCode);
}

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

@ -35,6 +35,7 @@ import cn.axzo.msg.center.service.pending.response.PendingMessageSimpleDTO;
import cn.axzo.msg.center.service.pending.response.PushPendingMessageDTO;
import cn.axzo.msg.center.utils.*;
import cn.azxo.framework.common.model.Page;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -45,7 +46,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
@ -426,17 +426,16 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
}
@Override
public PendingMessageSimpleDTO getLatestByBizCode(String bizCode) {
log.info("getLatestByBizCode param->{}", bizCode);
PendingMessageRecord pendingMessageRecord = pendingMessageRecordDao.lambdaQuery()
.eq(PendingMessageRecord::getBizCode, bizCode)
public List<PendingMessageSimpleDTO> getLatestByBizCode(PendingMessageByBizCodeRequest param) {
log.info("getLatestByBizCode param->{}", JSON.toJSONString(param));
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordDao.lambdaQuery()
.in(PendingMessageRecord::getBizCode, param.getBizCodes())
.eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.orderByDesc(PendingMessageRecord::getBizCode)
.last("limit 1")
.one();
PendingMessageSimpleDTO result = new PendingMessageSimpleDTO();
BeanUtils.copyProperties(pendingMessageRecord, result);
return result;
.orderByDesc(PendingMessageRecord::getId)
.groupBy(PendingMessageRecord::getBizCode)
.list();
List<PendingMessageSimpleDTO> pendingMessageSimpleDTOS = BeanUtil.copyToList(pendingMessageRecords, PendingMessageSimpleDTO.class);
return pendingMessageSimpleDTOS;
}
private PendingMessageDTO convert(PendingMessageRecord pendingMessageRecord, List<MessageTemplateDTO> messageTemplates) {

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

@ -13,9 +13,7 @@ import cn.azxo.framework.common.model.Page;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@ -175,9 +173,9 @@ public interface PendingMessageClient {
/**
* 通过BizCode获取最新代办
*
* @param bizCode
* @param pendingMessageByBizCodeRequest
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
@PostMapping(value = "/pending-message/latest/biz-code", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<PendingMessageSimpleDTO> getLatestByBizCode(String bizCode);
CommonResponse<List<PendingMessageSimpleDTO>> getLatestByBizCode(@RequestBody @Valid PendingMessageByBizCodeRequest pendingMessageByBizCodeRequest);
}

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

@ -118,7 +118,7 @@ public class PendingMessageClientFallback implements PendingMessageClient {
}
@Override
public CommonResponse<PendingMessageSimpleDTO> getLatestByBizCode(String param) {
public CommonResponse<List<PendingMessageSimpleDTO>> getLatestByBizCode(PendingMessageByBizCodeRequest param) {
log.error("fall back while getLatestByBizCode pending message update by ID. param:[{}]", param);
return CommonResponse.error("fall back while revoking pending message update by ID");
}

26
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessageByBizCodeRequest.java Normal file
View File

@ -0,0 +1,26 @@
package cn.axzo.msg.center.service.pending.request;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author haiyangjin
* @date 2023/11/16
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class PendingMessageByBizCodeRequest {
/**
* bizCodes
*/
@NotNull(message = "bizParam不能为空")
private List<String> bizCodes;
}