From 0d831f835708bab1351fa26c7e8aea0a9bf8911e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 01 四月 2020 11:38:30 +0800
Subject: [PATCH] add usergroup 一半
---
src/main/java/com/highdatas/mdm/controller/ActivitiController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
index 511b300..10f7935 100644
--- a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
+++ b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
@@ -23,7 +23,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -73,11 +72,13 @@
@Autowired
IMaintainFieldService maintainFieldService;
+ @Autowired
+ ISysFieldService fieldService;
-
- @RequestMapping(value = "/list", method = RequestMethod.GET)
- public Result<List<Map<String, Object>>> list(HttpServletRequest request) throws FileNotFoundException {
+ @RequestMapping(value = "/list/{pageNo}", method = RequestMethod.GET)
+ public Result<List<Map<String, Object>>> list(@PathVariable Integer pageNo, HttpServletRequest request) {
String filterSegment = request.getParameter("filterSegment");
+ String pageSize = request.getParameter("pageSize");
if (StringUtils.isEmpty(filterSegment)) {
filterSegment = Constant.WHERE_DEFAULT;
}
@@ -87,7 +88,13 @@
String url = "act/img/" + newModelId;
one.put("imgurl",url);
}
- return Result.success(list);
+ Integer size;
+ if(StringUtils.isEmpty(pageSize)){
+ size = 15;
+ }else {
+ size = Integer.valueOf(pageSize);
+ }
+ return fieldService.getPagedDataByList(list, pageNo, size);
}
@RequestMapping(value = "/img/{modelId}", method = RequestMethod.GET)
public void image(@PathVariable String modelId, HttpServletResponse response) {
--
Gitblit v1.8.0