From 82de945f5996617201161e49493eac98ccb9b222 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 16:07:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java | 4 ++++ .../mall/ebtp/extend/bizmessage/entity/BizMessage.java | 2 +- .../ebtp/extend/bizmessage/entity/BizMessageTemplate.java | 1 - .../service/impl/BizMessageConsumerServiceImpl.java | 5 ++--- .../service/impl/BizMessageProducerServiceImpl.java | 2 +- .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java | 3 +-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java index f5867bc..f293b55 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java @@ -41,4 +41,8 @@ public class BizMessageRawDTO { @ApiModelProperty(required = true, value = "授权用户列表") private List users; + @ApiModelProperty(required = true, value = "业务参数json") + @NotNull(message = "业务参数json") + private Map servicecode; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java index 76a5841..d3d6df1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java @@ -17,7 +17,7 @@ public class BizMessage { private String url; private String params; private Timestamp createtime; - private String templatecode; + private String servicecode; /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */ private Integer authorize; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java index eab153b..0469787 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java @@ -17,7 +17,6 @@ public class BizMessageTemplate { private String remark; private String router; private Timestamp createtime; - private String type; private Timestamp updatetime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index e4b18e8..fc624f2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -41,7 +41,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService public IBizMessagePage listOutline(PageDTO page) { page = createPageCondition(page); - IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()), + IPage pageEntity = mapper.findMessage(new Page(page.getPageNo(), page.getPageSize()), service.getCacheUser().getUserId()); // DAT -> VO 转换 @@ -50,8 +50,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService result.setRecords(pageEntity.getRecords().stream().map(source -> { DescribeSiteMsgVO vo = new DescribeSiteMsgVO(); vo.setMsgId(source.getId()); - vo.setTemplatetype(source.getTemplatetype()); - vo.setAuthorizestate(source.getAuthorizestate()); + vo.setServicecode(source.getServicecode()); BeanUtils.copyProperties(source, vo); return vo; }).collect(Collectors.toList())); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java index aae83ee..996f4f0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java @@ -85,7 +85,7 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService bizmessage.setContent(fill(dao.getBody(), messageRaw.getBody())); bizmessage.setUrl(fill(dao.getRouter(), messageRaw.getExtra())); bizmessage.setParams(toJson(messageRaw.getExtra())); - bizmessage.setTemplatecode(messageRaw.getTemplateCode()); + bizmessage.setServicecode(toJson(messageRaw.getServicecode())); Optional.ofNullable(messageRaw.getUsers()).ifPresent(users -> { log.debug("if user list {} is not emtpy, then grant current message to them.", users); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java index df2a52b..ac2c28f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java @@ -16,8 +16,7 @@ public class DescribeSiteMsgVO { private String msgId; private String title; private String category; - private String templatetype; - private String authorizestate; + private String servicecode; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createtime;