1、关联表去除

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/controller/TravelArticleController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/entity/TravelArticle.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -59,8 +59,8 @@ public class TravelArticle implements Serializable {
 	@Excel(name = "文章内容", width = 15)
     @ApiModelProperty(value = "文章内容")
     private java.lang.String articleContent;
-	/**文章所属分类*/
-	@Excel(name = "文章所属分类", width = 15)
-    @ApiModelProperty(value = "文章所属分类")
-    private java.lang.String categoryId;
+	/**文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)*/
+	@Excel(name = "文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)", width = 15)
+    @ApiModelProperty(value = "文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)")
+    private java.lang.Integer categoryId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/mapper/TravelArticleMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelArticleMapper extends BaseMapper<TravelArticle> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/ITravelArticleService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelArticleService extends IService<TravelArticle> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/service/impl/TravelArticleServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 文章表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/TravelArticleList.vue

@@ -99,7 +99,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelArticleModal from './modules/TravelArticleModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelArticleList',
@@ -140,9 +139,9 @@
             scopedSlots: {customRender: 'htmlSlot'}
           },
           {
-            title:'文章所属分类',
+            title:'文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
             align:"center",
-            dataIndex: 'categoryId'
+            dataIndex: 'categoryId_dictText'
           },
           {
             title: '操作',
@@ -181,7 +180,7 @@
         fieldList.push({type:'string',value:'articleTitle',text:'文章标题',dictCode:''})
         fieldList.push({type:'string',value:'articleImage',text:'文章封面',dictCode:''})
         fieldList.push({type:'string',value:'articleContent',text:'文章内容',dictCode:''})
-        fieldList.push({type:'string',value:'categoryId',text:'文章所属分类',dictCode:"travel_category,category_name,id"})
+        fieldList.push({type:'int',value:'categoryId',text:'文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue/modules/TravelArticleForm.vue

@@ -19,8 +19,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="文章所属分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <a-input v-model="model.categoryId" placeholder="请输入文章所属分类"  ></a-input>
+            <a-form-model-item label="文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="" placeholder="请选择文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArticle/vue3/TravelArticle.data.ts

@@ -22,9 +22,9 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'htmlSlot' },
    },
    {
-    title: '文章所属分类',
+    title: '文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
     align:"center",
-    dataIndex: 'categoryId'
+    dataIndex: 'categoryId_dictText'
    },
 ];
 //查询数据
@@ -50,8 +50,11 @@ export const formSchema: FormSchema[] = [
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
   {
-    label: '文章所属分类',
+    label: '文章所属分类(0-申遗历程 1-申遗缘由 2-遗产价值)',
     field: 'categoryId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:""
+     },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-18
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -47,7 +47,7 @@ public class TravelImage implements Serializable {
 	@Excel(name = "图片分类", width = 15, dictTable = "travel_category", dicText = "category_name", dicCode = "id")
 	@Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id")
     @ApiModelProperty(value = "图片分类")
-    private java.lang.String categoryId;
+    private java.lang.Integer categoryId;
 	/**排序编号*/
 	@Excel(name = "排序编号", width = 15)
     @ApiModelProperty(value = "排序编号")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-18
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelImageMapper extends BaseMapper<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-18
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelImageService extends IService<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue

@@ -179,7 +179,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'imageName',text:'图片名称',dictCode:''})
         fieldList.push({type:'string',value:'imageContent',text:'图片内容',dictCode:''})
-        fieldList.push({type:'string',value:'categoryId',text:'图片分类',dictCode:"travel_category,category_name,id"})
+        fieldList.push({type:'int',value:'categoryId',text:'图片分类',dictCode:"travel_category,category_name,id"})
         fieldList.push({type:'int',value:'orderId',text:'排序编号',dictCode:''})
         this.superFieldList = fieldList
       }

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

@@ -35,11 +35,10 @@ public class TravelRoleInfo implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
-	/**角色类型*/
-	@Excel(name = "角色类型", width = 15, dictTable = "travel_category", dicText = "category_name", dicCode = "id")
-	@Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id")
-    @ApiModelProperty(value = "角色类型")
-    private java.lang.String roleId;
+	/**角色类型(0-讲解员，1-达人，2-摄影师)*/
+	@Excel(name = "角色类型(0-讲解员，1-达人，2-摄影师)", width = 15)
+    @ApiModelProperty(value = "角色类型(0-讲解员，1-达人，2-摄影师)")
+    private java.lang.Integer roleId;
 	/**角色头像*/
 	@Excel(name = "角色头像", width = 15)
     @ApiModelProperty(value = "角色头像")

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

@@ -123,7 +123,7 @@
             }
           },
           {
-            title:'角色类型',
+            title:'角色类型(0-讲解员，1-达人，2-摄影师)',
             align:"center",
             dataIndex: 'roleId_dictText'
           },
@@ -227,7 +227,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'roleId',text:'角色类型',dictCode:"travel_category,category_name,id"})
+        fieldList.push({type:'int',value:'roleId',text:'角色类型(0-讲解员，1-达人，2-摄影师)',dictCode:''})
         fieldList.push({type:'string',value:'roleHead',text:'角色头像',dictCode:''})
         fieldList.push({type:'string',value:'roleName',text:'角色名称',dictCode:''})
         fieldList.push({type:'string',value:'roleLevel',text:'角色等级',dictCode:''})

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

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="角色类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
-              <j-dict-select-tag type="list" v-model="model.roleId" dictCode="travel_category,category_name,id" placeholder="请选择角色类型" />
+            <a-form-model-item label="角色类型(0-讲解员，1-达人，2-摄影师)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
+              <j-dict-select-tag type="list" v-model="model.roleId" dictCode="" placeholder="请选择角色类型(0-讲解员，1-达人，2-摄影师)" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

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

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '角色类型',
+    title: '角色类型(0-讲解员，1-达人，2-摄影师)',
     align:"center",
     dataIndex: 'roleId_dictText'
    },
@@ -82,11 +82,11 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '角色类型',
+    label: '角色类型(0-讲解员，1-达人，2-摄影师)',
     field: 'roleId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"travel_category,category_name,id"
+        dictCode:""
      },
   },
   {

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-21
+ * @Date:   2024-09-24
  * @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-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -51,14 +51,12 @@ public class TravelSpot implements Serializable {
 	@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")
-    @ApiModelProperty(value = "地点所属景区")
-    private java.lang.String areaId;
-	/**地点类型*/
-	@Excel(name = "地点类型", width = 15, dictTable = "travel_category", dicText = "category_name", dicCode = "id")
-	@Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id")
-    @ApiModelProperty(value = "地点类型")
-    private java.lang.String categoryId;
+	/**地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)*/
+	@Excel(name = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)", width = 15)
+    @ApiModelProperty(value = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)")
+    private java.lang.Integer areaId;
+	/**地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)*/
+	@Excel(name = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)", width = 15)
+    @ApiModelProperty(value = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)")
+    private java.lang.Integer categoryId;
 }

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-21
+ * @Date:   2024-09-24
  * @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-21
+ * @Date:   2024-09-24
  * @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-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

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

@@ -99,7 +99,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelSpotModal from './modules/TravelSpotModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelSpotList',
@@ -144,12 +143,12 @@
             dataIndex: 'spotLatitude'
           },
           {
-            title:'地点所属景区',
+            title:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
             align:"center",
             dataIndex: 'areaId_dictText'
           },
           {
-            title:'地点类型',
+            title:'地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
             align:"center",
             dataIndex: 'categoryId_dictText'
           },
@@ -191,8 +190,8 @@
         fieldList.push({type:'string',value:'spotImage',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"})
+        fieldList.push({type:'int',value:'areaId',text:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',dictCode:''})
+        fieldList.push({type:'int',value:'categoryId',text:'地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -24,13 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点所属景区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
-              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="travel_area,area_name,id" placeholder="请选择地点所属景区" />
+            <a-form-model-item label="地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
+              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="" placeholder="请选择地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="travel_category,category_name,id" placeholder="请选择地点类型" />
+            <a-form-model-item label="地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="" placeholder="请选择地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)" />
             </a-form-model-item>
           </a-col>
         </a-row>

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

@@ -26,12 +26,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'spotLatitude'
    },
    {
-    title: '地点所属景区',
+    title: '地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
     align:"center",
     dataIndex: 'areaId_dictText'
    },
    {
-    title: '地点类型',
+    title: '地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
     align:"center",
     dataIndex: 'categoryId_dictText'
    },
@@ -64,19 +64,19 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
   },
   {
-    label: '地点所属景区',
+    label: '地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',
     field: 'areaId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"travel_area,area_name,id"
+        dictCode:""
      },
   },
   {
-    label: '地点类型',
+    label: '地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',
     field: 'categoryId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"travel_category,category_name,id"
+        dictCode:""
      },
   },
 ];

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

@@ -7,6 +7,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -72,26 +73,26 @@ public class IndexApiController {
     }
 
     //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
-    @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表", notes="areaId: 0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区; categoryTyep: 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);
     }
 
 
-    /*//我的收藏
+    //我的收藏
     @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表")
-    @RequestMapping(value = "/queryCollection", method = {RequestMethod.GET})
-    public Result<?> queryCollection(String experienceId, PageBean pageBean){
-        return indexApiService.queryCollection(experienceId, pageBean);
+    @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET})
+    public Result<?> queryCollectionList(String collectionType, PageBean pageBean){
+        return indexApiService.queryCollectionList(collectionType, pageBean);
+    }
+
+    @ApiOperation(value="小程序-添加收藏", notes="小程序-添加收藏")
+    @RequestMapping(value = "/addCollection", method = {RequestMethod.POST})
+    public Result<?> addCollection(TravelCollection travelCollection){
+        return indexApiService.addCollection(travelCollection);
     }
 
-    //我的预约
-    @ApiOperation(value="小程序-获取我的预约列表", notes="小程序-获取我的预约列表")
-    @RequestMapping(value = "/queryPreOrder", method = {RequestMethod.GET})
-    public Result<?> queryPreOrder(String preOrderType, PageBean pageBean){
-        return indexApiService.queryPreOrder(preOrderType, pageBean);
-    }*/
 
     //文创好物-待补充
 

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

@@ -46,8 +46,8 @@ public class OrderApiController {
     //创建订单
     @ApiOperation(value = "创建订单",notes = "创建订单")
     @PostMapping("/createOrder")
-    public Result<?> createOrder(){
-        return orderApiService.createOrder();
+    public Result<?> addOrder(TravelOrder travelOrder){
+        return orderApiService.addOrder(travelOrder);
     }
 
     //立即支付

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

@@ -4,6 +4,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
 import org.jeecg.modules.travelOrder.entity.TravelOrder;
 import org.jeecg.modules.travelTime.entity.TravelTime;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
@@ -56,11 +57,11 @@ public interface IndexApiService {
     //非遗体验详情
     public Result<?> queryExperienceById(String experienceId);
 
-    //我的收藏
-    public Result<?> queryCollection(String collectionType, PageBean pageBean);
+    //我的收藏列表
+    public Result<?> queryCollectionList(String collectionType, PageBean pageBean);
 
-    //我的预约
-    public Result<?> queryPreOrder(String collectionType, PageBean pageBean);
+    //添加收藏
+    public Result<?> addCollection(TravelCollection travelCollection);
 
     //查询地址
     public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean);

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

@@ -1,10 +1,11 @@
 package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.travelOrder.entity.TravelOrder;
 
 public interface OrderApiService {
     //创建订单
-    Result<?> createOrder();
+    Result<?> addOrder(TravelOrder travelOrder);
 
     //立即支付
     Result<?> payOrder();

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

@@ -18,6 +18,8 @@ import org.jeecg.modules.travelArticle.service.ITravelArticleService;
 import org.jeecg.modules.travelCategory.entity.TravelCategory;
 import org.jeecg.modules.travelCategory.service.ITravelCategoryService;
 import org.jeecg.modules.travelCertification.service.ITravelCertificationService;
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import org.jeecg.modules.travelCollection.service.ITravelCollectionService;
 import org.jeecg.modules.travelExperience.entity.TravelExperience;
 import org.jeecg.modules.travelExperience.service.ITravelExperienceService;
 import org.jeecg.modules.travelImage.entity.TravelImage;
@@ -99,6 +101,10 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Resource
     private ITravelWaresService travelWaresService;
 
+    //收藏表
+    @Resource
+    private ITravelCollectionService travelCollectionService;
+
     //建议表
     @Resource
     private ITravelAdvanceService travelAdvanceService;
@@ -121,23 +127,6 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryBannerList(String bannerCategoryId) {
 
         //0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5-申遗历程
-        if(null != bannerCategoryId){
-            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 = "1836253741344075777";
-                    break;
-                default: bannerCategoryId = null;
-            }
-        }
 
         List<TravelImage> list = null;
         if(null != bannerCategoryId){
@@ -185,17 +174,6 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean) {
 
         //0-申遗历程 1-申遗缘由 2-遗产价值
-        if(null != articleType){
-            switch (articleType){
-                case "0": articleType = "1836253741344075777";
-                    break;
-                case "1": articleType = "1836253813855203330";
-                    break;
-                case "2": articleType = "1836253884822827009";
-                    break;
-                default: articleType = null;
-            }
-        }
 
         Page<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelArticle> pageList =null;
@@ -251,41 +229,12 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("景区详情", one);
     }
 
-    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿带分页
+    //获取地点列表-景点/厕所/美食店铺/民宿带分页
     @Override
     public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean) {
 
-        //0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区
-        if(null != areaId){
-            switch (areaId){
-                case "0": areaId = "1835255148875296770";
-                    break;
-                case "1": areaId = "1835296270515376130";
-                    break;
-                case "2": areaId = "1835296379189792769";
-                    break;
-                case "3": areaId = "1835296552271941634";
-                    break;
-                case "4": areaId = "1835296680814776322";
-                    break;
-                default: areaId = null;
-            }
-        }
-
-        //0-景点 1-美食店铺 2-民宿 3-厕所
-        if(null != categoryId){
-            switch (categoryId){
-                case "0": categoryId = "1835297869300174849";
-                    break;
-                case "1": categoryId = "1835298116864774146";
-                    break;
-                case "2": categoryId = "1835298190902628353";
-                    break;
-                case "3": categoryId = "1835297932831297538";
-                    break;
-                default: categoryId = null;
-            }
-        }
+        //areaId：0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区
+        //categoryId：0-景点 1-美食店铺 2-民宿 3-厕所
 
         Page<TravelSpot> page = new Page<TravelSpot>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelSpot> pageList = null;
@@ -319,20 +268,6 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean) {
 
         //roleId: 0-讲解员，1-达人，2-摄影师
-        if(null != roleId){
-            switch (roleId){
-                case "0":
-                    roleId = "1835298310465458178";
-                    break;
-                case "1":
-                    roleId = "1835298364374847490";
-                    break;
-                case "2":
-                    roleId = "1835298430967812098";
-                    break;
-                default: roleId = null;
-            }
-        }
 
         Page<TravelRoleInfo> page = new Page<TravelRoleInfo>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelRoleInfo> pageList = null;
@@ -488,18 +423,37 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("非遗体验详情", one);
     }
 
+    //获取我的收藏列表
     @Override
-    public Result<?> queryCollection(String collectionType, PageBean pageBean) {
+    public Result<?> queryCollectionList(String collectionType, PageBean pageBean) {
+        Page<TravelCollection> page = new Page<TravelCollection>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelCollection> pageList = null;
 
-        return null;
-    }
+        if(null != collectionType){
+            pageList = travelCollectionService
+                    .lambdaQuery()
+                    .eq(TravelCollection::getCollectionType, collectionType)
+                    .page(page);
+        }else {
+            pageList = travelCollectionService
+                    .lambdaQuery()
+                    .page(page);
+        }
 
+        return Result.OK("我的收藏列表", pageList);
+    }
 
-    @Override
-    public Result<?> queryPreOrder(String collectionType, PageBean pageBean) {
-        return null;
+    //新增收藏
+    public Result<?> addCollection(TravelCollection travelCollection) {
+        boolean flag = travelCollectionService.save(travelCollection);
+        if(flag){
+            return Result.OK("收藏成功！");
+        }else {
+            return Result.OK("收藏失败！");
+        }
     }
 
+
     //获取地址列表
     @Override
     public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean) {

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.apiService.impl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiService.OrderApiService;
 import org.jeecg.modules.pay.MpWxPayService;
+import org.jeecg.modules.travelOrder.entity.TravelOrder;
+import org.jeecg.modules.travelOrder.service.ITravelOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,13 +16,22 @@ public class OrderApiServiceImpl implements OrderApiService {
     @Autowired
     private MpWxPayService mpWxPayService;
 
+    //订单接口
+    @Autowired
+    private ITravelOrderService travelOrderService;
+
 
 
     //创建订单
     @Override
-    public Result<?> createOrder()
+    public Result<?> addOrder(TravelOrder travelOrder)
     {
-        return null;
+        boolean flag = travelOrderService.save(travelOrder);
+        if(flag){
+            return Result.OK("创建订单成功！");
+        }else {
+            return Result.OK("创建订单失败！");
+        }
     }
 
     //立即支付