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 ee44fcce..66261fa8 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,7 +1,6 @@ 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.MessageModuleStatisticReq; import cn.axzo.msg.center.api.request.MessagePageQueryReq; @@ -13,6 +12,7 @@ import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageStatisticRes; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.domain.enums.UserTypeEnum; +import cn.axzo.msg.center.api.response.PageResult; import cn.azxo.framework.common.model.Page; import java.util.List; 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 025d8154..c920a4bb 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.MessageNewRes; import cn.axzo.msg.center.api.response.MessageRecordRes; import cn.axzo.msg.center.api.response.MessageTotalRes; +import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.domain.dto.UpdateReadDTO; import cn.axzo.msg.center.domain.entity.MessageRecord; import cn.axzo.msg.center.domain.enums.UserTypeEnum; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java index 6eb47a60..6828dbe6 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java @@ -1,6 +1,5 @@ package cn.axzo.msg.center.inside.notices.service.impl; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.InsideMessageRecordApi; import cn.axzo.msg.center.api.request.CmsMsgListReq; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; @@ -11,6 +10,7 @@ import cn.axzo.msg.center.api.request.QueryMessageRecordReq; import cn.axzo.msg.center.api.request.UpdateReadReq; import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageRecordRes; +import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.common.exception.ServiceException; import cn.axzo.msg.center.common.utils.BeanConvertUtils; import cn.axzo.msg.center.dal.MessageRecordDao; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java index e0c3c5ab..4acf8c90 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java @@ -22,8 +22,8 @@ import cn.axzo.msg.center.inside.notices.service.MessageTemplateService; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.compress.utils.Lists; import org.springframework.core.env.Environment; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; 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 0c0a3cec..f4d0e067 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,6 +1,5 @@ package cn.axzo.msg.center.inside.notices.service.impl; -import cn.axzo.core.domain.PageResult; import cn.axzo.core.service.ServiceException; import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.enums.MsgStateEnum; 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 edfdef5f..99c7292c 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,6 +1,5 @@ package cn.axzo.msg.center.inside.notices.service.impl; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.enums.MsgTypeEnum; import cn.axzo.msg.center.api.mq.SendMessageRecordMessage; @@ -33,13 +32,10 @@ import cn.axzo.msg.center.inside.notices.service.MessageRecordService; import cn.axzo.msg.center.inside.notices.service.MessageRelationService; import cn.axzo.msg.center.inside.notices.service.MessageRouterService; import cn.axzo.msg.center.inside.notices.service.RawMessageRecordService; -import cn.axzo.msg.center.message.domain.param.MessageGroupNodeStatisticParam; -import cn.axzo.msg.center.message.service.PendingMessageNewService; import cn.axzo.msg.center.mq.MqMessageRecord; import cn.axzo.msg.center.mq.MqMessageType; import cn.axzo.msg.center.mq.MqProducer; -import cn.axzo.msg.center.service.dto.PersonDTO; -import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum; +import cn.axzo.msg.center.api.response.PageResult; import cn.azxo.framework.common.model.Page; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; 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 1a558bd6..449a3efa 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,7 +2,6 @@ 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.msg.center.api.enums.MsgRecordTerminalTypeEnum; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.enums.MsgTypeEnum; @@ -21,6 +20,7 @@ import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageRecordRes; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.api.response.MyPage; +import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.common.enums.IdentityType; import cn.axzo.msg.center.common.exception.ServiceException; import cn.axzo.msg.center.common.model.ProfileIdRepair; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java index 3ac53023..67d13aa6 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java @@ -1,11 +1,11 @@ package cn.axzo.msg.center.message.service.impl; import cn.axzo.basics.common.util.AssertUtil; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.enums.MsgTypeEnum; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; import cn.axzo.msg.center.api.response.MessageNewRes; +import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.common.enums.TableIsDeleteEnum; import cn.axzo.msg.center.common.utils.PageHelperUtil; import cn.axzo.msg.center.dal.MessageRecordDao; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java index df324b27..b6b39a7c 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java @@ -10,13 +10,17 @@ import cn.axzo.msg.center.message.migrate.OuIdMigrateService; import cn.axzo.msg.center.service.enums.YesOrNo; import cn.azxo.framework.common.model.Page; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java index 2dbca6d1..05861e2f 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java @@ -1,12 +1,16 @@ package cn.axzo.msg.center.api; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.fallback.InsideMessageRecordApiFallBack; -import cn.axzo.msg.center.api.request.*; +import cn.axzo.msg.center.api.request.CmsMsgListReq; +import cn.axzo.msg.center.api.request.MessageRecordDeleteReq; +import cn.axzo.msg.center.api.request.MessageRecordReq; +import cn.axzo.msg.center.api.request.MessageStatisticsReq; +import cn.axzo.msg.center.api.request.QueryMessageRecordReq; +import cn.axzo.msg.center.api.request.UpdateReadReq; import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageRecordRes; +import cn.axzo.msg.center.api.response.PageResult; import cn.azxo.framework.common.model.CommonResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PostMapping; 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 7a338415..7c7bcac8 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,7 +1,6 @@ package cn.axzo.msg.center.api; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.fallback.InsideNoticesApiFallBack; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.*; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java index d1e3c1d2..1ffb3cac 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java @@ -1,13 +1,17 @@ package cn.axzo.msg.center.api.fallback; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.InsideMessageRecordApi; -import cn.axzo.msg.center.api.request.*; +import cn.axzo.msg.center.api.request.CmsMsgListReq; +import cn.axzo.msg.center.api.request.MessageRecordDeleteReq; +import cn.axzo.msg.center.api.request.MessageRecordReq; +import cn.axzo.msg.center.api.request.MessageStatisticsReq; +import cn.axzo.msg.center.api.request.QueryMessageRecordReq; +import cn.axzo.msg.center.api.request.UpdateReadReq; import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageRecordRes; +import cn.axzo.msg.center.api.response.PageResult; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; 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 e73b4e15..211575b0 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,6 +1,5 @@ package cn.axzo.msg.center.api.fallback; -import cn.axzo.core.domain.PageResult; import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.*; 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 new file mode 100644 index 00000000..a008d0c3 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java @@ -0,0 +1,26 @@ +package cn.axzo.msg.center.api.response; + +import lombok.Data; + +import java.util.List; + +/** + * @author yanglin + */ +@Data +public class PageResult { + /** + * 总条数 + */ + private Long totalCount; + + /** + * 数据 + */ + private List data; + + 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/utils/PlaceholderResolver.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java index e59c0151..307633b9 100644 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java +++ b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java @@ -3,8 +3,8 @@ package cn.axzo.msg.center.common.utils; import cn.axzo.msg.center.common.template.TemplateParser; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import java.util.HashSet; 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 2d24f888..55e06911 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,19 +1,24 @@ package cn.axzo.msg.center.webapi; -import cn.axzo.core.domain.PageResult; import cn.axzo.framework.auth.annotation.PreBuildContext; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; import cn.axzo.msg.center.api.request.GeneralMessageReq; import cn.axzo.msg.center.api.request.MsgReturnParamRes; import cn.axzo.msg.center.api.response.MessageNewRes; import cn.axzo.msg.center.api.response.MessageTotalRes; +import cn.axzo.msg.center.api.response.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; import cn.azxo.framework.common.model.CommonResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid;