1、接口重新排版

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

@@ -1,51 +0,0 @@
-package org.jeecg.modules.api.travelController;
-
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Api(tags="小程序-游玩项目相关接口")
-@RestController
-@RequestMapping("/api/amusement")
-@Slf4j
-public class AmusementApiController {
-
-    @Resource
-    private IndexApiService indexApiService;
-
-    //遗产路径/我要研学列表
-    @ApiOperation(value="小程序-获取游玩项目列表", notes="amusementType:0-遗产路径 1-我要研学；isPay:0-免费 1-付费")
-    @RequestMapping(value = "/queryAmusementList", method = {RequestMethod.GET})
-    public Result<?> queryAmusementList(String amusementType, String isPay, PageBean pageBean){
-        return indexApiService.queryAmusementList(amusementType, isPay, pageBean);
-    }
-
-    //遗产路径/我要研学详情
-    @ApiOperation(value="小程序-根据id获取游玩项目详情", notes="小程序-根据id获取游玩项目详情")
-    @RequestMapping(value = "/queryAmusementById", method = {RequestMethod.GET})
-    public Result<?> queryAmusementById(String amusementId){
-        return indexApiService.queryAmusementById(amusementId);
-    }
-
-    //非遗列表
-    @ApiOperation(value="小程序-获取非遗体验列表", notes="小程序-获取非遗体验列表")
-    @RequestMapping(value = "/queryExperienceList", method = {RequestMethod.GET})
-    public Result<?> queryExperienceList(PageBean pageBean){
-        return indexApiService.queryExperienceList(pageBean);
-    }
-
-    //非遗体验详情
-    @ApiOperation(value="小程序-根据id获取非遗体验详情", notes="小程序-根据id获取非遗体验详情")
-    @RequestMapping(value = "/queryExperienceById", method = {RequestMethod.GET})
-    public Result<?> queryExperienceById(String experienceId){
-        return indexApiService.queryExperienceById(experienceId);
-    }
-}

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

@@ -6,14 +6,13 @@ 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.jeecg.modules.apiService.OrderApiService;
 import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
 import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -24,11 +23,15 @@ import javax.annotation.Resource;
 @Slf4j
 public class IndexApiController {
 
+    //首页相关接口
     @Resource
     private IndexApiService indexApiService;
 
-    //获取小程序任一文章或服务
+    //订单相关接口
+    @Resource
+    private OrderApiService orderApiService;
 
+    /**************首页*********************/
     //获取banner图列表
     @ApiOperation(value="小程序-获取banner图列表", notes="0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5-申遗历程")
     @GetMapping()
@@ -37,58 +40,150 @@ public class IndexApiController {
         return indexApiService.queryBannerList(bannerCategoryType);
     };
 
+    //获取小程序任一文章或服务
+    @ApiOperation(value="小程序-首页搜索栏", notes="小程序-根据标题模糊查询文章")
+    @RequestMapping(value = "/queryArticleListByTitle", method = {RequestMethod.GET})
+    public Result<?> queryArticleListByTitle(String articleTitle, PageBean pageBean){
+        return indexApiService.queryArticleListByTitle(articleTitle, pageBean);
+    }
 
-    //根据角色id获取视频列表
-    @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表")
+    //根据角色id获取视频列表带分页
+    @ApiOperation(value="首页-根据角色id获取视频列表", notes="首页-根据角色id获取视频列表")
     @RequestMapping(value = "/queryVedioById", method = {RequestMethod.GET})
     public Result<?> queryVedioById(String roleInfoId, PageBean pageBean){
         return indexApiService.queryVedioById(roleInfoId, pageBean);
     }
 
     //根据id给视频点赞
-    @ApiOperation(value="小程序-根据id给视频点赞", notes="小程序-根据id给视频点赞")
+    @ApiOperation(value="首页-根据id给视频点赞", notes="首页-根据id给视频点赞")
     @RequestMapping(value = "/addThumpup", method = {RequestMethod.POST})
     public Result<?> addThumpup(String videoId){
         return indexApiService.addThumpup(videoId);
     }
 
-    //根据分类获取文章列表
-    @ApiOperation(value="小程序-根据标题模糊查询文章", notes="小程序-根据标题模糊查询文章")
-    @RequestMapping(value = "/queryArticleListByTitle", method = {RequestMethod.GET})
-    public Result<?> queryArticleListByTitle(String articleTitle, PageBean pageBean){
-        return indexApiService.queryArticleListByTitle(articleTitle, pageBean);
-    }
 
+    /**************申遗历程*********************/
     //根据分类获取文章列表
-    @ApiOperation(value="小程序-根据分类获取文章列表", notes="0-申遗历程 1-申遗缘由 2-遗产价值")
+    @ApiOperation(value="申遗历程-根据分类获取文章列表", notes="0-申遗历程 1-申遗缘由 2-遗产价值")
     @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET})
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean){
         return indexApiService.queryArticleListByType(articleType, pageBean);
     }
 
     //根据id获取文章详情
