From 3460bc6c94f58a5105e8873c91314279f108f020 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Fri, 20 Sep 2024 17:39:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TravelCategoryController.java | 2 +- .../travelCategory/entity/TravelCategory.java | 6 +- .../mapper/TravelCategoryMapper.java | 2 +- .../service/ITravelCategoryService.java | 2 +- .../service/impl/TravelCategoryServiceImpl.java | 2 +- .../travelCategory/vue/TravelCategoryList.vue | 6 ++ .../vue/modules/TravelCategoryForm.vue | 5 + .../travelCategory/vue3/TravelCategory.data.ts | 10 ++ .../api/travelController/IndexApiController.java | 12 +-- .../apiService/impl/IndexApiServiceImpl.java | 105 +++++++++++++++++++-- 10 files changed, 133 insertions(+), 19 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/controller/TravelCategoryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/controller/TravelCategoryController.java index 01e6313..fc643c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/controller/TravelCategoryController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/controller/TravelCategoryController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 分类表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-20 * @Version: V1.0 */ @Api(tags="分类表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/entity/TravelCategory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/entity/TravelCategory.java index b9f5cf9..8570fb4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/entity/TravelCategory.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/entity/TravelCategory.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 分类表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-20 * @Version: V1.0 */ @Data @@ -44,4 +44,8 @@ public class TravelCategory implements Serializable { @Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id") @ApiModelProperty(value = "父级分类") private java.lang.String categoryPid; + /**分类标识码*/ + @Excel(name = "分类标识码", width = 15) + @ApiModelProperty(value = "分类标识码") + private java.lang.String categoryCode; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/mapper/TravelCategoryMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/mapper/TravelCategoryMapper.java index 02e284c..a5d4529 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/mapper/TravelCategoryMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/mapper/TravelCategoryMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 分类表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-20 * @Version: V1.0 */ public interface TravelCategoryMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/ITravelCategoryService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/ITravelCategoryService.java index be50ded..706b6a4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/ITravelCategoryService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/ITravelCategoryService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 分类表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-20 * @Version: V1.0 */ public interface ITravelCategoryService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/impl/TravelCategoryServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/impl/TravelCategoryServiceImpl.java index 00118d6..6b17741 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/impl/TravelCategoryServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/service/impl/TravelCategoryServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 分类表 * @Author: jeecg-boot - * @Date: 2024-09-15 + * @Date: 2024-09-20 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/TravelCategoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/TravelCategoryList.vue index b40fb1f..99dcd71 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/TravelCategoryList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/TravelCategoryList.vue @@ -132,6 +132,11 @@ align:"center", dataIndex: 'categoryPid_dictText' }, + { + title:'分类标识码', + align:"center", + dataIndex: 'categoryCode' + }, { title: '操作', dataIndex: 'action', @@ -168,6 +173,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'categoryName',text:'分类名称',dictCode:''}) fieldList.push({type:'string',value:'categoryPid',text:'父级分类',dictCode:"travel_category,category_name,id"}) + fieldList.push({type:'string',value:'categoryCode',text:'分类标识码',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/modules/TravelCategoryForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/modules/TravelCategoryForm.vue index 9e01235..beca4af 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/modules/TravelCategoryForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/modules/TravelCategoryForm.vue @@ -13,6 +13,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue3/TravelCategory.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue3/TravelCategory.data.ts index 8a8a033..d01609d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue3/TravelCategory.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue3/TravelCategory.data.ts @@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'categoryPid_dictText' }, + { + title: '分类标识码', + align:"center", + dataIndex: 'categoryCode' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -33,4 +38,9 @@ export const formSchema: FormSchema[] = [ dictCode:"travel_category,category_name,id" }, }, + { + label: '分类标识码', + field: 'categoryCode', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java index 2e7faa8..68571c3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java @@ -25,11 +25,11 @@ public class IndexApiController { //获取小程序任一文章或服务 //获取banner图列表 - @ApiOperation(value="小程序-获取banner图列表", notes="小程序-获取banner图列表") + @ApiOperation(value="小程序-获取banner图列表", notes="1-轮播图_首页") @GetMapping() @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) - public Result queryBannerList(String bannerCategoryId){ - return indexApiService.queryBannerList(bannerCategoryId); + public Result queryBannerList(String bannerCategoryType){ + return indexApiService.queryBannerList(bannerCategoryType); }; //获取视频列表 @@ -47,7 +47,7 @@ public class IndexApiController { } //根据分类获取文章列表 - @ApiOperation(value="小程序-根据分类获取文章列表", notes="小程序-根据分类获取文章列表") + @ApiOperation(value="小程序-根据分类获取文章列表", notes="1-申遗历程 2-申遗缘由 3-遗产价值") @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET}) public Result queryArticleListByType(String articleType){ return indexApiService.queryArticleListByType(articleType); @@ -68,14 +68,14 @@ public class IndexApiController { } //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿 - @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表:景点/厕所/美食店铺/民宿", notes="小程序-根据景区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); } //根据角色类型获取角色信息列表-讲解员/达人/摄影师 - @ApiOperation(value="小程序-根据角色类型获取角色信息列表-讲解员/达人/摄影师", notes="1-讲解员，2-达人，3-摄影师") + @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); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java index f6410e0..fc3671f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java @@ -70,9 +70,17 @@ public class IndexApiServiceImpl implements IndexApiService { //获取轮播图列表 @Override public Result queryBannerList(String bannerCategoryId) { + + //1-轮播图_首页 + switch (bannerCategoryId){ + case "1": bannerCategoryId = "1836222983394902017"; + break; + } + List list = travelImageService .lambdaQuery() .eq(TravelImage::getCategoryId, bannerCategoryId) + .orderByAsc(TravelImage::getOrderId) .list(); return Result.OK("轮播图列表", list); @@ -81,7 +89,10 @@ public class IndexApiServiceImpl implements IndexApiService { //获取视频列表 @Override public Result queryVideoList() { - List list = travelVideoService.list(); + List list = travelVideoService + .lambdaQuery() + .orderByDesc(TravelVideo::getCreateTime) + .list(); return Result.OK("视频列表", list); } @@ -89,7 +100,10 @@ public class IndexApiServiceImpl implements IndexApiService { //获取文章列表 @Override public Result queryArticleList() { - List list = travelArticleService.list(); + List list = travelArticleService + .lambdaQuery() + .orderByDesc(TravelArticle::getCreateTime) + .list(); return Result.OK("文章列表", list); } @@ -97,9 +111,21 @@ public class IndexApiServiceImpl implements IndexApiService { //根据文章类型获取文章列表 @Override public Result queryArticleListByType(String articleType) { + + //1-申遗历程 2-申遗缘由 3-遗产价值 + switch (articleType){ + case "1": articleType = "1836253741344075777"; + break; + case "2": articleType = "1836253813855203330"; + break; + case "3": articleType = "1836253884822827009"; + break; + } + List list = travelArticleService .lambdaQuery() .eq(TravelArticle::getCategoryId, articleType) + .orderByDesc(TravelArticle::getCreateTime) .list(); return Result.OK("文章列表", list); @@ -127,6 +153,33 @@ public class IndexApiServiceImpl implements IndexApiService { //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿 @Override public Result querySpotList(String areaId, String categoryId) { + + //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; + } + + //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; + } + List list = travelSpotService .lambdaQuery() .eq(TravelSpot::getAreaId, areaId) @@ -139,12 +192,47 @@ public class IndexApiServiceImpl implements IndexApiService { //根据角色类型获取角色信息列表 @Override public Result queryRoleInfoList(String roleId, String level, String spot) { - List list = travelRoleInfoService - .lambdaQuery() - .eq(TravelRoleInfo::getRoleId, roleId) - .eq(TravelRoleInfo::getRoleLevel, level) - .like(TravelRoleInfo::getSkill, spot) - .list(); + + //roleId: 1-讲解员，2-达人，3-摄影师 + switch (roleId){ + case "1": + roleId = "1835298310465458178"; + break; + case "2": + roleId = "1835298364374847490"; + break; + case "3": + roleId = "1835298430967812098"; + break; + } + + List list = null; + if(null != level && null != spot){ + list = travelRoleInfoService + .lambdaQuery() + .eq(TravelRoleInfo::getRoleId, roleId) + .eq(TravelRoleInfo::getRoleLevel, level) + .like(TravelRoleInfo::getSkill, spot) + .list(); + }else if(null != level){ + list = travelRoleInfoService + .lambdaQuery() + .eq(TravelRoleInfo::getRoleId, roleId) + .eq(TravelRoleInfo::getRoleLevel, level) + .list(); + }else if(null != spot){ + list = travelRoleInfoService + .lambdaQuery() + .eq(TravelRoleInfo::getRoleId, roleId) + .like(TravelRoleInfo::getSkill, spot) + .list(); + }else { + list = travelRoleInfoService + .lambdaQuery() + .eq(TravelRoleInfo::getRoleId, roleId) + .list(); + } + return Result.OK("角色列表", list); } @@ -166,6 +254,7 @@ public class IndexApiServiceImpl implements IndexApiService { List list = travelVideoService .lambdaQuery() .eq(TravelVideo::getCreateBy, roleInfoId) + .orderByDesc(TravelVideo::getCreateTime) .list(); return Result.OK("视频列表", list);