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

删除不用的类

Browse Source
This commit is contained in:
刘才福 2023-06-16 19:08:56 +08:00
parent 1f7187696c
commit 7634282231
15 changed files with 12 additions and 247 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,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;
/**

4
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.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;

9
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.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<PageResult<MessageNewRes>> msgList(CmsMsgQueryReq req) {
cn.axzo.msg.center.common.page.PageResult<MessageNewRes> messageNewResPageResult = messageCoreService.listMsgInfo(req);
PageResult<MessageNewRes> result=new PageResult<>();
if(!CollectionUtils.isEmpty(result.getData()))
CustomBeanUtils.copyProperties(messageNewResPageResult,result);
return Results.ok(result);
PageResult<MessageNewRes> messageNewResPageResult = messageCoreService.listMsgInfo(req);
return Results.ok(messageNewResPageResult);
}
@Override

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

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

5
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.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<MessageNewRes> convertPageMessageNewRes(IPage<MessageNewResDTO> iPage){
if(iPage == null || CollectionUtils.isEmpty(iPage.getRecords())){
return new PageResult<>();
return new PageResult<>(new ArrayList<>(),0L);
}
List<MessageNewRes> records=new ArrayList<>(iPage.getRecords().size());
for (MessageNewResDTO record : iPage.getRecords()) {

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

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

28
msg-center-api/src/main/java/cn/axzo/msg/center/api/MsgDynamicServiceApi.java
View File

@ -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<Void> saveDynamicMsg(@RequestBody @Valid PMsgDynamicReq msg);
}

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

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

31
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MsgDynamicServiceApiFallBack.java
View File

@ -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<Void> saveDynamicMsg(@Valid PMsgDynamicReq msg) {
log.info("保存动态消息超时 msg = {}", msg);
return Results.fail("保存动态消息超时");
}
}

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

@ -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<T> {
/**
* 总条数
*/
private Long totalCount;
/**
* 数据
*/
private List<T> data;
public PageResult() {
}
public PageResult(List<T> data, Long totalCount) {
this.data = data;
this.totalCount = totalCount;
}
}

22
msg-center-common/src/main/java/cn/axzo/msg/center/common/page/IPageResult.java
View File

@ -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<T> {
/**
* 通过数据总数和数据创建
* @param totalCount
* @param data
* @param <T>
* @return
*/
static <T> PageResult<T> by(List<T> data, long totalCount) {
return new PageResult<T>(data, totalCount);
}
}

42
msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageRequest.java
View File

@ -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 <T> IPage<T> 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);
}
}

32
msg-center-common/src/main/java/cn/axzo/msg/center/common/page/PageResult.java
View File

@ -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<T> {
/**
* 总条数
*/
private Long totalCount;
/**
* 数据
*/
private List<T> data;
public PageResult() {
}
public PageResult(List<T> data, Long totalCount) {
this.data = data;
this.totalCount = totalCount;
}
}

44
msg-center-common/src/main/java/cn/axzo/msg/center/common/page/Paging.java
View File

@ -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());
}
}

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

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