-    @ApiOperation(value="小程序-根据id获取文章详情", notes="小程序-根据id获取文章详情")
+    @ApiOperation(value="申遗历程-根据id获取文章详情", notes="申遗历程-根据id获取文章详情")
     @RequestMapping(value = "/queryArticleById", method = {RequestMethod.GET})
     public Result<?> queryArticleById(String articleId){
         return indexApiService.queryArticleById(articleId);
     }
 
+    /**************遗产概况*********************/
     //获取景区列表
-    @ApiOperation(value="小程序-获取景区列表", notes="小程序-获取景区列表")
+    @ApiOperation(value="遗产概况-获取景区列表", notes="遗产概况-获取景区列表")
     @RequestMapping(value = "/queryAreaList", method = {RequestMethod.GET})
     public Result<?> queryAreaList(PageBean pageBean){
         return indexApiService.queryAreaList(pageBean);
     }
 
     //获取景区详情
-    @ApiOperation(value="小程序-根据id获取景区详情", notes="小程序-根据id获取景区详情")
+    @ApiOperation(value="遗产概况-根据id获取景区详情", notes="遗产概况-根据id获取景区详情")
     @RequestMapping(value = "/queryAreaListById", method = {RequestMethod.GET})
     public Result<?> queryAreaListById(String areaId){
         return indexApiService.queryAreaListById(areaId);
     }
 
+    /**************遗产讲述/达人同游/我要跟拍*********************/
+    //根据角色类型获取角色信息列表-讲解员/达人/摄影师
+    @ApiOperation(value="遗产讲述&&达人同游&&我要跟拍-根据角色类型获取角色信息列表", notes="level: 1-金牌讲解员， 2-专业讲解员; roleId: 0-讲解员，1-达人，2-摄影师")
+    @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
+    public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean){
+        return indexApiService.queryRoleInfoList(roleId, level, spot, pageBean);
+    }
+
+    //根据角色id获取角色信息详情
+    @ApiOperation(value="遗产讲述&&达人同游&&我要跟拍-根据角色Id获取角色信息详情", notes="遗产讲述/达人同游/我要更拍-根据角色Id获取角色信息详情")
+    @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET})
+    public Result<?> queryRoleInfoById(String roleInfoId){
+        return indexApiService.queryRoleInfoById(roleInfoId);
+    }
+
+    /**************遗产路径/我要研学*********************/
+    //遗产路径/我要研学列表
+    @ApiOperation(value="遗产路径&&我要研学列表-获取游玩项目列表", notes="amusementType:0-遗产路径 1-我要研学；isPay:0-免费 1-付费")
+    @RequestMapping(value = "/queryAmusementList", method = {RequestMethod.GET})
+    public Result<?> queryAmusementList(String amusementType, String isPay, PageBean pageBean){
+        return indexApiService.queryAmusementList(amusementType, isPay, pageBean);
+    }
+
+    //遗产路径/我要研学详情
+    @ApiOperation(value="遗产路径&&我要研学列表-根据id获取游玩项目详情", notes="遗产路径/我要研学列表-根据id获取游玩项目详情")
+    @RequestMapping(value = "/queryAmusementById", method = {RequestMethod.GET})
+    public Result<?> queryAmusementById(String amusementId){
+        return indexApiService.queryAmusementById(amusementId);
+    }
+
+    /**************非遗体验*********************/
+    //非遗列表
+    @ApiOperation(value="非遗体验-获取非遗体验列表", notes="非遗体验-获取非遗体验列表")
+    @RequestMapping(value = "/queryExperienceList", method = {RequestMethod.GET})
+    public Result<?> queryExperienceList(PageBean pageBean){
+        return indexApiService.queryExperienceList(pageBean);
+    }
+
+    //非遗体验详情
+    @ApiOperation(value="非遗体验-根据id获取非遗体验详情", notes="非遗体验-根据id获取非遗体验详情")
+    @RequestMapping(value = "/queryExperienceById", method = {RequestMethod.GET})
+    public Result<?> queryExperienceById(String experienceId){
+        return indexApiService.queryExperienceById(experienceId);
+    }
+
+    /**************文创好物*********************/
+    //获取文创好物列表
+    @ApiOperation(value="文创好物-获取商品列表", notes="文创好物-获取商品列表")
+    @RequestMapping(value = "/queryWaresList", method = {RequestMethod.GET})
+    public Result<?> queryWaresList(PageBean pageBean){
+        return indexApiService.queryWaresList(pageBean);
+    }
+
+    //获取文创好物详情
+    @ApiOperation(value="文创好物-获取商品详情", notes="文创好物-获取商品详情")
+    @RequestMapping(value = "/queryWaresById", method = {RequestMethod.GET})
+    public Result<?> queryWaresById(String waresId){
+        return indexApiService.queryWaresById(waresId);
+    }
+
+    //查询文创好物订单信息
+    @ApiOperation(value="文创好物-查询文创好物订单列表", notes="文创好物-查询文创好物订单列表")
+    @RequestMapping(value = "/queryWaresOrderList", method = {RequestMethod.GET})
+    public Result<?> queryWaresOrderList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return indexApiService.queryWaresOrderList(token, pageBean);
+    }
+
+    //创建文创好物订单
+    @ApiOperation(value = "文创好物-创建文创好物订单",notes = "文创好物-创建文创好物订单")
+    @PostMapping("/addWaresOrder")
+    public Result<?> addWaresOrder(@RequestHeader("X-Access-Token") String token, TravelWaresOrder travelWaresOrder){
+        return indexApiService.addWaresOrder(token, travelWaresOrder);
+    }
+
+    //立即支付
+    @ApiOperation(value = "立即支付",notes = "立即支付")
+    @PostMapping("/payOrder")
+    public Result<?> payOrder(){
+        return orderApiService.payOrder();
+    }
+
+    /**************我要帮助*********************/
+    //我要帮助
+    @ApiOperation(value="首页-我要帮助", notes="添加问题和意见")
+    @RequestMapping(value = "/addAdvice", method = {RequestMethod.POST})
+    public Result<?> addAdvice(TravelAdvance travelAdvance){
+        return indexApiService.addAdvice(travelAdvance);
+    }
+
+    /**************导览*********************/
     //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
-    @ApiOperation(value="小程序-获取该景区下的地点列表", notes="areaId: 0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区; categoryId: 0-景点 1-美食店铺 2-民宿 3-厕所")
+    @ApiOperation(value="导览-获取该景区下的地点列表", notes="areaId: 0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区; categoryId: 0-景点 1-美食店铺 2-民宿 3-厕所")
     @RequestMapping(value = "/querySpotList", method = {RequestMethod.GET})
     public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean){
         return indexApiService.querySpotList(areaId, categoryId, pageBean);
@@ -105,6 +200,7 @@ public class IndexApiController {
 
 
 
+
     //添加购物车
 
 
@@ -116,20 +212,5 @@ public class IndexApiController {
 
     //无忧租车-链接滴滴打车
 
-    //我要帮助
-    @ApiOperation(value="小程序-我要帮助", notes="添加问题和意见")
-    @RequestMapping(value = "/addAdvice", method = {RequestMethod.POST})
-    public Result<?> addAdvice(TravelAdvance travelAdvance){
-        return indexApiService.addAdvice(travelAdvance);
-    }
-
-    /*************************我的***********************************/
-    //添加志愿者
-    @ApiOperation(value="小程序-添加志愿者", notes="小程序-添加志愿者")
-    @RequestMapping(value = "/addVolunteer", method = {RequestMethod.POST})
-    public Result<?> addVolunteer(TravelVolunteer travelVolunteer){
-        return indexApiService.addVolunteer(travelVolunteer);
-    }
-
 
 }

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

@@ -31,8 +31,6 @@ public class LoginApiController {
         return loginApiService.login(loginReq);
     }
 
-
-
     //获取用户协议
     @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议")
     @GetMapping("/getUserAgreement")

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

@@ -1,73 +0,0 @@
-package org.jeecg.modules.api.travelController;
-
-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.jeecg.modules.apiService.OrderApiService;
-import org.jeecg.modules.travelOrder.entity.TravelOrder;
-import org.jeecg.modules.travelTime.entity.TravelTime;
-import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@Api(tags="小程序-订单相关接口")
-@RestController
-@RequestMapping("/api/order")
-@Slf4j
-public class OrderApiController {
-    //订单相关接口
-    @Resource
-    private OrderApiService orderApiService;
-
-    @Resource
-    private IndexApiService indexApiService;
-
-    //时间段查询
-    @ApiOperation(value="小程序-查询预约时间段", notes="timeType：0-上午 1-下午")
-    @RequestMapping(value = "/queryOrderTime", method = {RequestMethod.GET})
-        public Result<?> queryOrderTime(String timeType){
-        return indexApiService.queryOrderTime(timeType);
-    }
-
-    //查询订单信息
-    @ApiOperation(value="小程序-查询预约订单列表", notes="orderType：0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学")
-    @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET})
-    public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, String  orderType, PageBean pageBean){
-        return indexApiService.queryOrderList(token, orderType, pageBean);
-    }
-
-    //创建预约订单
-    @ApiOperation(value = "创建预约订单",notes = "创建预约订单")
-    @PostMapping("/createOrder")
-    public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, TravelWaresOrder travelWaresOrder){
-        return indexApiService.addWaresOrder(token, travelWaresOrder);
-    }
-
-    //查询文创好物订单信息
-    @ApiOperation(value="小程序-查询文创好物订单列表", notes="查询文创好物订单列表")
-    @RequestMapping(value = "/queryWaresOrderList", method = {RequestMethod.GET})
-    public Result<?> queryWaresOrderList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
-        return indexApiService.queryWaresOrderList(token, pageBean);
-    }
-
-    //创建文创好物订单
-    @ApiOperation(value = "创建文创好物订单",notes = "创建文创好物订单")
-    @PostMapping("/addWaresOrder")
-    public Result<?> addWaresOrder(@RequestHeader("X-Access-Token") String token, TravelWaresOrder travelWaresOrder){
-        return indexApiService.addWaresOrder(token, travelWaresOrder);
-    }
-
-
-
-    //立即支付
-    @ApiOperation(value = "立即支付",notes = "立即支付")
-    @PostMapping("/payOrder")
-    public Result<?> payOrder(){
-        return orderApiService.payOrder();
-    }
-}

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

@@ -10,14 +10,13 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
 import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
+import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
-@Api(tags="小程序-用户信息相关接口")
+@Api(tags="小程序-个人中心相关接口")
 @RestController
 @RequestMapping("/api/user")
 @Slf4j
@@ -26,90 +25,145 @@ public class UserInfoApiController {
     @Resource
     private IndexApiService indexApiService;
 
-    //根据角色类型获取角色信息列表-讲解员/达人/摄影师
-    @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="level: 1-金牌讲解员， 2-专业讲解员; roleId: 0-讲解员，1-达人，2-摄影师")
-    @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
-    public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean){
-        return indexApiService.queryRoleInfoList(roleId, level, spot, pageBean);
+
+    /*******************个人信息****************************/
+    //获取个人信息接口
+    @ApiOperation(value="个人信息-查询用户个人信息", notes="个人信息-查询用户个人信息")
+    @RequestMapping(value = "/queryHanHaiMemberById", method = {RequestMethod.GET})
+    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token){
+        return indexApiService.queryHanHaiMemberById(token);
     }
 
-    //根据角色id获取角色信息详情
-    @ApiOperation(value="小程序-根据角色Id获取角色信息详情", notes="小程序-根据角色Id获取角色信息详情")
-    @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET})
-    public Result<?> queryRoleInfoById(String roleInfoId){
-        return indexApiService.queryRoleInfoById(roleInfoId);
+    //修改个人信息接口
+    @ApiOperation(value="个人信息-修改用户个人信息", notes="个人信息-修改用户个人信息")
+    @RequestMapping(value = "/updateHanHaiMemberById", method = {RequestMethod.POST})
+    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token, HanHaiMember hanHaiMember){
+        return indexApiService.updateHanHaiMemberById(token, hanHaiMember);
+    }
+
+
+
+    /*****************************************************个人中心*********************************************************************/
+
+    /*******************我的收藏****************************/
+    //获取我的收藏列表
+    @ApiOperation(value="我的收藏-获取我的收藏列表", notes="collectionType：0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物")
+    @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET})
+    public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String token, String collectionType, PageBean pageBean){
+        return indexApiService.queryCollectionList(token, collectionType, pageBean);
+    }
+
+    //添加收藏
+    @ApiOperation(value="我的收藏-添加收藏", notes="我的收藏-添加收藏")
+    @RequestMapping(value = "/addCollection", method = {RequestMethod.POST})
+    public Result<?> addCollection(@RequestHeader("X-Access-Token") String token, TravelCollection travelCollection){
+        return indexApiService.addCollection(token, travelCollection);
+    }
+
+    //取消收藏
+    @ApiOperation(value="我的收藏-取消收藏", notes="我的收藏-取消收藏")
+    @RequestMapping(value = "/deleteCollection", method = {RequestMethod.POST})
+    public Result<?> deleteCollection(@RequestHeader("X-Access-Token") String token, String collectionType, String collectionId){
+        return indexApiService.deleteCollection(token, collectionType, collectionId);
     }
 
+    /*******************我的预约****************************/
+    //时间段查询
+    @ApiOperation(value="我的预约-查询预约时间段", notes="timeType：0-上午 1-下午")
+    @RequestMapping(value = "/queryOrderTime", method = {RequestMethod.GET})
+    public Result<?> queryOrderTime(String timeType){
+        return indexApiService.queryOrderTime(timeType);
+    }
+
+    //查询订单信息
+    @ApiOperation(value="我的预约-查询预约订单列表", notes="orderType：0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学")
+    @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET})
+    public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, String  orderType, PageBean pageBean){
+        return indexApiService.queryOrderList(token, orderType, pageBean);
+    }
+
+
+    /*******************我的订单****************************/
+
+    //创建预约订单
+    @ApiOperation(value = "我的预约-创建预约订单",notes = "我的预约-创建预约订单")
+    @PostMapping("/createOrder")
+    public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, TravelWaresOrder travelWaresOrder){
+        return indexApiService.addWaresOrder(token, travelWaresOrder);
+    }
+
+    /*******************我的地址****************************/
     //查询地址
-    @ApiOperation(value="小程序-查询地址", notes="小程序-查询地址")
+    @ApiOperation(value="我的地址-查询地址", notes="我的地址-查询地址")
     @RequestMapping(value = "/queryAddress", method = {RequestMethod.GET})
     public Result<?> queryAddress(@RequestHeader("X-Access-Token") String token, TravelAddress travelAddress, PageBean pageBean){
         return indexApiService.queryAddress(token, travelAddress, pageBean);
     }
 
     //新增地址
-    @ApiOperation(value="小程序-新增地址", notes="小程序-新增地址")
+    @ApiOperation(value="我的地址-新增地址", notes="我的地址-新增地址")
     @RequestMapping(value = "/addAddress", method = {RequestMethod.POST})
     public Result<?> addAddress(@RequestHeader("X-Access-Token") String token, TravelAddress travelAddress){
         return indexApiService.addAddress(token, travelAddress);
     }
 
     //删除地址
-    @ApiOperation(value="小程序-删除地址", notes="小程序-删除地址")
+    @ApiOperation(value="我的地址-删除地址", notes="我的地址-删除地址")
     @RequestMapping(value = "/deleteAddress", method = {RequestMethod.DELETE})
     public Result<?> deleteAddress(@RequestHeader("X-Access-Token") String token, String AddressId){
         return indexApiService.deleteAddress(token, AddressId);
     }
 
     //修改地址
-    @ApiOperation(value="小程序-修改地址", notes="小程序-修改地址")
+    @ApiOperation(value="我的地址-修改地址", notes="我的地址-修改地址")
     @RequestMapping(value = "/updateAddress", method = {RequestMethod.POST})
     public Result<?> updateAddress(@RequestHeader("X-Access-Token") String token, TravelAddress travelAddress){
         return indexApiService.updateAddress(token, travelAddress);
     }
 
     //修改默认地址
-    @ApiOperation(value="小程序-修改默认地址", notes="小程序-修改默认地址")
+    @ApiOperation(value="我的地址-修改默认地址", notes="我的地址-修改默认地址")
     @RequestMapping(value = "/updateDefaultAddress", method = {RequestMethod.POST})
     public Result<?> updateDefaultAddress(@RequestHeader("X-Access-Token") String token, String addressId){
         return indexApiService.updateDefaultAddress(token, addressId);
     }
 
-    //我的收藏
-    @ApiOperation(value="小程序-获取我的收藏列表", notes="collectionType：0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物")
-    @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET})
-    public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String token, String collectionType, PageBean pageBean){
-        return indexApiService.queryCollectionList(token, collectionType, pageBean);
+    /*******************我的购物车****************************/
+    //获取购物车列表
+    @ApiOperation(value="我的购物车-获取购物车列表", notes="我的购物车-获取购物车列表")
+    @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
+    public Result<?> queryShopcarList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return indexApiService.queryShopcarList(token, pageBean);
     }
 
-    //添加收藏
-    @ApiOperation(value="小程序-添加收藏", notes="小程序-添加收藏")
-    @RequestMapping(value = "/addCollection", method = {RequestMethod.POST})
-    public Result<?> addCollection(@RequestHeader("X-Access-Token") String token, TravelCollection travelCollection){
-        return indexApiService.addCollection(token, travelCollection);
+    //添加购物车
+    @ApiOperation(value="我的购物车-添加购物车", notes="我的购物车-添加购物车")
+    @RequestMapping(value = "/addShopcar", method = {RequestMethod.POST})
+    public Result<?> addShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar travelShopcar){
+        return indexApiService.addShopcar(token,travelShopcar);
     }
 
-    //取消收藏
-    @ApiOperation(value="小程序-取消收藏", notes="小程序-取消收藏")
-    @RequestMapping(value = "/deleteCollection", method = {RequestMethod.POST})
-    public Result<?> deleteCollection(@RequestHeader("X-Access-Token") String token, String collectionType, String collectionId){
-        return indexApiService.deleteCollection(token, collectionType, collectionId);
+    //取消购物车
+    @ApiOperation(value="我的购物车-取消购物车", notes="我的购物车-取消购物车")
+    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.DELETE})
+    public Result<?> deleteShopcar(@RequestHeader("X-Access-Token") String token, String shopcarId){
+        return indexApiService.deleteShopcar(token,shopcarId);
     }
 
-    //获取个人信息接口
-    @ApiOperation(value="小程序-查询用户个人信息", notes="小程序-查询用户个人信息")
-    @RequestMapping(value = "/queryHanHaiMemberById", method = {RequestMethod.GET})
-    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token){
-        return indexApiService.queryHanHaiMemberById(token);
+    //修改购物车商品数量
+    @ApiOperation(value="我的购物车-修改购物车信息", notes="我的购物车-修改购物车信息")
+    @RequestMapping(value = "/updateShopcar", method = {RequestMethod.POST})
+    public Result<?> updateShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar shopcar){
+        return indexApiService.updateShopcar(token, shopcar);
     }
 
-    //修改个人信息接口
-    @ApiOperation(value="小程序-修改用户个人信息", notes="小程序-修改用户个人信息")
-    @RequestMapping(value = "/updateHanHaiMemberById", method = {RequestMethod.POST})
-    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token, HanHaiMember hanHaiMember){
-        return indexApiService.updateHanHaiMemberById(token, hanHaiMember);
+    /*******************加入志愿者****************************/
+    //添加志愿者
+    @ApiOperation(value="加入志愿者-添加志愿者", notes="加入志愿者-添加志愿者")
+    @RequestMapping(value = "/addVolunteer", method = {RequestMethod.POST})
+    public Result<?> addVolunteer(TravelVolunteer travelVolunteer){
+        return indexApiService.addVolunteer(travelVolunteer);
     }
 
 
-
 }

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

@@ -1,67 +0,0 @@
-package org.jeecg.modules.api.travelController;
-
-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.jeecg.modules.travelShopcar.entity.TravelShopcar;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Api(tags="小程序-文创好物相关接口")
-@RestController
-@RequestMapping("/api/wares")
-@Slf4j
-public class WaresApiController {
-    @Resource
-    private IndexApiService indexApiService;
-
-    //获取文创好物列表
-    @ApiOperation(value="小程序-获取商品列表", notes="小程序-获取商品列表")
-    @RequestMapping(value = "/queryWaresList", method = {RequestMethod.GET})
-    public Result<?> queryWaresList(PageBean pageBean){
-        return indexApiService.queryWaresList(pageBean);
-    }
-
-    //获取文创好物详情
-    @ApiOperation(value="小程序-获取商品详情", notes="小程序-获取商品详情")
-    @RequestMapping(value = "/queryWaresById", method = {RequestMethod.GET})
-    public Result<?> queryWaresById(String waresId){
-        return indexApiService.queryWaresById(waresId);
-    }
-
-
-    //获取购物车列表
-    @ApiOperation(value="小程序-获取购物车列表", notes="小程序-获取购物车列表")
-    @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
-    public Result<?> queryShopcarList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
-        return indexApiService.queryShopcarList(token, pageBean);
-    }
-
-    //添加购物车
-    @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
-    @RequestMapping(value = "/addShopcar", method = {RequestMethod.POST})
-    public Result<?> addShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar travelShopcar){
-        return indexApiService.addShopcar(token,travelShopcar);
-    }
-
-    //取消购物车
-    @ApiOperation(value="小程序-取消购物车", notes="小程序-取消购物车")
-    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.DELETE})
-    public Result<?> deleteShopcar(@RequestHeader("X-Access-Token") String token, String shopcarId){
-        return indexApiService.deleteShopcar(token,shopcarId);
-    }
-
-    //修改购物车商品数量
-    @ApiOperation(value="小程序-修改购物车信息", notes="小程序-修改购物车信息")
-    @RequestMapping(value = "/updateShopcar", method = {RequestMethod.POST})
-    public Result<?> updateShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar shopcar){
-        return indexApiService.updateShopcar(token, shopcar);
-    }
-}

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

@@ -134,20 +134,41 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Resource
     private ITravelVolunteerService travelVolunteerService;
 
-    //
-
-
-
     //证件表
     @Resource
     private ITravelCertificationService travelCertificationService;
 
+    /*****************************************************************************************/
 
-    //获取轮播图列表
+    /***************************首页**************************/
+    //获取banner图列表
     @Override
     public Result<?> queryBannerList(String bannerCategoryId) {
 
         //0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5-申遗历程
+        switch (bannerCategoryId){
+            case "0":
+                bannerCategoryId = "1836222983394902017";
+                break;
+            case "1":
+                bannerCategoryId = "1838473006392385538";
+                break;
+            case "2":
+                bannerCategoryId = "1838473106556559361";
+                break;
+            case "3":
+                bannerCategoryId = "1838473306209624065";
+                break;
+            case "4":
+                bannerCategoryId = "1838473405736263682";
+                break;
+            case "5":
+                bannerCategoryId = "1843170621184884738";
+                break;
+            default:
+                return Result.OK("参数输入不合法，请重新输入：0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5-申遗历程");
+
+        }
 
         List<TravelImage> list = null;
         if(null != bannerCategoryId){
@@ -166,6 +187,32 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("轮播图列表", list);
     }
 
+    //获取小程序任一文章或服务
+    @Override
+    public Result<?> queryArticleListByTitle(String articleTitle, PageBean pageBean) {
+
+        //0-申遗历程 1-申遗缘由 2-遗产价值
+
+        Page<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelArticle> pageList =null;
+
+        if(null != articleTitle){
+
+            pageList = travelArticleService
+                    .lambdaQuery()
+                    .like(TravelArticle::getArticleTitle, articleTitle)
+                    .orderByDesc(TravelArticle::getCreateTime)
+                    .page(page);
+        }else {
+            pageList = travelArticleService
+                    .lambdaQuery()
+                    .orderByDesc(TravelArticle::getCreateTime)
+                    .page(page);
+        }
+
+        return Result.OK("文章列表", pageList);
+    }
+
     //获取视频列表带分页
     @Override
     public Result<?> queryVideoList(PageBean pageBean) {
@@ -205,6 +252,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         return video;
     }
 
+    /***************************申遗历程**************************/
     //获取文章列表带分页
     @Override
     public Result<?> queryArticleList(PageBean pageBean) {
@@ -217,32 +265,6 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("文章列表", pageList);
     }
 
-    //根据标题模糊查询文章
-    @Override
-    public Result<?> queryArticleListByTitle(String articleTitle, PageBean pageBean) {
-
-        //0-申遗历程 1-申遗缘由 2-遗产价值
-
-        Page<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<TravelArticle> pageList =null;
-
-        if(null != articleTitle){
-
-            pageList = travelArticleService
-                    .lambdaQuery()
-                    .like(TravelArticle::getArticleTitle, articleTitle)
-                    .orderByDesc(TravelArticle::getCreateTime)
-                    .page(page);
-        }else {
-            pageList = travelArticleService
-                    .lambdaQuery()
-                    .orderByDesc(TravelArticle::getCreateTime)
-                    .page(page);
-        }
-
-        return Result.OK("文章列表", pageList);
-    }
-
     //根据文章类型获取文章列表带分页
     @Override
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean) {
@@ -280,6 +302,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("文章详情", one);
     }
 
+    /**************遗产概况*********************/
     //获取景区列表带分页
     @Override
     public Result<?> queryAreaList(PageBean pageBean) {
@@ -303,7 +326,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("景区详情", one);
     }
 
-    //获取地点列表-景点/厕所/美食店铺/民宿带分页
+    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
     @Override
     public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean) {
 
@@ -322,7 +345,8 @@ public class IndexApiServiceImpl implements IndexApiService {
                     break;
                 case "4": areaId = "1835296680814776322";
                     break;
-                default: areaId = null;
+                default:
+                    return Result.OK("所属区域参数输入错误，请重新输入：areaId：0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区");
             }
         }
 
@@ -358,6 +382,7 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean) {
 
+        //level: 1-金牌讲解员，1-专业讲解员
         //roleId: 0-讲解员，1-达人，2-摄影师
 
         Page<TravelRoleInfo> page = new Page<TravelRoleInfo>(pageBean.getPageNo(), pageBean.getPageSize());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/TxtToSoundUtils.java

@@ -30,7 +30,7 @@ public class TxtToSoundUtils {
             // 语音朗读速度 -10 到 +10
             ax.setProperty("Rate", new Variant(-2));
             // 执行朗读
-            //Dispatch.call(spVoice, "Speak", new Variant(text));
+            Dispatch.call(spVoice, "Speak", new Variant(text));
 
             // 下面是构建文件流把生成语音文件
             ax = new ActiveXComponent("Sapi.SpFileStream");