调整

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/api/MessageSharedController.java

@@ -28,7 +28,7 @@ public class MessageSharedController {
 
     @ApiOperation(value = "分页查询")
     @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);
         return ApiResponse.of(page);
     }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/SendDetailsRequestDto.java

@@ -0,0 +1,19 @@
+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;
+
+}

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/UserListRequestDto.java

@@ -13,5 +13,7 @@ public class UserListRequestDto extends BaseEntity {
     private String mobile;// 手机号
     private String userName;// 用户姓名/企业名称
     private MessageType type;// 消息类型
+    private int pageNo;
+    private int pageSize;
 
 }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManager.java

@@ -27,7 +27,7 @@ public interface MessageWaitSendManager {
     MessageSendDetailsResponseDto view(MessageSendDetailsRequestDto request);
 
     /**分页查询*/
-    Pagination page(MsgwSendDetailsPageRequest request) throws ManagerException;
+    Pagination page(SendDetailsRequestDto request) throws ManagerException;
 
     /**用户分页*/
     Pagination userPage(UserListRequestDto request);

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.msgw.model.HomeStatisticsModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -203,11 +204,13 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
     }
 
     @Override
-    public Pagination page(MsgwSendDetailsPageRequest request) throws ManagerException {
+    public Pagination page(SendDetailsRequestDto request) throws ManagerException {
         if (request.getMessageType().equals(null)){
             throw new ManagerException("请输入类型！");
         }
-        return sendDetailsRepo.page(request);
+        MsgwSendDetailsPageRequest pageRequest = new MsgwSendDetailsPageRequest();
+        BeanTools.copyProperties(request, pageRequest);
+        return sendDetailsRepo.page(pageRequest);
     }
 
     @Override