diff --git a/README.md b/README.md index 223c0db..faa31ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # 扩展功能微服务组件 公告通知功能、共享文档... - + pom版本 测试 2.3.1-SNAPSHOT + 生产 2.3.0-SNAPSHOT + gjgs 测试 2.3.0-SNAPSHOT + 生产 2.3.1-gjgs-SNAPSHOT ## 组件模块 1. 消息模块 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 86ec5fa..16024b0 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,8 +1,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; 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.entity.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO; @@ -94,4 +94,17 @@ public class BizMessageConsumerController { this.service.updateState(id); return true; } + + /** + * 供应商澄清待办 + * + * @return + */ + @ApiOperation("供应商澄清待办") + @PostMapping("supplierClearMsgRead") + @ResponseStatus(code = HttpStatus.OK) + public BaseResponse> supplierClearMsgRead(@RequestBody SupplierMsgReadInVo msgReadInVo) { + SupplierMsgReadOutVo outVo = this.service.supplierClearMsgRead(msgReadInVo); + return BaseResponse.success(outVo.getMessageList()); + } } 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 d77c221..4a2437e 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,9 +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.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.entity.*; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +28,6 @@ public interface BizMessageMapper extends BaseMapper { Integer deleteMessageById(@Param("magId")String magId); Integer deleteAuthorizeById(@Param("magId")String magId,@Param("userId")String userId); + + List supplierClearMsgRead(@Param("vo") SupplierMsgReadInVo msgReadInVo); } 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 71998c3..25252b9 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 @@ -136,4 +136,34 @@ and user_id = #{userId} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java new file mode 100644 index 0000000..d832753 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +@Data +public class CompanyObj { + + private String companyId; + private String userId; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java new file mode 100644 index 0000000..6f0a1b3 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java @@ -0,0 +1,16 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +@Data +public class Message { + + private String id; + private String companyId; + private String userId; + private String type; + private String state; + private String title; + private String createTime; + private String content; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java new file mode 100644 index 0000000..51e8eac --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java @@ -0,0 +1,14 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class SupplierMsgReadInVo { + + private List companyObjs; + private String state; + private String startTime; + private String endTime; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java new file mode 100644 index 0000000..2239768 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java @@ -0,0 +1,11 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class SupplierMsgReadOutVo { + + private List messageList; +} 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 40fab11..17faa3b 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 @@ -1,9 +1,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.entity.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; @@ -25,4 +23,11 @@ public interface BizMessageConsumerService { * @return */ BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize); + + /** + * 供应商澄清待办 + * @param msgReadInVo + * @return + */ + SupplierMsgReadOutVo supplierClearMsgRead(SupplierMsgReadInVo msgReadInVo); } 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 0021ae3..24ab5b9 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 @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.entity.*; 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; @@ -16,9 +14,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.*; import java.util.stream.Collectors; /** @@ -141,4 +137,28 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService List authorizes = this.mapper.findAuthorizeList(authorize); return authorizes!=null&&authorizes.size()>0?authorizes.get(0):new BizMessageAuthorize(); } + + /** + * 供应商澄清待办 + * @param msgReadInVo + * @return + */ + @Override + public SupplierMsgReadOutVo supplierClearMsgRead(SupplierMsgReadInVo msgReadInVo){ + SupplierMsgReadOutVo vo = new SupplierMsgReadOutVo(); + Map companyMap = new HashMap<>(); + + msgReadInVo.getCompanyObjs().forEach(c->{ + companyMap.put(c.getUserId(),c.getCompanyId()); + }); + + //查询供应商 账号 + List messageList = this.mapper.supplierClearMsgRead(msgReadInVo); + messageList.forEach(m->{ + m.setCompanyId(companyMap.get(m.getUserId())); + }); + + vo.setMessageList(messageList); + return vo; + } }