From 5a941b83ad23a237f61b132dd837d8f2b3d5dbae Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 10:13:43 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/entity/BizMessage.java | 1 + .../mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java | 1 + .../bizmessage/service/impl/BizMessageProducerServiceImpl.java | 1 + 3 files changed, 3 insertions(+) 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 d539b07..4b598a5 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 @@ -16,6 +16,7 @@ public class BizMessage { private String url; private String params; private Timestamp createtime; + private String templatetype; /* 该值为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 0469787..eab153b 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,6 +17,7 @@ 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/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java index f797bf5..e6ecc2b 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,6 +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.setTemplatetype(dao.getType()); Optional.ofNullable(messageRaw.getUsers()).ifPresent(users -> { log.debug("if user list {} is not emtpy, then grant current message to them.", users); From 2318de6deb0c21860ae34ea84974706847747335 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 11:13:49 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 7 +++++-- .../mall/ebtp/extend/bizmessage/entity/BizMessage.java | 1 + .../service/impl/BizMessageConsumerServiceImpl.java | 1 + .../service/impl/BizMessageProducerServiceImpl.java | 2 +- .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 40fec46..3f78773 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -3,15 +3,18 @@ - SELECT *,biz_message_template.type as templatetype + SELECT biz_message.*,biz_message_template.type as templatetype FROM biz_message left join biz_message_template on biz_message.templatecode = biz_message_template.code WHERE authorize = 0 @@ -12,7 +12,7 @@ UNION ALL SELECT a.* - FROM ( SELECT *,biz_message_template.type templatetype FROM biz_message + FROM ( SELECT biz_message.*,biz_message_template.type templatetype FROM biz_message left join biz_message_template on biz_message.templatecode = biz_message_template.code WHERE authorize = 1) a INNER JOIN From a6fdc14c809ce44e8bcb169c7bb25b7e07160d42 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 13:50:32 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/entity/BizMessage.java | 2 ++ 1 file changed, 2 insertions(+) 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 c8f65c1..eb793e0 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 @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -17,6 +18,7 @@ public class BizMessage { private String params; private Timestamp createtime; private String templatecode; + @TableField(exist = false) private String templatetype; /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */ From 4f96dc9306e7386d1234d1b8ccc6a8d2621faab5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 14:27:45 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/dao/BizMessageMapper.java | 3 ++ .../dao/mapper/BizMessageMapper.xml | 28 +++++++++++++++---- .../extend/bizmessage/entity/BizMessage.java | 2 -- .../entity/BizMessageAuthorize.java | 1 + .../bizmessage/entity/BizMessageVo.java | 11 ++++++++ .../impl/BizMessageConsumerServiceImpl.java | 6 ++-- .../bizmessage/vo/DescribeSiteMsgVO.java | 1 + 7 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index bb6325d..f2b2e01 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -3,10 +3,13 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import org.apache.ibatis.annotations.Param; public interface BizMessageMapper extends BaseMapper { IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); + IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 1785955..1c9d233 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -3,17 +3,14 @@ + \ No newline at end of file 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 eb793e0..76a5841 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 @@ -18,8 +18,6 @@ public class BizMessage { private String params; private Timestamp createtime; private String templatecode; - @TableField(exist = false) - private String templatetype; /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */ private Integer authorize; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java index 56f543b..25facf2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java @@ -11,5 +11,6 @@ public class BizMessageAuthorize { private String userId; private String messageId; + private String state; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java new file mode 100644 index 0000000..6ed5b5c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -0,0 +1,11 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +@Data +public class BizMessageVo extends BizMessage{ + + private String templatetype; + private String authorizestate; + +} 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 5c52e7f..e4b18e8 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 @@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; @@ -14,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -39,7 +41,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService public IBizMessagePage listOutline(PageDTO page) { page = createPageCondition(page); - IPage pageEntity = mapper.findMessage(new Page(page.getPageNo(), page.getPageSize()), + IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()), service.getCacheUser().getUserId()); // DAT -> VO 转换 @@ -49,8 +51,8 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService DescribeSiteMsgVO vo = new DescribeSiteMsgVO(); vo.setMsgId(source.getId()); vo.setTemplatetype(source.getTemplatetype()); + vo.setAuthorizestate(source.getAuthorizestate()); BeanUtils.copyProperties(source, vo); - return vo; }).collect(Collectors.toList())); 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 d62e3b1..df2a52b 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 @@ -17,6 +17,7 @@ public class DescribeSiteMsgVO { private String title; private String category; private String templatetype; + private String authorizestate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createtime; From 78d27c56077b277bf5533c60e0d7693b9ebb3243 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 14:33:27 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/service/impl/BizMessageProducerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9765b2a..aae83ee 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 @@ -92,7 +92,7 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService bizmessage.setAuthorize(Math.min(1, users.size())); log.debug("grant message [{}] to users", messageId); - users.forEach(userid -> authorizeMapper.insert(new BizMessageAuthorize(userid, messageId))); + users.forEach(userid -> authorizeMapper.insert(new BizMessageAuthorize(userid, messageId,"0"))); }); return bizmessage; 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 07/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=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; From 0062bd7dec8fbe2ceade1ab0a0c4ab553d3cfc37 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 16:41:41 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 2 ++ .../bizmessage/dao/BizMessageAuthorizeMapper.java | 1 + .../extend/bizmessage/dao/BizMessageMapper.java | 1 + .../bizmessage/dao/mapper/BizMessageMapper.xml | 12 +++++++++--- .../extend/bizmessage/entity/BizMessageVo.java | 2 +- .../service/BizMessageConsumerService.java | 1 + .../impl/BizMessageConsumerServiceImpl.java | 15 ++++++++++++++- .../extend/bizmessage/vo/DescribeSiteMsgVO.java | 2 ++ 8 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 05ac2b8..191c66a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -56,6 +56,8 @@ public class BizMessageConsumerController { DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); + //已读 + this.service.updateStateById(source.getId()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageAuthorizeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageAuthorizeMapper.java index 0084b9f..0230f84 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageAuthorizeMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageAuthorizeMapper.java @@ -5,4 +5,5 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; public interface BizMessageAuthorizeMapper extends BaseMapper { + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index f2b2e01..1317051 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -12,4 +12,5 @@ public interface BizMessageMapper extends BaseMapper { IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId); + Boolean updateStateById(@Param("id") String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 1c9d233..2cf3af7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -19,7 +19,7 @@ + + + update biz_message_authorize set state = 1 + where id=#{id} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index 6ed5b5c..d529cc1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class BizMessageVo extends BizMessage{ - private String templatetype; private String authorizestate; + private String authorizeid; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 087bc0e..665fff4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -11,4 +11,5 @@ public interface BizMessageConsumerService { BizMessage getDetailById(String id); + Boolean updateStateById(String id); } 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 fc624f2..4662e14 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.findMessage(new Page(page.getPageNo(), page.getPageSize()), + IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()), service.getCacheUser().getUserId()); // DAT -> VO 转换 @@ -51,6 +51,8 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService DescribeSiteMsgVO vo = new DescribeSiteMsgVO(); vo.setMsgId(source.getId()); vo.setServicecode(source.getServicecode()); + vo.setAuthorizestate(source.getAuthorizestate()); + vo.setAuthorizeid(source.getAuthorizeid()); BeanUtils.copyProperties(source, vo); return vo; }).collect(Collectors.toList())); @@ -69,6 +71,17 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService return mapper.selectById(id); } + /** + * 消息详情 已读修改 + * + * @param id + * @return + */ + @Override + public Boolean updateStateById(String id){ + return mapper.updateStateById(id); + } + /** * @param page * @return 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 ac2c28f..d22ea0b 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 @@ -17,6 +17,8 @@ public class DescribeSiteMsgVO { private String title; private String category; private String servicecode; + private String authorizestate; + private String authorizeid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createtime; From 69815abcc5898c470154b1b4a1eaa3840566692f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 16:54:53 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 2 +- .../mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java | 2 +- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 5 +++-- .../bizmessage/service/BizMessageConsumerService.java | 2 +- .../service/impl/BizMessageConsumerServiceImpl.java | 7 ++++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 191c66a..46029ca 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -57,7 +57,7 @@ public class BizMessageConsumerController { vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); //已读 - this.service.updateStateById(source.getId()); + this.service.updateState(source.getId()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 1317051..42dc549 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -12,5 +12,5 @@ public interface BizMessageMapper extends BaseMapper { IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId); - Boolean updateStateById(@Param("id") String id); + Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 2cf3af7..aea8bcc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -38,9 +38,10 @@ ORDER BY createtime DESC - + update biz_message_authorize set state = 1 - where id=#{id} + where message_id=#{messageId} + and user_id =#{userId} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 665fff4..56a61ad 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -11,5 +11,5 @@ public interface BizMessageConsumerService { BizMessage getDetailById(String id); - Boolean updateStateById(String id); + Boolean updateState(String id); } 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 4662e14..7cc339c 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 @@ -74,12 +74,13 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService /** * 消息详情 已读修改 * - * @param id + * @param messageId * @return */ @Override - public Boolean updateStateById(String id){ - return mapper.updateStateById(id); + public Boolean updateState(String messageId){ + String userId = service.getCacheUser().getUserId(); + return mapper.updateState(userId,messageId); } /** From 9fe6eace7491c8472e25d91f3ae721c9187e6ce5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 4 Aug 2021 17:06:27 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 6 ++---- .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index aea8bcc..cf3de85 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -19,18 +19,16 @@ + + SELECT + biz_message.*, + biz_message_authorize.state as authorizestate, + biz_message_template.type AS templatetype + FROM + biz_message + LEFT JOIN biz_message_template ON biz_message.templatecode = biz_message_template.CODE + inner join biz_message_authorize on biz_message.id = biz_message_authorize.message_id + WHERE + authorize = 1 and user_id = #{userId} + + and biz_message_authorize.state = #{authorizestate} + + + and biz_message_template.type = #{templatetype} + + ORDER BY createtime DESC + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 56a61ad..2fb4082 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -2,9 +2,12 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; +import java.util.List; + public interface BizMessageConsumerService { IBizMessagePage listOutline(PageDTO page); @@ -12,4 +15,6 @@ public interface BizMessageConsumerService { BizMessage getDetailById(String id); Boolean updateState(String id); + + List selectMsgListByType(BizMessageVo vo); } 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 0d1ca82..69b6df7 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 @@ -97,4 +97,16 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService }).orElseGet(PageDTO::new); } + /** + * 消息概要列表 + * + * @return + */ + @Override + public List selectMsgListByType(BizMessageVo vo) { + + List list = mapper.findMessageVoList(vo,service.getCacheUser().getUserId()); + + return list; + } } From 1cfbac87c41a029e1b631863dc535bb1fc3aef07 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 5 Aug 2021 09:25:11 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java | 2 +- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 2 +- .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java | 1 + .../service/impl/BizMessageConsumerServiceImpl.java | 6 +++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 0b0fba2..677fb87 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper { Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); - List findMessageVoList(BizMessageVo vo,@Param("userId") String userId); + List findMessageVoList(BizMessageVo vo); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 80092fe..1e4fbe5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -42,7 +42,7 @@ and user_id =#{userId} - SELECT biz_message.*, diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index 03a92a2..d7d922c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -7,5 +7,6 @@ public class BizMessageVo extends BizMessage{ private String authorizestate; private String templatetype; + private String userId; } 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 69b6df7..b415eda 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 @@ -105,7 +105,11 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService @Override public List selectMsgListByType(BizMessageVo vo) { - List list = mapper.findMessageVoList(vo,service.getCacheUser().getUserId()); + vo.setUserId(service.getCacheUser().getUserId()); + if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){ + vo.setAuthorizestate("0"); + } + List list = mapper.findMessageVoList(vo); return list; } From bae2583d4cf92d82bc8238784666fe64315be196 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 9 Aug 2021 17:12:21 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 7 ++++--- .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 1e4fbe5..da79a91 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -19,13 +19,13 @@ \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index e63151b..b15db1b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -8,6 +8,7 @@ public class BizMessageVo extends BizMessage{ private String authorizestate; private String templatetype; private String userId; - private Integer datanum; + private Long datanum; + private Integer size; } 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 b415eda..10b0df8 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 @@ -104,12 +104,21 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService */ @Override public List selectMsgListByType(BizMessageVo vo) { - + vo.setSize(vo.getSize()!=null?vo.getSize():5); vo.setUserId(service.getCacheUser().getUserId()); if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){ vo.setAuthorizestate("0"); } - List list = mapper.findMessageVoList(vo); + PageDTO page = new PageDTO(); + page.setPageSize(vo.getSize()); + + IPage pageEntity = mapper.findMessageVoList(new Page(page.getPageNo(), page.getPageSize()),vo); + + List list = pageEntity.getRecords(); + + list.forEach(l->{ + l.setDatanum(pageEntity.getCurrent()); + }); return list; } From 164210d1c82077223adb031ef49253f545c5477f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 09:55:02 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/service/impl/BizMessageConsumerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 10b0df8..995be68 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 @@ -117,7 +117,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService List list = pageEntity.getRecords(); list.forEach(l->{ - l.setDatanum(pageEntity.getCurrent()); + l.setDatanum(pageEntity.getTotal()); }); return list; From 045546b340b87721a0d56580040ffdeb277db894 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 13:56:20 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/dao/BizMessageMapper.java | 2 +- .../impl/BizMessageConsumerServiceImpl.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index ab19cc6..677fb87 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper { Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); - IPage findMessageVoList(@Param("param") IPage page,BizMessageVo vo); + List findMessageVoList(BizMessageVo vo); } 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 995be68..6eecc4c 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 @@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -109,17 +110,19 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){ vo.setAuthorizestate("0"); } - PageDTO page = new PageDTO(); - page.setPageSize(vo.getSize()); - IPage pageEntity = mapper.findMessageVoList(new Page(page.getPageNo(), page.getPageSize()),vo); + List list = mapper.findMessageVoList(vo); - List list = pageEntity.getRecords(); + List rList = new ArrayList<>(); - list.forEach(l->{ - l.setDatanum(pageEntity.getTotal()); - }); + for(int i = 0 ; i < list.size();i++){ + if(i Date: Tue, 10 Aug 2021 14:01:23 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 99b262e..1e4fbe5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -61,7 +61,6 @@ and biz_message_template.type = #{templatetype} ORDER BY createtime DESC - LIMIT #{size} \ No newline at end of file From 403ce0e4ea2c94a7231d5e95fd59427b439ac92f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 14:15:57 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 84e2830..ad1e56d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -77,4 +77,18 @@ public class BizMessageConsumerController { return service.selectMsgListByType(vo); } + + /** + * 信息已阅 + * + * @return + */ + @ApiOperation("信息已阅") + @GetMapping("selectMsgRead/{id}") + @ResponseStatus(code = HttpStatus.OK) + public Boolean selectMsgRead( @ApiParam(value = "待查询的消息id", required = true) @PathVariable("id") String id) { + //已读 + this.service.updateState(id); + return true; + } } From 4129aa947c214c94f0d32f2089ab29a3679c348e Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:00:49 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/controller/BizMessageConsumerController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index ad1e56d..d7e12dc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -59,7 +59,7 @@ public class BizMessageConsumerController { vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); //已读 - this.service.updateState(source.getId()); + //this.service.updateState(source.getId()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); From 83568accad8d6f176fa484cd6cc3552f269797ce Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:27:49 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BizMessageConsumerController.java | 8 +++++--- .../bizmessage/dao/BizMessageMapper.java | 3 +++ .../bizmessage/dao/mapper/BizMessageMapper.xml | 18 ++++++++++++++++++ .../service/BizMessageConsumerService.java | 8 ++++++++ .../impl/BizMessageConsumerServiceImpl.java | 18 +++++++++++++++++- .../bizmessage/vo/DescribeSiteMsgDetailVO.java | 1 + 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index d7e12dc..2c4157c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; @@ -58,9 +59,10 @@ public class BizMessageConsumerController { DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); - //已读 - //this.service.updateState(source.getId()); - + BizMessageAuthorize authorize = new BizMessageAuthorize(); + authorize.setMessageId(source.getId()); + authorize = this.service.getAuthorize(authorize); + vo.setAuthorizestate(authorize.getState()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 677fb87..f3e4724 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import org.apache.ibatis.annotations.Param; @@ -18,4 +19,6 @@ public interface BizMessageMapper extends BaseMapper { List findMessageVoList(BizMessageVo vo); + List findAuthorizeList(BizMessageAuthorize vo); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 1e4fbe5..0200e59 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -63,4 +63,22 @@ ORDER BY createtime DESC + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 2fb4082..40fab11 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; @@ -17,4 +18,11 @@ public interface BizMessageConsumerService { Boolean updateState(String id); List selectMsgListByType(BizMessageVo vo); + + /** + * 查询读取状态 + * @param authorize + * @return + */ + BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize); } 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 6eecc4c..1f2c92e 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 @@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; @@ -69,7 +70,8 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService */ @Override public BizMessage getDetailById(String id) { - return mapper.selectById(id); + BizMessage message = mapper.selectById(id); + return message; } /** @@ -125,4 +127,18 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService return rList; } + + + /** + * 查询读取状态 + * @param authorize + * @return + */ + @Override + public BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize){ + + authorize.setUserId(service.getCacheUser().getUserId()); + List authorizes = this.mapper.findAuthorizeList(authorize); + return authorizes!=null?authorizes.get(0):new BizMessageAuthorize(); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java index 5b9d27e..55d254e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java @@ -26,4 +26,5 @@ public class DescribeSiteMsgDetailVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createtime; + private String authorizestate; } From 5c87824c4514d008c20018f34265647ee8b5b6e5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:33:09 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 0200e59..9858806 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -79,6 +79,5 @@ and state = #{state} - ORDER BY createtime DESC \ No newline at end of file From ed85aa6aef1aeeb8aeeaaf24fca19794ae4e15cf Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 11 Aug 2021 10:31:41 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/controller/BizMessageConsumerController.java | 1 + .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 2c4157c..86ec5fa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -63,6 +63,7 @@ public class BizMessageConsumerController { authorize.setMessageId(source.getId()); authorize = this.service.getAuthorize(authorize); vo.setAuthorizestate(authorize.getState()); + vo.setServicecode(source.getServicecode()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java index 55d254e..585ac74 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java @@ -27,4 +27,5 @@ public class DescribeSiteMsgDetailVO { private Timestamp createtime; private String authorizestate; + private String servicecode; }