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 46c2e4c..738fa9c 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 @@ -13,7 +13,7 @@ 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); + IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId,@Param("templatecodes") List templatecodes); 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 cfcee88..486b164 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 @@ -23,16 +23,30 @@ FROM biz_message left join biz_message_template on biz_message.templatecode = biz_message_template.code WHERE authorize = 0 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + UNION ALL SELECT a.*,IFNULL(b.state,1) as authorizestate FROM ( 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 = 1) a + WHERE authorize = 1 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + + ) a INNER JOIN ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id + ORDER BY createtime DESC @@ -60,6 +74,12 @@ and biz_message_template.type = #{templatetype} + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + ORDER BY createtime DESC diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java index 91af3da..3c7fae0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * 分页明细 * @@ -26,4 +28,7 @@ public class PageDTO { this.pageSize = 15; } + @ApiModelProperty(required = false, value = "指定消息类型,null 查全部") + private List templatecodes; + } 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 b15db1b..55ecfaf 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 @@ -1,7 +1,10 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class BizMessageVo extends BizMessage{ @@ -11,4 +14,6 @@ public class BizMessageVo extends BizMessage{ private Long datanum; private Integer size; + @ApiModelProperty(required = false, value = "指定消息类型,null 查全部") + private List templatecodes; } 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 7028181..8db6a00 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 @@ -42,9 +42,9 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService @Override public IBizMessagePage listOutline(PageDTO page) { page = createPageCondition(page); + IPage pageEntity = new Page(page.getPageNo(), page.getPageSize()); - IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()), - service.getCacheUser().getUserId()); + pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId(),page.getTemplatecodes()); // DAT -> VO 转换 IBizMessagePage result = new BizMessagePage<>(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java index 923aa5b..49de7ed 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -10,6 +10,9 @@ import com.chinaunicom.baas.util.AccessToken; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType; +import com.chinaunicom.mall.ebtp.common.log.service.OperationLogService; import com.chinaunicom.mall.ebtp.common.uniBss.constant.UniBssConstant; import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBss; import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssAttached; @@ -55,6 +58,9 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); @@ -108,10 +115,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl + @@ -22,7 +23,7 @@