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 66261fa8..ee44fcce 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,6 +1,7 @@ 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; @@ -12,7 +13,6 @@ 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 c920a4bb..025d8154 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 6828dbe6..6eb47a60 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,5 +1,6 @@ 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; @@ -10,7 +11,6 @@ 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 4acf8c90..e0c3c5ab 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 f4d0e067..0c0a3cec 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.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 99c7292c..edfdef5f 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,5 +1,6 @@ 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; @@ -32,10 +33,13 @@ 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.api.response.PageResult; +import cn.axzo.msg.center.service.dto.PersonDTO; +import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum; 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 449a3efa..1a558bd6 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.msg.center.api.enums.MsgRecordTerminalTypeEnum; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.enums.MsgTypeEnum; @@ -20,7 +21,6 @@ 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 67d13aa6..3ac53023 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 b6b39a7c..df324b27 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,17 +10,13 @@ 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.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; +import lombok.*; 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 05861e2f..2dbca6d1 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,16 +1,12 @@ 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.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.request.*; 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 7c7bcac8..7a338415 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,6 +1,7 @@ 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 1ffb3cac..d1e3c1d2 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,17 +1,13 @@ 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.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.request.*; 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 211575b0..e73b4e15 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,5 +1,6 @@ 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 deleted file mode 100644 index a008d0c3..00000000 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java +++ /dev/null @@ -1,26 +0,0 @@ -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 307633b9..e59c0151 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 55e06911..2d24f888 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,24 +1,19 @@ 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.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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid;