page

travel/admin/pom.xml

@@ -29,6 +29,16 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.lc</groupId>
+            <artifactId>service</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lc</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

travel/admin/src/main/java/com/lc/admin/AdminApplication.java

@@ -4,9 +4,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @MapperScan("com.cl.mbg.mapper")
+@ComponentScan({"com.lc.service", "com.lc.admin.controller"})
 public class AdminApplication {
 
     public static void main(String[] args) {

travel/admin/src/main/java/com/lc/admin/controller/TravelItemController.java

@@ -2,14 +2,14 @@ package com.lc.admin.controller;
 
 import com.cl.mbg.mapper.TTravelitemMapper;
 import com.cl.mbg.model.TTravelitem;
+import com.lc.common.pojo.TravelParams;
 import com.lc.common.utils.Result;
+import com.lc.service.TravelItemService;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Controller
 @RequestMapping("/travelitem")
@@ -18,13 +18,20 @@ public class TravelItemController {
     @Resource
     TTravelitemMapper travelitemMapper;
 
+    @Resource
+    TravelItemService travelItemService;
+
     @PutMapping("/add.do")
     @ResponseBody
     public Result addTravelItem(@RequestBody TTravelitem tTravelitem){
-
         travelitemMapper.insert( tTravelitem );
-
         return Result.ok("恭喜您自由行添加成功！！！");
     }
 
+    @PostMapping("/findPage.do")
+    @ResponseBody
+    public Result findPage(@RequestBody TravelParams travelParams){
+        return Result.data( travelItemService.findPage(travelParams) );
+    }
+
 }

travel/admin/src/main/resources/application.properties

@@ -4,4 +4,6 @@ spring.mvc.view.prefix=/templates/
 #?????????
 spring.mvc.view.suffix=.html
 #???????????
-spring.mvc.static-path-pattern=/static/**
+spring.mvc.static-path-pattern=/static/**
+
+spring.main.allow-circular-references=true

travel/admin/src/main/resources/templates/travelitem.html

@@ -298,13 +298,13 @@
 									}//查询条件
 								}
 								//发送请求
-								axios.post(`/travelitem/findPage.do`,params)
+								axios.post(`/travelitem/findPage.do`, params)
 									.then(res =>{
 										//赋值
 										console.log(res)
 										
-										this.dataList = res.data.rows;
-										this.pagination.total = res.data.total;
+										this.dataList = res.data.data.rows;
+										this.pagination.total = res.data.data.total;
 									})
 							},
 							// 重置表单

travel/common/src/main/java/com/lc/common/CommonApplication.java

@@ -1,13 +0,0 @@
-package com.lc.common;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class CommonApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(CommonApplication.class, args);
-    }
-
-}

travel/common/src/main/java/com/lc/common/pojo/QueryString.java

@@ -0,0 +1,8 @@
+package com.lc.common.pojo;
+
+import lombok.Data;
+
+@Data
+public class QueryString {
+    String name;
+}

travel/common/src/main/java/com/lc/common/pojo/TravelParams.java

@@ -0,0 +1,10 @@
+package com.lc.common.pojo;
+
+import lombok.Data;
+
+@Data
+public class TravelParams {
+    int currentPage;
+    int pageSize;
+    QueryString queryString;
+}

travel/service/pom.xml

@@ -18,8 +18,21 @@
 
 
     <dependencies>
-
-
+        <dependency>
+            <groupId>com.cl.mbg</groupId>
+            <artifactId>mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lc</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.3.1</version>
+        </dependency>
     </dependencies>
 
     <build>

travel/service/src/main/java/com/lc/service/ServiceApplication.java

@@ -1,13 +0,0 @@
-package com.lc.service;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ServiceApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ServiceApplication.class, args);
-    }
-
-}

travel/service/src/main/java/com/lc/service/TravelItemService.java

@@ -0,0 +1,13 @@
+package com.lc.service;
+
+import com.cl.mbg.model.TTravelitem;
+import com.lc.common.pojo.TravelParams;
+
+import java.util.HashMap;
+import java.util.List;
+
+public interface TravelItemService {
+
+    HashMap<String, Object> findPage(TravelParams travelParams);
+
+}

travel/service/src/main/java/com/lc/service/impl/TravelItemServiceImpl.java

@@ -0,0 +1,45 @@
+package com.lc.service.impl;
+
+import com.cl.mbg.mapper.TTravelitemMapper;
+import com.cl.mbg.model.TTravelitem;
+import com.cl.mbg.model.TTravelitemExample;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.lc.common.pojo.QueryString;
+import com.lc.common.pojo.TravelParams;
+import com.lc.service.TravelItemService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class TravelItemServiceImpl implements TravelItemService {
+
+    @Resource
+    TTravelitemMapper travelitemMapper;
+
+    @Override
+    public HashMap<String, Object> findPage(TravelParams travelParams) {
+        //构造 Mapper 查询和分页
+        int currentPage =  travelParams.getCurrentPage();
+        int pageSize = travelParams.getPageSize();
+        QueryString queryString = travelParams.getQueryString();
+        String name = queryString.getName();
+        PageHelper.startPage(  currentPage , pageSize == 0 ? 10 : pageSize );
+        TTravelitemExample tTravelitemExample = new TTravelitemExample();
+        if ( StringUtils.hasText(name) ) {
+            TTravelitemExample.Criteria criteria = tTravelitemExample.createCriteria();
+            criteria.andNameLike( "%" + name + "%" );
+        }
+        List<TTravelitem> tTravelitems = travelitemMapper.selectByExample(tTravelitemExample);
+
+        long count = travelitemMapper.countByExample(tTravelitemExample);
+        HashMap<String, Object> ret = new HashMap<>();
+        ret.put("rows", tTravelitems);
+        ret.put("total", count);
+        return ret;
+    }
+}

travel/web/pom.xml

@@ -11,8 +11,8 @@
 
     <groupId>com.lc</groupId>
     <artifactId>web</artifactId>
-
     <version>0.0.1-SNAPSHOT</version>
+
     <name>web</name>
     <description>web</description>
 
@@ -24,6 +24,13 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.lc</groupId>
+            <artifactId>service</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
     <build>