wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "REQ-2318: 处理类找不到的问题"

Browse Source 
This reverts commit cc5b1d2afd.
This commit is contained in:
yanglin 2024-06-27 14:06:09 +08:00
parent cc5b1d2afd
commit 855e19e350
16 changed files with 25 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java
View File

@ -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;

1
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java
View File

@ -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;

6
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java
View File

@ -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;

8
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java
View File

@ -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;

10
msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java
View File

@ -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;

1
msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java
View File

@ -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.*;

10
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java
View File

@ -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;

1
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java
View File

@ -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.*;

26
msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PageResult.java
View File

@ -1,26 +0,0 @@
package cn.axzo.msg.center.api.response;
import lombok.Data;
import java.util.List;
/**
* @author yanglin
*/
@Data
public class PageResult<T> {
/**
* 总条数
*/
private Long totalCount;
/**
* 数据
*/
private List<T> data;
public PageResult(List<T> data, Long totalCount) {
this.data = data;
this.totalCount = totalCount;
}
}

2
msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java
View File

@ -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;

9
msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageController.java
View File

@ -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;