Commit e3d7a798 authored by caotao's avatar caotao

跑马灯分页第三页无数据问题处理。

parent f1d2c9a6
...@@ -15,8 +15,8 @@ import java.util.List; ...@@ -15,8 +15,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class}) //@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class})
//@FeignClient(name = "mcb",url = "http://10.20.1.160:10005", path = "warning", configuration = {FeignConfiguration.class}) @FeignClient(name = "mcb",url = "http://10.20.1.160:10005", path = "warning", configuration = {FeignConfiguration.class})
public interface McbWarningFeign { public interface McbWarningFeign {
/** /**
...@@ -91,7 +91,9 @@ public interface McbWarningFeign { ...@@ -91,7 +91,9 @@ public interface McbWarningFeign {
FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus, FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus,
@RequestParam("codes") List<String> codes, @RequestParam("codes") List<String> codes,
@RequestParam(value = "operator", defaultValue = "=") String operator, @RequestParam(value = "operator", defaultValue = "=") String operator,
@RequestParam Page page); @RequestParam("current") Long current,
@RequestParam("size") Long size
);
......
...@@ -287,7 +287,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -287,7 +287,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
{ {
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
FeignClientResult<Object> result = mcbWarningFeign.getLampListPage(questionRectificationStatus,projectOrgCodes,"like",page); FeignClientResult<Object> result = mcbWarningFeign.getLampListPage(questionRectificationStatus,projectOrgCodes,"like",page.getCurrent(),page.getSize());
return result.getResult(); return result.getResult();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment