1、接口实现修改(添加分页等)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Api(tags="角色信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Data
@@ -77,8 +77,8 @@ public class TravelRoleInfo implements Serializable {
     @ApiModelProperty(value = "个人简介")
     private java.lang.String brief;
 	/**所属用户*/
-	@Excel(name = "所属用户", width = 15, dictTable = "travel_user", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "travel_user", dicText = "nick_name", dicCode = "id")
+	@Excel(name = "所属用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "所属用户")
     private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 public interface TravelRoleInfoMapper extends BaseMapper<TravelRoleInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 public interface ITravelRoleInfoService extends IService<TravelRoleInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/TravelRoleInfoList.vue

@@ -222,7 +222,7 @@
         fieldList.push({type:'string',value:'recommend',text:'推荐度',dictCode:''})
         fieldList.push({type:'string',value:'skill',text:'专业擅长',dictCode:''})
         fieldList.push({type:'string',value:'brief',text:'个人简介',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'所属用户',dictCode:"travel_user,nick_name,id"})
+        fieldList.push({type:'string',value:'userId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/modules/TravelRoleInfoForm.vue

@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="所属用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-dict-select-tag type="list" v-model="model.userId" dictCode="travel_user,nick_name,id" placeholder="请选择所属用户" />
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择所属用户" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue3/TravelRoleInfo.data.ts

@@ -126,7 +126,7 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"travel_user,nick_name,id"
+        dictCode:"han_hai_member,nick_name,id"
      },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/controller/TravelSpotController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Api(tags="地点表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/entity/TravelSpot.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Data
@@ -43,10 +43,14 @@ public class TravelSpot implements Serializable {
 	@Excel(name = "地点图片", width = 15)
     @ApiModelProperty(value = "地点图片")
     private java.lang.String spotImage;
-	/**地点坐标(经纬度)*/
-	@Excel(name = "地点坐标(经纬度)", width = 15)
-    @ApiModelProperty(value = "地点坐标(经纬度)")
-    private java.lang.String spotPosition;
+	/**地点坐标_经度*/
+	@Excel(name = "地点坐标_经度", width = 15)
+    @ApiModelProperty(value = "地点坐标_经度")
+    private java.math.BigDecimal spotLongitude;
+	/**地点坐标_纬度*/
+	@Excel(name = "地点坐标_纬度", width = 15)
+    @ApiModelProperty(value = "地点坐标_纬度")
+    private java.math.BigDecimal spotLatitude;
 	/**地点所属景区*/
 	@Excel(name = "地点所属景区", width = 15, dictTable = "travel_area", dicText = "area_name", dicCode = "id")
 	@Dict(dictTable = "travel_area", dicText = "area_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/mapper/TravelSpotMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 public interface TravelSpotMapper extends BaseMapper<TravelSpot> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/service/ITravelSpotService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 public interface ITravelSpotService extends IService<TravelSpot> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/service/impl/TravelSpotServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-15
+ * @Date:   2024-09-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/TravelSpotList.vue

@@ -134,9 +134,14 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'地点坐标(经纬度)',
+            title:'地点坐标_经度',
             align:"center",
-            dataIndex: 'spotPosition'
+            dataIndex: 'spotLongitude'
+          },
+          {
+            title:'地点坐标_纬度',
+            align:"center",
+            dataIndex: 'spotLatitude'
           },
           {
             title:'地点所属景区',
@@ -184,7 +189,8 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'spotName',text:'地点名字',dictCode:''})
         fieldList.push({type:'string',value:'spotImage',text:'地点图片',dictCode:''})
-        fieldList.push({type:'string',value:'spotPosition',text:'地点坐标(经纬度)',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'spotLongitude',text:'地点坐标_经度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'spotLatitude',text:'地点坐标_纬度',dictCode:''})
         fieldList.push({type:'string',value:'areaId',text:'地点所属景区',dictCode:"travel_area,area_name,id"})
         fieldList.push({type:'string',value:'categoryId',text:'地点类型',dictCode:"travel_category,category_name,id"})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue/modules/TravelSpotForm.vue

@@ -14,8 +14,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点坐标(经纬度)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotPosition">
-              <a-input v-model="model.spotPosition" placeholder="请输入地点坐标(经纬度)"  ></a-input>
+            <a-form-model-item label="地点坐标_经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotLongitude">
+              <a-input-number v-model="model.spotLongitude" placeholder="请输入地点坐标_经度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地点坐标_纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotLatitude">
+              <a-input-number v-model="model.spotLatitude" placeholder="请输入地点坐标_纬度" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelSpot/vue3/TravelSpot.data.ts

@@ -16,9 +16,14 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '地点坐标(经纬度)',
+    title: '地点坐标_经度',
     align:"center",
-    dataIndex: 'spotPosition'
+    dataIndex: 'spotLongitude'
+   },
+   {
+    title: '地点坐标_纬度',
+    align:"center",
+    dataIndex: 'spotLatitude'
    },
    {
     title: '地点所属景区',
@@ -49,9 +54,14 @@ export const formSchema: FormSchema[] = [
       },
   },
   {
-    label: '地点坐标(经纬度)',
-    field: 'spotPosition',
-    component: 'Input',
+    label: '地点坐标_经度',
+    field: 'spotLongitude',
+    component: 'InputNumber',
+  },
+  {
+    label: '地点坐标_纬度',
+    field: 'spotLatitude',
+    component: 'InputNumber',
   },
   {
     label: '地点所属景区',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,22 +36,22 @@ public class IndexApiController {
     //获取视频列表
     @ApiOperation(value="小程序-获取视频列表", notes="小程序-获取视频列表")
     @RequestMapping(value = "/queryVideoList", method = {RequestMethod.GET})
-    public Result<?> queryVideoList(){
-        return indexApiService.queryVideoList();
+    public Result<?> queryVideoList(PageBean pageBean){
+        return indexApiService.queryVideoList(pageBean);
     }
 
-    //获取文章列表-申遗历程/非遗体验
-    @ApiOperation(value="小程序-获取文章列表", notes="小程序-获取文章列表")
-    @RequestMapping(value = "/queryArticleList", method = {RequestMethod.GET})
-    public Result<?> queryArticleList(){
-        return indexApiService.queryArticleList();
-    }
+//    //获取文章列表-申遗历程/非遗体验
+//    @ApiOperation(value="小程序-获取文章列表", notes="小程序-获取文章列表")
+//    @RequestMapping(value = "/queryArticleList", method = {RequestMethod.GET})
+//    public Result<?> queryArticleList(PageBean pageBean){
+//        return indexApiService.queryArticleList(pageBean);
+//    }
 
     //根据分类获取文章列表
     @ApiOperation(value="小程序-根据分类获取文章列表", notes="1-申遗历程 2-申遗缘由 3-遗产价值")
     @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET})
-    public Result<?> queryArticleListByType(String articleType){
-        return indexApiService.queryArticleListByType(articleType);
+    public Result<?> queryArticleListByType(String articleType, PageBean pageBean){
+        return indexApiService.queryArticleListByType(articleType, pageBean);
     }
 
     //根据id获取文章详情
@@ -63,22 +64,29 @@ public class IndexApiController {
     //获取景区列表
     @ApiOperation(value="小程序-获取景区列表", notes="小程序-获取景区列表")
     @RequestMapping(value = "/queryAreaList", method = {RequestMethod.GET})
-    public Result<?> queryAreaList(){
-        return indexApiService.queryAreaList();
+    public Result<?> queryAreaList(PageBean pageBean){
+        return indexApiService.queryAreaList(pageBean);
+    }
+
+    //获取景区列表
+    @ApiOperation(value="小程序-根据id获取景区详情", notes="小程序-根据id获取景区详情")
+    @RequestMapping(value = "/queryAreaListById", method = {RequestMethod.GET})
+    public Result<?> queryAreaListById(String areaId){
+        return indexApiService.queryAreaListById(areaId);
     }
 
     //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
     @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表", notes="areaId: 1-瓷都镇区 2-湖田片区 3-高岭片区 4-瑶里片区 5-蛟潭片区; categoryTyep: 1-景点 2-美食店铺 3-民宿 4-厕所")
     @RequestMapping(value = "/querySpotList", method = {RequestMethod.GET})
-    public Result<?> querySpotList(String areaId, String categoryId){
-        return indexApiService.querySpotList(areaId, categoryId);
+    public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean){
+        return indexApiService.querySpotList(areaId, categoryId, pageBean);
     }
 
     //根据角色类型获取角色信息列表-讲解员/达人/摄影师
     @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="roleId: 1-讲解员，2-达人，3-摄影师")
     @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
-    public Result<?> queryRoleInfoList(String roleId, String level, String spot){
-        return indexApiService.queryRoleInfoList(roleId, level, spot);
+    public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean){
+        return indexApiService.queryRoleInfoList(roleId, level, spot, pageBean);
     }
 
     //根据角色id获取角色信息详情
@@ -91,8 +99,8 @@ public class IndexApiController {
     //根据角色id获取视频列表
     @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表")
     @RequestMapping(value = "/queryVedioBySpot", method = {RequestMethod.GET})
-    public Result<?> queryVedioById(String roleInfoId){
-        return indexApiService.queryVedioById(roleInfoId);
+    public Result<?> queryVedioById(String roleInfoId, PageBean pageBean){
+        return indexApiService.queryVedioById(roleInfoId, pageBean);
     }
 
     //遗产路径-待补充

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PageBean {
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public PageBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 
 public interface IndexApiService {
     //获取小程序任一文章或服务
@@ -9,31 +10,34 @@ public interface IndexApiService {
     public Result<?> queryBannerList(String bannerCategoryId);
 
     //获取视频列表
-    public Result<?> queryVideoList();
+    public Result<?> queryVideoList(PageBean pageBean);
 
     //获取文章列表-申遗历程/非遗体验
-    public Result<?> queryArticleList();
+    public Result<?> queryArticleList(PageBean pageBean);
 
     //根据分类获取文章列表
-    public Result<?> queryArticleListByType(String articleType);
+    public Result<?> queryArticleListByType(String articleType, PageBean pageBean);
 
     //根据id获取文章详情
     public Result<?> queryArticleById(String articleId);
 
     //获取景区列表
-    public Result<?> queryAreaList();
+    public Result<?> queryAreaList(PageBean pageBean);
+
+    //根据id获取景区详情
+    public Result<?> queryAreaListById(String areaId);
 
     //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
-    public Result<?> querySpotList(String areaId, String categoryId);
+    public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean);
 
     //根据角色类型获取角色信息列表-讲解员/达人/摄影师
-    public Result<?> queryRoleInfoList(String roleType, String level, String spot);
+    public Result<?> queryRoleInfoList(String roleType, String level, String spot, PageBean pageBean);
 
     //根据角色id获取角色信息详情
     public Result<?> queryRoleInfoById(String roleInfoId);
 
     //根据角色id获取视频列表
-    public Result<?> queryVedioById(String roleInfoId);
+    public Result<?> queryVedioById(String roleInfoId, PageBean pageBean);
 
     //遗产路径-待补充
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.travelArea.entity.TravelArea;
@@ -86,49 +88,65 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("轮播图列表", list);
     }
 
-    //获取视频列表
+    //获取视频列表带分页
     @Override
-    public Result<?> queryVideoList() {
-        List<TravelVideo> list = travelVideoService
+    public Result<?> queryVideoList(PageBean pageBean) {
+        Page<TravelVideo> page = new Page<TravelVideo>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelVideo> pageList = travelVideoService
                 .lambdaQuery()
                 .orderByDesc(TravelVideo::getCreateTime)
-                .list();
+                .page(page);
 
-        return Result.OK("视频列表", list);
+        return Result.OK("视频列表", pageList);
     }
 
-    //获取文章列表
+    //获取文章列表带分页
     @Override
-    public Result<?> queryArticleList() {
-        List<TravelArticle> list = travelArticleService
+    public Result<?> queryArticleList(PageBean pageBean) {
+        Page<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelArticle> pageList = travelArticleService
                 .lambdaQuery()
                 .orderByDesc(TravelArticle::getCreateTime)
-                .list();
+                .page(page);
 
-        return Result.OK("文章列表", list);
+        return Result.OK("文章列表", pageList);
     }
 
-    //根据文章类型获取文章列表
+    //根据文章类型获取文章列表带分页
     @Override
-    public Result<?> queryArticleListByType(String articleType) {
+    public Result<?> queryArticleListByType(String articleType, PageBean pageBean) {
 
         //1-申遗历程 2-申遗缘由 3-遗产价值
-        switch (articleType){
-            case "1": articleType = "1836253741344075777";
-            break;
-            case "2": articleType = "1836253813855203330";
-            break;
-            case "3": articleType = "1836253884822827009";
-            break;
+        if(null != articleType){
+            switch (articleType){
+                case "1": articleType = "1836253741344075777";
+                    break;
+                case "2": articleType = "1836253813855203330";
+                    break;
+                case "3": articleType = "1836253884822827009";
+                    break;
+                default: articleType = null;
+            }
         }
 
-        List<TravelArticle> list = travelArticleService
-                .lambdaQuery()
-                .eq(TravelArticle::getCategoryId, articleType)
-                .orderByDesc(TravelArticle::getCreateTime)
-                .list();
+        Page<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelArticle> pageList =null;
+
+        if(null != articleType){
+
+            pageList = travelArticleService
+                    .lambdaQuery()
+                    .eq(TravelArticle::getCategoryId, articleType)
+                    .orderByDesc(TravelArticle::getCreateTime)
+                    .page(page);
+        }else {
+            pageList = travelArticleService
+                    .lambdaQuery()
+                    .orderByDesc(TravelArticle::getCreateTime)
+                    .page(page);
+        }
 
-        return Result.OK("文章列表", list);
+        return Result.OK("文章列表", pageList);
     }
 
     //根据文章id获取文章详情
@@ -139,102 +157,165 @@ public class IndexApiServiceImpl implements IndexApiService {
                 .eq(TravelArticle::getId, articleId)
                 .one();
 
-        return Result.OK("文章列表", one);
+        return Result.OK("文章详情", one);
+    }
+
+    //获取景区列表带分页
+    @Override
+    public Result<?> queryAreaList(PageBean pageBean) {
+
+        Page<TravelArea> page = new Page<TravelArea>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelArea> pageList = travelAreaService
+                .lambdaQuery()
+                .page(page);
+
+        return Result.OK("景区列表", pageList);
     }
 
-    //获取景区列表
+    //根据id获取景区详情
     @Override
-    public Result<?> queryAreaList() {
-        List<TravelArea> list = travelAreaService.list();
+    public Result<?> queryAreaListById(String areaId) {
+        TravelArea one = travelAreaService
+                .lambdaQuery()
+                .eq(TravelArea::getId, areaId)
+                .one();
 
-        return Result.OK("景区列表", list);
+        return Result.OK("景区详情", one);
     }
 
-    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
+    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿带分页
     @Override
-    public Result<?> querySpotList(String areaId, String categoryId) {
+    public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean) {
 
         //1-瓷都镇区 2-湖田片区 3-高岭片区 4-瑶里片区 5-蛟潭片区
-        switch (areaId){
-            case "1": areaId = "1835255148875296770";
-                break;
-            case "2": areaId = "1835296270515376130";
-                break;
-            case "3": areaId = "1835296379189792769";
-                break;
-            case "4": areaId = "1835296552271941634";
-                break;
-            case "5": areaId = "1835296680814776322";
-                break;
+        if(null != areaId){
+            switch (areaId){
+                case "1": areaId = "1835255148875296770";
+                    break;
+                case "2": areaId = "1835296270515376130";
+                    break;
+                case "3": areaId = "1835296379189792769";
+                    break;
+                case "4": areaId = "1835296552271941634";
+                    break;
+                case "5": areaId = "1835296680814776322";
+                    break;
+                default: areaId = null;
+            }
         }
 
         //1-景点 2-美食店铺 3-民宿 4-厕所
-        switch (categoryId){
-            case "1": categoryId = "1835297869300174849";
-                break;
-            case "2": categoryId = "1835298116864774146";
-                break;
-            case "3": categoryId = "1835298190902628353";
-                break;
-            case "4": categoryId = "1835297932831297538";
-                break;
+        if(null != categoryId){
+            switch (categoryId){
+                case "1": categoryId = "1835297869300174849";
+                    break;
+                case "2": categoryId = "1835298116864774146";
+                    break;
+                case "3": categoryId = "1835298190902628353";
+                    break;
+                case "4": categoryId = "1835297932831297538";
+                    break;
+                default: categoryId = null;
+            }
         }
 
-        List<TravelSpot> list = travelSpotService
-                .lambdaQuery()
-                .eq(TravelSpot::getAreaId, areaId)
-                .eq(TravelSpot::getCategoryId, categoryId)
-                .list();
+        Page<TravelSpot> page = new Page<TravelSpot>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelSpot> pageList = null;
+        if(null != areaId && null != categoryId){
+            pageList = travelSpotService
+                    .lambdaQuery()
+                    .eq(TravelSpot::getAreaId, areaId)
+                    .eq(TravelSpot::getCategoryId, categoryId)
+                    .page(page);
+        }else if(null != areaId){
+            pageList = travelSpotService
+                    .lambdaQuery()
+                    .eq(TravelSpot::getAreaId, areaId)
+                    .page(page);
+        }else if(null != categoryId){
+            pageList = travelSpotService
+                    .lambdaQuery()
+                    .eq(TravelSpot::getCategoryId, categoryId)
+                    .page(page);
+        }else {
+            pageList = travelSpotService
+                    .lambdaQuery()
+                    .page(page);
+        }
 
-        return Result.OK("景点列表", list);
+        return Result.OK("景点列表", pageList);
     }
 
     //根据角色类型获取角色信息列表
     @Override
-    public Result<?> queryRoleInfoList(String roleId, String level, String spot) {
+    public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean) {
 
         //roleId: 1-讲解员，2-达人，3-摄影师
-        switch (roleId){
-            case "1":
-                roleId = "1835298310465458178";
-                break;
-            case "2":
-                roleId = "1835298364374847490";
-                break;
-            case "3":
-                roleId = "1835298430967812098";
-                break;
+        if(null != roleId){
+            switch (roleId){
+                case "1":
+                    roleId = "1835298310465458178";
+                    break;
+                case "2":
+                    roleId = "1835298364374847490";
+                    break;
+                case "3":
+                    roleId = "1835298430967812098";
+                    break;
+                default: roleId = null;
+            }
         }
 
-        List<TravelRoleInfo> list = null;
-        if(null != level && null != spot){
-            list = travelRoleInfoService
+        Page<TravelRoleInfo> page = new Page<TravelRoleInfo>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelRoleInfo> pageList = null;
+
+        if(null != roleId &&null != level && null != spot){
+            pageList = travelRoleInfoService
                     .lambdaQuery()
                     .eq(TravelRoleInfo::getRoleId, roleId)
                     .eq(TravelRoleInfo::getRoleLevel, level)
                     .like(TravelRoleInfo::getSkill, spot)
-                    .list();
-        }else if(null != level){
-            list = travelRoleInfoService
+                    .page(page);
+        }else if(null != roleId && null != level){
+            pageList = travelRoleInfoService
                     .lambdaQuery()
                     .eq(TravelRoleInfo::getRoleId, roleId)
                     .eq(TravelRoleInfo::getRoleLevel, level)
-                    .list();
-        }else if(null != spot){
-            list = travelRoleInfoService
+                    .page(page);
+        }else if(null != roleId && null != spot){
+            pageList = travelRoleInfoService
                     .lambdaQuery()
                     .eq(TravelRoleInfo::getRoleId, roleId)
                     .like(TravelRoleInfo::getSkill, spot)
-                    .list();
-        }else {
-            list = travelRoleInfoService
+                    .page(page);
+        }else if(null != level && null != spot){
+            pageList = travelRoleInfoService
+                    .lambdaQuery()
+                    .eq(TravelRoleInfo::getRoleLevel, level)
+                    .like(TravelRoleInfo::getSkill, spot)
+                    .page(page);
+        }else if(null != roleId){
+            pageList = travelRoleInfoService
                     .lambdaQuery()
                     .eq(TravelRoleInfo::getRoleId, roleId)
-                    .list();
+                    .page(page);
+        }else if(null != level){
+            pageList = travelRoleInfoService
+                    .lambdaQuery()
+                    .eq(TravelRoleInfo::getRoleLevel, level)
+                    .page(page);
+        }else if(null != spot){
+            pageList = travelRoleInfoService
+                    .lambdaQuery()
+                    .like(TravelRoleInfo::getSkill, spot)
+                    .page(page);
+        }else{
+            pageList = travelRoleInfoService
+                    .lambdaQuery()
+                    .page(page);
         }
 
-
-        return Result.OK("角色列表", list);
+        return Result.OK("角色列表", pageList);
     }
 
     //根据角色id获取角色详情
@@ -250,14 +331,16 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //根据视频创建者获取视频列表
     @Override
-    public Result<?> queryVedioById(String roleInfoId) {
-        List<TravelVideo> list = travelVideoService
+    public Result<?> queryVedioById(String roleInfoId, PageBean pageBean) {
+
+        Page<TravelVideo> page = new Page<TravelVideo>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelVideo> pageList = travelVideoService
                 .lambdaQuery()
                 .eq(TravelVideo::getCreateBy, roleInfoId)
                 .orderByDesc(TravelVideo::getCreateTime)
-                .list();
+                .page(page);
 
-        return Result.OK("视频列表", list);
+        return Result.OK("视频列表", pageList);
     }
 
     //添加建议