Browse Source

调整

master
zouhantao 1 week ago
parent
commit
519e8489a0

+ 1
- 1
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/api/MessageSharedController.java View File



@ApiOperation(value = "分页查询") @ApiOperation(value = "分页查询")
@PostMapping(value = "/page") @PostMapping(value = "/page")
public ApiResponse<Pagination> page(@Validated @RequestBody MsgwSendDetailsPageRequest request) throws ManagerException {
public ApiResponse<Pagination> page(@Validated @RequestBody SendDetailsRequestDto request) throws ManagerException {
Pagination page = messageWaitSendManager.page(request); Pagination page = messageWaitSendManager.page(request);
return ApiResponse.of(page); return ApiResponse.of(page);
} }

+ 19
- 0
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/SendDetailsRequestDto.java View File

package cn.com.taiji.msgw.dto;


import cn.com.taiji.common.entity.BaseEntity;
import cn.com.taiji.core.entity.dict.msgw.MessageResult;
import cn.com.taiji.core.entity.dict.msgw.MessageType;
import lombok.Getter;
import lombok.Setter;

@Getter
@Setter
public class SendDetailsRequestDto extends BaseEntity {

private MessageType messageType;
private MessageResult sendResult;
private int pageNo;
private int pageSize;

}

+ 2
- 0
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/UserListRequestDto.java View File

private String mobile;// 手机号 private String mobile;// 手机号
private String userName;// 用户姓名/企业名称 private String userName;// 用户姓名/企业名称
private MessageType type;// 消息类型 private MessageType type;// 消息类型
private int pageNo;
private int pageSize;


} }

+ 1
- 1
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManager.java View File

MessageSendDetailsResponseDto view(MessageSendDetailsRequestDto request); MessageSendDetailsResponseDto view(MessageSendDetailsRequestDto request);


/**分页查询*/ /**分页查询*/
Pagination page(MsgwSendDetailsPageRequest request) throws ManagerException;
Pagination page(SendDetailsRequestDto request) throws ManagerException;


/**用户分页*/ /**用户分页*/
Pagination userPage(UserListRequestDto request); Pagination userPage(UserListRequestDto request);

+ 5
- 2
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java View File

import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;


import cn.com.taiji.common.pub.BeanTools;
import cn.com.taiji.msgw.model.HomeStatisticsModel; import cn.com.taiji.msgw.model.HomeStatisticsModel;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
} }


@Override @Override
public Pagination page(MsgwSendDetailsPageRequest request) throws ManagerException {
public Pagination page(SendDetailsRequestDto request) throws ManagerException {
if (request.getMessageType().equals(null)){ if (request.getMessageType().equals(null)){
throw new ManagerException("请输入类型!"); throw new ManagerException("请输入类型!");
} }
return sendDetailsRepo.page(request);
MsgwSendDetailsPageRequest pageRequest = new MsgwSendDetailsPageRequest();
BeanTools.copyProperties(request, pageRequest);
return sendDetailsRepo.page(pageRequest);
} }


@Override @Override

Loading…
Cancel
Save