diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java index 337a4ce1..205b517d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java @@ -1,10 +1,10 @@ package cn.axzo.msg.center.inside.notices.service; +import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; import cn.axzo.msg.center.api.request.MessageNewRes; import cn.axzo.msg.center.api.response.MessageTotalRes; -import cn.axzo.msg.center.common.page.PageResult; import cn.axzo.msg.center.domain.enums.UserTypeEnum; /** diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java index eb2c11f6..9af2653f 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java @@ -1,12 +1,12 @@ package cn.axzo.msg.center.inside.notices.service; +import cn.axzo.core.domain.PageResult; +import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.domain.entity.MessageRecord; import cn.axzo.msg.center.domain.enums.UserTypeEnum; -import cn.axzo.msg.center.api.enums.MsgStateEnum; -import cn.axzo.msg.center.common.page.PageResult; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java index e7fc3082..31870734 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java @@ -1,5 +1,6 @@ package cn.axzo.msg.center.inside.notices.service.impl; +import cn.axzo.core.domain.PageResult; import cn.axzo.core.service.ServiceException; import cn.axzo.core.web.Result; import cn.axzo.core.web.Results; @@ -7,7 +8,6 @@ import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; -import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; import cn.axzo.msg.center.api.response.Template; import cn.axzo.msg.center.common.utils.CustomBeanUtils; @@ -71,11 +71,8 @@ public class InsideNoticesApiImpl implements InsideNoticesApi { @Override public Result> msgList(CmsMsgQueryReq req) { - cn.axzo.msg.center.common.page.PageResult messageNewResPageResult = messageCoreService.listMsgInfo(req); - PageResult result=new PageResult<>(); - if(!CollectionUtils.isEmpty(result.getData())) - CustomBeanUtils.copyProperties(messageNewResPageResult,result); - return Results.ok(result); + PageResult messageNewResPageResult = messageCoreService.listMsgInfo(req); + return Results.ok(messageNewResPageResult); } @Override diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java index 3d4d4a64..6da9540a 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java @@ -1,12 +1,12 @@ package cn.axzo.msg.center.inside.notices.service.impl; +import cn.axzo.core.domain.PageResult; import cn.axzo.framework.auth.domain.ContextInfoHolder; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; import cn.axzo.msg.center.api.request.MessageNewRes; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.common.enums.SystemTypeEnum; import cn.axzo.msg.center.common.exception.ServiceException; -import cn.axzo.msg.center.common.page.PageResult; import cn.axzo.msg.center.common.utils.PlaceholderResolver; import cn.axzo.msg.center.domain.dto.MsgModuleDTO; import cn.axzo.msg.center.domain.entity.MessageModule; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java index 12ed05c2..0f736bb3 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.inside.notices.service.impl; import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.basics.common.util.AssertUtil; +import cn.axzo.core.domain.PageResult; import cn.axzo.framework.auth.domain.ContextInfoHolder; import cn.axzo.msg.center.api.enums.*; import cn.axzo.msg.center.api.request.*; @@ -9,7 +10,6 @@ import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.common.enums.IdentityType; import cn.axzo.msg.center.common.exception.ServiceException; import cn.axzo.msg.center.common.model.ProfileIdRepair; -import cn.axzo.msg.center.common.page.PageResult; import cn.axzo.msg.center.common.utils.BeanConvertUtils; import cn.axzo.msg.center.common.utils.PlaceholderResolver; import cn.axzo.msg.center.common.utils.SpringUtils; @@ -33,7 +33,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.text.StrSubstitutor; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -392,7 +391,7 @@ public class MessageRecordServiceImpl implements MessageRecordService { */ private PageResult convertPageMessageNewRes(IPage iPage){ if(iPage == null || CollectionUtils.isEmpty(iPage.getRecords())){ - return new PageResult<>(); + return new PageResult<>(new ArrayList<>(),0L); } List records=new ArrayList<>(iPage.getRecords().size()); for (MessageNewResDTO record : iPage.getRecords()) { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java index d1155ba5..f5e4602a 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java @@ -1,12 +1,12 @@ package cn.axzo.msg.center.api; +import cn.axzo.core.domain.PageResult; import cn.axzo.core.web.Result; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.fallback.InsideNoticesApiFallBack; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; -import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; import cn.axzo.msg.center.api.response.Template; import org.springframework.cloud.openfeign.FeignClient; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MsgDynamicServiceApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MsgDynamicServiceApi.java deleted file mode 100644 index 967b4a53..00000000 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MsgDynamicServiceApi.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.axzo.msg.center.api; - -import cn.axzo.core.web.Result; -import cn.axzo.msg.center.api.fallback.MsgDynamicServiceApiFallBack; -import cn.axzo.msg.center.api.request.PMsgDynamicReq; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import javax.validation.Valid; - -/** - * 动态消息服务 - * - * @author zhangPeng - * @description - * @date 2021/2/1 19:41 - */ -@FeignClient(name = "msg-center", url = "http://msg-center:10086", fallback = MsgDynamicServiceApiFallBack.class) -public interface MsgDynamicServiceApi { - - /** - * 保存动态消息 - */ - @PostMapping(value = "api/msg/saveDynamicMsg") - Result saveDynamicMsg(@RequestBody @Valid PMsgDynamicReq msg); - -} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java index d8c53efc..d73fb1cf 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java @@ -1,12 +1,12 @@ package cn.axzo.msg.center.api.fallback; +import cn.axzo.core.domain.PageResult; import cn.axzo.core.web.Result; import cn.axzo.core.web.Results; import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; -import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; import cn.axzo.msg.center.api.response.Template; import cn.hutool.json.JSONUtil; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MsgDynamicServiceApiFallBack.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MsgDynamicServiceApiFallBack.java deleted file mode 100644 index 4bd71e17..00000000 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MsgDynamicServiceApiFallBack.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.axzo.msg.center.api.fallback; - -import cn.axzo.core.web.Result; -import cn.axzo.core.web.Results; -import cn.axzo.msg.center.api.MsgDynamicServiceApi; -import cn.axzo.msg.center.api.request.PMsgDynamicReq; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.validation.Valid; - -/** - * @author zhangPeng - * @description - * @date 2021/6/29 11:19 - */ -@Component -@Slf4j -public class MsgDynamicServiceApiFallBack implements MsgDynamicServiceApi { - - /** - * 保存动态消息 - * - * @param msg - */ - @Override - public Result saveDynamicMsg(@Valid PMsgDynamicReq msg) { - log.info("保存动态消息超时 msg = {}", msg); - return Results.fail("保存动态消息超时"); - } -} diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java deleted file mode 100644 index a9964f09..00000000 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.axzo.msg.center.api.response; - -import lombok.Data; - -import java.util.List; - -/** - * 分页结果集 - * @author Smile - * @date 2019/6/29 16:13 - */ -@Data -public class PageResult { - - /** - * 总条数 - */ - private Long totalCount; - - /** - * 数据 - */ - private List data; - - public PageResult() { - } - - public PageResult(List data, Long totalCount) { - this.data = data; - this.totalCount = totalCount; - } -} diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/IPageResult.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/IPageResult.java deleted file mode 100644 index de42e55d..00000000 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/IPageResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.axzo.msg.center.common.page; - -import java.util.List; - -/** - * 分页结果 - * @author Smile - * @date 2019/6/29 16:21 - */ -public interface IPageResult { - - /** - * 通过数据总数和数据创建 - * @param totalCount - * @param data - * @param - * @return - */ - static PageResult by(List data, long totalCount) { - return new PageResult(data, totalCount); - } -} diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageRequest.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageRequest.java deleted file mode 100644 index 1511e4a5..00000000 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageRequest.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.axzo.msg.center.common.page; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.Getter; -import lombok.Setter; - -/** - * 分页请求 - * - * @author Smile - */ -@Setter -@Getter -public class PageRequest { - - /** - * 当前页 - */ - protected Long page; - - /** - * 页大小 - */ - protected Long pageSize; - - public IPage toPage() { - if (this.page != null && this.page == -1L) { - page = 1L; - pageSize = 9999L; - return new Page<>(page, pageSize); - } - if (this.page == null || this.page == 0L) { - page = 1L; - } - if (this.pageSize == null || this.pageSize == 0L) { - pageSize = 20L; - } - return new Page<>(page, pageSize); - } - -} diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageResult.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageResult.java deleted file mode 100644 index 034be747..00000000 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.axzo.msg.center.common.page; - -import lombok.Data; - -import java.util.List; - -/** - * 分页结果集 - * @author Smile - * @date 2019/6/29 16:13 - */ -@Data -public class PageResult { - - /** - * 总条数 - */ - private Long totalCount; - - /** - * 数据 - */ - private List data; - - public PageResult() { - } - - public PageResult(List data, Long totalCount) { - this.data = data; - this.totalCount = totalCount; - } -} diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/Paging.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/Paging.java deleted file mode 100644 index 2cf76068..00000000 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/page/Paging.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.axzo.msg.center.common.page; - -import lombok.Data; - -/** - * 旧分页【未来将移除】 - */ -@Data -public class Paging { - /** - * 页 - */ - private Long page; - /** - * 页条数 - */ - private Long pageSize; - /** - * 总数 - */ - private Long total; - /** - * 分页数 - */ - private Integer pageCount; - - public Paging() { - - } - - public Paging(Long page, Long pageSize, Long total) { - if (page < 1L) { - page = 1L; - } - if (pageSize < 1L) { - pageSize = 10L; - } - - this.page = page; - this.pageSize = pageSize; - this.total = total; - this.pageCount = (int) Math.ceil(total.doubleValue() / pageSize.doubleValue()); - } -} diff --git a/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageController.java b/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageController.java index e892bff7..a60bb0fd 100644 --- a/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageController.java +++ b/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageController.java @@ -1,5 +1,6 @@ package cn.axzo.msg.center.webapi; +import cn.axzo.core.domain.PageResult; import cn.axzo.core.web.Result; import cn.axzo.core.web.Results; import cn.axzo.framework.auth.annotation.PreBuildContext; @@ -8,7 +9,6 @@ import cn.axzo.msg.center.api.request.GeneralMessage; import cn.axzo.msg.center.api.request.MessageNewRes; import cn.axzo.msg.center.api.request.MsgReturnParamRes; import cn.axzo.msg.center.api.response.MessageTotalRes; -import cn.axzo.msg.center.common.page.PageResult; import cn.axzo.msg.center.domain.enums.UserTypeEnum; import cn.axzo.msg.center.inside.notices.service.MessageCoreService; import cn.axzo.msg.center.inside.notices.service.MessageRecordService;