添加分页功能
parent
b1dd0eb553
commit
c7abd55db7
2
pom.xml
2
pom.xml
|
@ -67,7 +67,7 @@
|
|||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>4.0.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -3,15 +3,16 @@ package com.zcloud.controller.dw;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zcloud.controller.base.BaseController;
|
||||
import com.zcloud.entity.PageData;
|
||||
import com.zcloud.entity.Page;
|
||||
import com.zcloud.service.dw.DwService;
|
||||
import com.zcloud.service.dw.dto.*;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "/dw")
|
||||
@RestController
|
||||
@RequestMapping(value = "/dingWei")
|
||||
public class DwController extends BaseController {
|
||||
|
||||
@Resource
|
||||
|
@ -28,9 +29,11 @@ public class DwController extends BaseController {
|
|||
public Object getMapList(Page page) throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
MapGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), MapGet.class);
|
||||
mapGet.getPage().setPage(page.getPage());
|
||||
mapGet.getPage().setCurrent(page.getCurrent());
|
||||
mapGet.getPage().setSize(page.getSize());
|
||||
if (mapGet.getPage() == null){
|
||||
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
|
||||
}
|
||||
mapGet.getPage().setCurrent(String.valueOf(page.getCurrentPage()));
|
||||
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
|
||||
return dwService.getMapList(mapGet);
|
||||
}
|
||||
|
||||
|
@ -45,9 +48,11 @@ public class DwController extends BaseController {
|
|||
public Object getAlarmList(Page page) throws Exception {
|
||||
PageData pd = this.getPageData();
|
||||
AlarmGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmGet.class);
|
||||
mapGet.getPage().setPage(page.getPage());
|
||||
mapGet.getPage().setCurrent(page.getCurrent());
|
||||
mapGet.getPage().setSize(page.getSize());
|
||||
if (mapGet.getPage() == null){
|
||||
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
|
||||
}
|
||||
mapGet.getPage().setCurrent(String.valueOf(page.getCurrentPage()));
|
||||
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
|
||||
return dwService.getAlarmList(mapGet);
|
||||
}
|
||||
|
||||
|
@ -62,4 +67,5 @@ public class DwController extends BaseController {
|
|||
public Object getDictionary() throws Exception {
|
||||
return dwService.getDictionary();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -41,4 +41,10 @@ public class HttpUtil<K,V> {
|
|||
String result = restTemplate.postForEntity(url, info, String.class).getBody();
|
||||
return JSONObject.parseObject(result, Map.class);
|
||||
}
|
||||
|
||||
public static Object post(String url) {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
String result = restTemplate.getForObject(url, String.class);
|
||||
return JSONObject.parseObject(result, Map.class);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue