Merge branch 'PSM-5' into minhang

徐烜
2 parents 0bbedc51 0f395614
Showing 2 changed files with 8 additions and 39 deletions
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
@@ -3,6 +3,7 @@ package com.bsth.controller;
 import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
 import com.bsth.service.schedule.utils.DataImportExportService;
+import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -58,8 +60,12 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
 			d = Direction.ASC;
 		else
 			d = Direction.DESC;
-		
-		return baseService.list(map, new PageRequest(page, size, new Sort(d, order)));
+
+        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
+        // 多个字段格式：{col1},{col2},{col3},....,{coln}
+        // 每个字段的排序方向都是一致，这个以后再看要不要改
+        List<String> list = Splitter.on(",").trimResults().splitToList(order);
+		return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
 	}
 	/**
@@ -2,18 +2,9 @@ package com.bsth.controller.schedule;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.google.common.base.Splitter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
@@ -21,32 +12,4 @@ import java.util.Map;
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<SchedulePlanInfo> list(@RequestParam Map<String, Object> map,
-                        @RequestParam(defaultValue = "0") int page,
-                        @RequestParam(defaultValue = "10") int size,
-                        @RequestParam(defaultValue = "id") String order,
-                        @RequestParam(defaultValue = "DESC") String direction){
-
-        Sort.Direction d;
-
-        if(null != direction && direction.equals("ASC"))
-            d = Sort.Direction.ASC;
-        else
-            d = Sort.Direction.DESC;
-
-        // order由 col1,col2,col3 这样传入
-        List<String> list = Splitter.on(",").trimResults().splitToList(order);
-        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
-    }
-
 }