物料查询解决total问题 以及其他页面是推送人名称问题

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -2,6 +2,7 @@ package com.mhd.system.api;
 
 import com.mhd.common.core.constant.ServiceNameConstants;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.domain.*;
 import com.mhd.system.api.factory.RemoteWmsFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
@@ -98,7 +99,7 @@ public interface WmsServiceFeign {
 
     @ApiOperation("oms查询物料列表")
     @GetMapping("/materialBaseInfoApi/queryList")
-    public AjaxResult getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);
+    public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);
 
     @ApiOperation("oms物料列表推送-更新推送信息")
     @PostMapping("/materialBaseInfoApi/updatePushStatus")

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInfoDTO.java

@@ -48,5 +48,10 @@ public class MaterialInfoDTO {
     @ApiModelProperty("推送时间止")
     private String pushTimeEnd;
 
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = 10;
 
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java

@@ -2,6 +2,7 @@ package com.mhd.system.api.factory;
 
 import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
 import com.mhd.system.api.domain.*;
@@ -11,6 +12,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -71,8 +73,12 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             }
 
             @Override
-            public AjaxResult getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO) {
-                return AjaxResult.error(cause.getMessage());
+            public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setData(new ArrayList<>());
+                tableDataInfo.setTotal(0);
+                tableDataInfo.setCode(500);
+                return tableDataInfo;
             }
 
             @Override