Merge pull request boylegu#15 from boylegu/issue/13/filter_in_spring

Issue/13/filter in spring

Author: boylegu

.gitignore

@@ -23,5 +23,8 @@ dist/
 nbdist/
 .nb-gradle/
 
-# images
-*.lpop
+## images
+*.lpop
+
+## NodeJS
+node_modules

frontend/src/components/DbFooter.vue

@@ -32,7 +32,7 @@
     export default {
         data(){
             return {
-                message: 'SanicCRUD-Vue.js v0.1',
+                message: 'SpringBoot-Vue.js v0.1',
             }
         },
         mounted (){

frontend/src/components/DbHeader.vue

@@ -12,7 +12,7 @@
         name: 'db-header',
         data () {
             return {
-                msg: 'SanicCRUD-vue'
+                msg: 'SpringBoot-vue'
             }
         }
     }

frontend/src/components/DbTable.vue

@@ -106,10 +106,10 @@
                         email: this.email
                     }
                 }).then((response) => {
-                    this.tableData = response.data.results;
-                    this.total = response.data.total;
-                    this.pageSize = response.data.count;
-                    console.log(response.data);
+                    this.tableData = response.data.data.results;
+                    this.total = response.data.data.total;
+                    this.pageSize = response.data.data.count;
+                    console.log(response.data.data);
                 }).catch(function (response) {
                     console.log(response)
                 });

src/main/java/com/boylegu/springboot_vue/App.java

@@ -1,9 +1,10 @@
 package com.boylegu.springboot_vue;
-
+import org.springframework.context.annotation.Configuration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
+@Configuration
 @SpringBootApplication
 public class App {
 

src/main/java/com/boylegu/springboot_vue/controller/MainController.java

@@ -1,18 +1,23 @@
 package com.boylegu.springboot_vue.controller;
 
+import com.boylegu.springboot_vue.entities.Persons;
+import org.springframework.beans.factory.annotation.Autowired;
 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 org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.PageRequest;
 
 import com.boylegu.springboot_vue.controller.pagination.PaginationMultiTypeValuesHelper;
 import com.boylegu.springboot_vue.dao.PersonsRepository;
+import com.boylegu.springboot_vue.controller.pagination.PaginationFormatting;
 
 import java.util.*;
 
@@ -21,60 +26,94 @@
 @RequestMapping("/api/persons")
 public class MainController {
 
-    /**
-     * @api {GET} /api/persons/sex Get all sexList
-     * @apiName GetAllSexList
-     * @apiGroup Info Manage
-     * @apiVersion 1.0.0
-     * @apiExample {httpie} Example usage:
-     * <p>
-     * http /api/persons/sex
-     * @apiSuccess {String} label
-     * @apiSuccess {String} value
-     */
-
     @Autowired
     private PersonsRepository personsRepository;
 
+    @Value(("${com.boylegu.paginatio.max-per-page}"))
+    Integer maxPerPage;
+
     @RequestMapping(value = "/sex", method = RequestMethod.GET)
     public ResponseEntity<?> getSexAll() {
 
+        /*
+         * @api {GET} /api/persons/sex Get all sexList
+         * @apiName GetAllSexList
+         * @apiGroup Info Manage
+         * @apiVersion 1.0.0
+         * @apiExample {httpie} Example usage:
+         * <p>
+         * http /api/persons/sex
+         * @apiSuccess {String} label
+         * @apiSuccess {String} value
+         */
+
         ArrayList<Map<String, String>> results = new ArrayList<>();
 
         for (Object value : personsRepository.findSex()) {
+
             Map<String, String> sex = new HashMap<>();
 
             sex.put("label", value.toString());
+
             sex.put("value", value.toString());
+
             results.add(sex);
         }
+
         ResponseEntity<ArrayList<Map<String, String>>> responseEntity = new ResponseEntity<>(results,
                 HttpStatus.OK);
+
         return responseEntity;
     }
 
-    @RequestMapping(value = "/", method = RequestMethod.GET)
-    public Map<String, PaginationMultiTypeValuesHelper> getPersonsAll() {
+    @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public Map<String, PaginationMultiTypeValuesHelper> getPersonsAll(
+            @RequestParam(value = "page", required = false) Integer pages,
+            @RequestParam("sex") String sex,
+            @RequestParam("email") String email
+    ) {
+
+        /*
+         *   @api {GET} /api/persons   Get all or a part of person info
+         *   @apiName GetAllInfoList
+         *   @apiGroup Info Manage
+         *   @apiVersion 1.0.0
+         *
+         *   @apiExample {httpie} Example usage: (support combinatorial search)
+         *
+         *       All person：
+         *       http /api/persons
+         *
+         *       You can according to 'sex | email' or 'sex & email'
+         *       http /api/persons?sex=xxx&email=xx
+         *       http /api/persons?sex=xxx
+         *       http /api/persons?email=xx
+         *
+         *       @apiParam {String} sex
+         *       @apiParam {String} email
+         *
+         *   @apiSuccess {String} create_datetime
+         *   @apiSuccess {String} email
+         *   @apiSuccess {String} id
+         *   @apiSuccess {String} phone
+         *   @apiSuccess {String} sex
+         *   @apiSuccess {String} username
+         *   @apiSuccess {String} zone
+         */
+
+        if (pages == null) {
+
+            pages = 1;
 
-        int page = 1, size = 5;
-        Sort sort = new Sort(Direction.ASC, "id");
-        Pageable pageable = new PageRequest(page, size, sort);
+        }
 
-        PaginationMultiTypeValuesHelper multiValue = new PaginationMultiTypeValuesHelper();
-        Map<String, PaginationMultiTypeValuesHelper> results = new HashMap<>();
+        Sort sort = new Sort(Direction.ASC, "id");
 
-        Integer count = personsRepository.findAll(pageable).getSize();
-        Integer page_number = personsRepository.findAll(pageable).getNumber();
+        Pageable pageable = new PageRequest(pages - 1, maxPerPage, sort);
 
-        Object content = personsRepository.findAll(pageable).getContent();
-        Long total = personsRepository.count();
-        multiValue.setCount(count);
-        multiValue.setPage(page_number);
-        multiValue.setResults(content);
-        multiValue.setTotal(total);
+        PaginationFormatting paginInstance = new PaginationFormatting();
 
-        results.put("data", multiValue);
-        return results;
+        return paginInstance.filterQuery(sex, email, pageable);
     }
 
 }