1、添加接口信息 2、修改数据库设计

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/ITraveAreaService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.traveArea.service;
-
-import org.jeecg.modules.traveArea.entity.TraveArea;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 景区表
- * @Author: jeecg-boot
- * @Date:   2024-09-14
- * @Version: V1.0
- */
-public interface ITraveAreaService extends IService<TraveArea> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/service/impl/TraveAreaServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.traveArea.service.impl;
-
-import org.jeecg.modules.traveArea.entity.TraveArea;
-import org.jeecg.modules.traveArea.mapper.TraveAreaMapper;
-import org.jeecg.modules.traveArea.service.ITraveAreaService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 景区表
- * @Author: jeecg-boot
- * @Date:   2024-09-14
- * @Version: V1.0
- */
-@Service
-public class TraveAreaServiceImpl extends ServiceImpl<TraveAreaMapper, TraveArea> implements ITraveAreaService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/controller/TraveAreaController.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/controller/TravelAreaController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.traveArea.controller;
+package org.jeecg.modules.travelArea.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.traveArea.entity.TraveArea;
-import org.jeecg.modules.traveArea.service.ITraveAreaService;
+import org.jeecg.modules.travelArea.entity.TravelArea;
+import org.jeecg.modules.travelArea.service.ITravelAreaService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,21 +39,21 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 景区表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Api(tags="景区表")
 @RestController
-@RequestMapping("/traveArea/traveArea")
+@RequestMapping("/travelArea/travelArea")
 @Slf4j
-public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaService> {
+public class TravelAreaController extends JeecgController<TravelArea, ITravelAreaService> {
 	@Autowired
-	private ITraveAreaService traveAreaService;
+	private ITravelAreaService travelAreaService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param traveArea
+	 * @param travelArea
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -62,41 +62,41 @@ public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaSe
 	//@AutoLog(value = "景区表-分页列表查询")
 	@ApiOperation(value="景区表-分页列表查询", notes="景区表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<TraveArea>> queryPageList(TraveArea traveArea,
+	public Result<IPage<TravelArea>> queryPageList(TravelArea travelArea,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<TraveArea> queryWrapper = QueryGenerator.initQueryWrapper(traveArea, req.getParameterMap());
-		Page<TraveArea> page = new Page<TraveArea>(pageNo, pageSize);
-		IPage<TraveArea> pageList = traveAreaService.page(page, queryWrapper);
+		QueryWrapper<TravelArea> queryWrapper = QueryGenerator.initQueryWrapper(travelArea, req.getParameterMap());
+		Page<TravelArea> page = new Page<TravelArea>(pageNo, pageSize);
+		IPage<TravelArea> pageList = travelAreaService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param traveArea
+	 * @param travelArea
 	 * @return
 	 */
 	@AutoLog(value = "景区表-添加")
 	@ApiOperation(value="景区表-添加", notes="景区表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody TraveArea traveArea) {
-		traveAreaService.save(traveArea);
+	public Result<String> add(@RequestBody TravelArea travelArea) {
+		travelAreaService.save(travelArea);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param traveArea
+	 * @param travelArea
 	 * @return
 	 */
 	@AutoLog(value = "景区表-编辑")
 	@ApiOperation(value="景区表-编辑", notes="景区表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody TraveArea traveArea) {
-		traveAreaService.updateById(traveArea);
+	public Result<String> edit(@RequestBody TravelArea travelArea) {
+		travelAreaService.updateById(travelArea);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -110,7 +110,7 @@ public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaSe
 	@ApiOperation(value="景区表-通过id删除", notes="景区表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		traveAreaService.removeById(id);
+		travelAreaService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -124,7 +124,7 @@ public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaSe
 	@ApiOperation(value="景区表-批量删除", notes="景区表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.traveAreaService.removeByIds(Arrays.asList(ids.split(",")));
+		this.travelAreaService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -137,23 +137,23 @@ public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaSe
 	//@AutoLog(value = "景区表-通过id查询")
 	@ApiOperation(value="景区表-通过id查询", notes="景区表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<TraveArea> queryById(@RequestParam(name="id",required=true) String id) {
-		TraveArea traveArea = traveAreaService.getById(id);
-		if(traveArea==null) {
+	public Result<TravelArea> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelArea travelArea = travelAreaService.getById(id);
+		if(travelArea==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(traveArea);
+		return Result.OK(travelArea);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param traveArea
+    * @param travelArea
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, TraveArea traveArea) {
-        return super.exportXls(request, traveArea, TraveArea.class, "景区表");
+    public ModelAndView exportXls(HttpServletRequest request, TravelArea travelArea) {
+        return super.exportXls(request, travelArea, TravelArea.class, "景区表");
     }
 
     /**
@@ -165,7 +165,7 @@ public class TraveAreaController extends JeecgController<TraveArea, ITraveAreaSe
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, TraveArea.class);
+        return super.importExcel(request, response, TravelArea.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/entity/TraveArea.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/entity/TravelArea.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.traveArea.entity;
+package org.jeecg.modules.travelArea.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -20,15 +20,15 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 景区表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Data
-@TableName("trave_area")
+@TableName("travel_area")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="trave_area对象", description="景区表")
-public class TraveArea implements Serializable {
+@ApiModel(value="travel_area对象", description="景区表")
+public class TravelArea implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/TraveAreaMapper.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/TravelAreaMapper.java

@@ -1,17 +1,17 @@
-package org.jeecg.modules.traveArea.mapper;
+package org.jeecg.modules.travelArea.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.traveArea.entity.TraveArea;
+import org.jeecg.modules.travelArea.entity.TravelArea;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Description: 景区表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
-public interface TraveAreaMapper extends BaseMapper<TraveArea> {
+public interface TravelAreaMapper extends BaseMapper<TravelArea> {
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/mapper/xml/TraveAreaMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/mapper/xml/TravelAreaMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.traveArea.mapper.TraveAreaMapper">
+<mapper namespace="org.jeecg.modules.travelArea.mapper.TravelAreaMapper">
 
 </mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/ITravelAreaService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelArea.service;
+
+import org.jeecg.modules.travelArea.entity.TravelArea;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 景区表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-15
+ * @Version: V1.0
+ */
+public interface ITravelAreaService extends IService<TravelArea> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/service/impl/TravelAreaServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelArea.service.impl;
+
+import org.jeecg.modules.travelArea.entity.TravelArea;
+import org.jeecg.modules.travelArea.mapper.TravelAreaMapper;
+import org.jeecg.modules.travelArea.service.ITravelAreaService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 景区表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-15
+ * @Version: V1.0
+ */
+@Service
+public class TravelAreaServiceImpl extends ServiceImpl<TravelAreaMapper, TravelArea> implements ITravelAreaService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/TraveAreaList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/TravelAreaList.vue

@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <trave-area-modal ref="modalForm" @ok="modalFormOk"></trave-area-modal>
+    <travel-area-modal ref="modalForm" @ok="modalFormOk"></travel-area-modal>
   </a-card>
 </template>
 
@@ -98,13 +98,13 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TraveAreaModal from './modules/TraveAreaModal'
+  import TravelAreaModal from './modules/TravelAreaModal'
 
   export default {
-    name: 'TraveAreaList',
+    name: 'TravelAreaList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TraveAreaModal
+      TravelAreaModal
     },
     data () {
       return {
@@ -153,11 +153,11 @@
           }
         ],
         url: {
-          list: "/traveArea/traveArea/list",
-          delete: "/traveArea/traveArea/delete",
-          deleteBatch: "/traveArea/traveArea/deleteBatch",
-          exportXlsUrl: "/traveArea/traveArea/exportXls",
-          importExcelUrl: "traveArea/traveArea/importExcel",
+          list: "/travelArea/travelArea/list",
+          delete: "/travelArea/travelArea/delete",
+          deleteBatch: "/travelArea/travelArea/deleteBatch",
+          exportXlsUrl: "/travelArea/travelArea/exportXls",
+          importExcelUrl: "travelArea/travelArea/importExcel",
           
         },
         dictOptions:{},

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaForm.vue

@@ -35,7 +35,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TraveAreaForm',
+    name: 'TravelAreaForm',
     components: {
     },
     props: {
@@ -62,9 +62,9 @@
         validatorRules: {
         },
         url: {
-          add: "/traveArea/traveArea/add",
-          edit: "/traveArea/traveArea/edit",
-          queryById: "/traveArea/traveArea/queryById"
+          add: "/travelArea/travelArea/add",
+          edit: "/travelArea/travelArea/edit",
+          queryById: "/travelArea/travelArea/queryById"
         }
       }
     },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <trave-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></trave-area-form>
+    <travel-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-area-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import TraveAreaForm from './TraveAreaForm'
+  import TravelAreaForm from './TravelAreaForm'
 
   export default {
-    name: 'TraveAreaModal',
+    name: 'TravelAreaModal',
     components: {
-      TraveAreaForm
+      TravelAreaForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue/modules/TraveAreaModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue/modules/TravelAreaModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <trave-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></trave-area-form>
+    <travel-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-area-form>
   </j-modal>
 </template>
 
 <script>
 
-  import TraveAreaForm from './TraveAreaForm'
+  import TravelAreaForm from './TravelAreaForm'
   export default {
-    name: 'TraveAreaModal',
+    name: 'TravelAreaModal',
     components: {
-      TraveAreaForm
+      TravelAreaForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue3/TraveArea.api.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue3/TravelArea.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/traveArea/traveArea/list',
-  save='/traveArea/traveArea/add',
-  edit='/traveArea/traveArea/edit',
-  deleteOne = '/traveArea/traveArea/delete',
-  deleteBatch = '/traveArea/traveArea/deleteBatch',
-  importExcel = '/traveArea/traveArea/importExcel',
-  exportXls = '/traveArea/traveArea/exportXls',
+  list = '/travelArea/travelArea/list',
+  save='/travelArea/travelArea/add',
+  edit='/travelArea/travelArea/edit',
+  deleteOne = '/travelArea/travelArea/delete',
+  deleteBatch = '/travelArea/travelArea/deleteBatch',
+  importExcel = '/travelArea/travelArea/importExcel',
+  exportXls = '/travelArea/travelArea/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue3/TraveAreaList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue3/TravelAreaList.vue

@@ -35,18 +35,18 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <TraveAreaModal @register="registerModal" @success="handleSuccess"></TraveAreaModal>
+    <TravelAreaModal @register="registerModal" @success="handleSuccess"></TravelAreaModal>
   </div>
 </template>
 
-<script lang="ts" name="traveArea-traveArea" setup>
+<script lang="ts" name="travelArea-travelArea" setup>
   import {ref, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import {useModal} from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
-  import TraveAreaModal from './components/TraveAreaModal.vue'
-  import {columns, searchFormSchema} from './traveArea.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './traveArea.api';
+  import TravelAreaModal from './components/TravelAreaModal.vue'
+  import {columns, searchFormSchema} from './travelArea.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelArea.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/traveArea/vue3/components/TraveAreaModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelArea/vue3/components/TravelAreaModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../traveArea.data';
-    import {saveOrUpdate} from '../traveArea.api';
+    import {formSchema} from '../travelArea.data';
+    import {saveOrUpdate} from '../travelArea.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Api(tags="分类表")

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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Data
@@ -40,7 +40,8 @@ public class TravelCategory implements Serializable {
     @ApiModelProperty(value = "分类名称")
     private java.lang.String categoryName;
 	/**父级分类*/
-	@Excel(name = "父级分类", width = 15)
+	@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 categoryPid;
 }

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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 public interface TravelCategoryMapper extends BaseMapper<TravelCategory> {

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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 public interface ITravelCategoryService extends IService<TravelCategory> {

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/TravelCategoryList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelCategoryModal from './modules/TravelCategoryModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelCategoryList',
@@ -129,7 +130,7 @@
           {
             title:'父级分类',
             align:"center",
-            dataIndex: 'categoryPid'
+            dataIndex: 'categoryPid_dictText'
           },
           {
             title: '操作',
@@ -166,7 +167,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'categoryName',text:'分类名称',dictCode:''})
-        fieldList.push({type:'string',value:'categoryPid',text:'父级分类',dictCode:''})
+        fieldList.push({type:'string',value:'categoryPid',text:'父级分类',dictCode:"travel_category,category_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue/modules/TravelCategoryForm.vue

@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="父级分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryPid">
-              <a-input v-model="model.categoryPid" placeholder="请输入父级分类"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.categoryPid" dictCode="travel_category,category_name,id" placeholder="请选择父级分类" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCategory/vue3/TravelCategory.data.ts

@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
    {
     title: '父级分类',
     align:"center",
-    dataIndex: 'categoryPid'
+    dataIndex: 'categoryPid_dictText'
    },
 ];
 //查询数据
@@ -28,6 +28,9 @@ export const formSchema: FormSchema[] = [
   {
     label: '父级分类',
     field: 'categoryPid',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_category,category_name,id"
+     },
   },
 ];

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-14
+ * @Date:   2024-09-15
  * @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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Data
@@ -36,7 +36,8 @@ public class TravelRoleInfo implements Serializable {
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 	/**角色类型*/
-	@Excel(name = "角色类型", width = 15)
+	@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;
 	/**角色头像*/
@@ -58,7 +59,7 @@ public class TravelRoleInfo implements Serializable {
 	/**预约价格*/
 	@Excel(name = "预约价格", width = 15)
     @ApiModelProperty(value = "预约价格")
-    private java.lang.String price;
+    private java.lang.Double price;
 	/**预约信息*/
 	@Excel(name = "预约信息", width = 15)
     @ApiModelProperty(value = "预约信息")
@@ -76,7 +77,8 @@ public class TravelRoleInfo implements Serializable {
     @ApiModelProperty(value = "个人简介")
     private java.lang.String brief;
 	/**所属用户*/
-	@Excel(name = "所属用户", width = 15)
+	@Excel(name = "所属用户", width = 15, dictTable = "travel_user", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "travel_user", 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-14
+ * @Date:   2024-09-15
  * @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-14
+ * @Date:   2024-09-15
  * @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-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Service

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

@@ -125,12 +125,13 @@
           {
             title:'角色类型',
             align:"center",
-            dataIndex: 'roleId'
+            dataIndex: 'roleId_dictText'
           },
           {
             title:'角色头像',
             align:"center",
-            dataIndex: 'roleHead'
+            dataIndex: 'roleHead',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'角色名称',
@@ -175,7 +176,7 @@
           {
             title:'所属用户',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title: '操作',
@@ -211,12 +212,12 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'roleId',text:'角色类型',dictCode:"travel_role,role_name,id"})
+        fieldList.push({type:'string',value:'roleId',text:'角色类型',dictCode:"travel_category,category_name,id"})
         fieldList.push({type:'string',value:'roleHead',text:'角色头像',dictCode:''})
         fieldList.push({type:'string',value:'roleName',text:'角色名称',dictCode:''})
         fieldList.push({type:'string',value:'roleLevel',text:'角色等级',dictCode:''})
         fieldList.push({type:'string',value:'preTime',text:'预约时间',dictCode:''})
-        fieldList.push({type:'string',value:'price',text:'预约价格',dictCode:''})
+        fieldList.push({type:'double',value:'price',text:'预约价格',dictCode:''})
         fieldList.push({type:'string',value:'preInfo',text:'预约信息',dictCode:''})
         fieldList.push({type:'string',value:'recommend',text:'推荐度',dictCode:''})
         fieldList.push({type:'string',value:'skill',text:'专业擅长',dictCode:''})

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

@@ -5,12 +5,12 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="角色类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
-              <a-input v-model="model.roleId" placeholder="请输入角色类型"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.roleId" dictCode="travel_category,category_name,id" placeholder="请选择角色类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="角色头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleHead">
-              <a-input v-model="model.roleHead" placeholder="请输入角色头像"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.roleHead" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="预约价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input v-model="model.price" placeholder="请输入预约价格"  ></a-input>
+              <a-input-number v-model="model.price" placeholder="请输入预约价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="所属用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入所属用户"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="travel_user,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

@@ -7,12 +7,13 @@ export const columns: BasicColumn[] = [
     {
     title: '角色类型',
     align:"center",
-    dataIndex: 'roleId'
+    dataIndex: 'roleId_dictText'
    },
    {
     title: '角色头像',
     align:"center",
-    dataIndex: 'roleHead'
+    dataIndex: 'roleHead',
+    customRender:render.renderAvatar,
    },
    {
     title: '角色名称',
@@ -57,7 +58,7 @@ export const columns: BasicColumn[] = [
    {
     title: '所属用户',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
 ];
 //查询数据
@@ -68,12 +69,17 @@ export const formSchema: FormSchema[] = [
   {
     label: '角色类型',
     field: 'roleId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_category,category_name,id"
+     },
   },
   {
     label: '角色头像',
     field: 'roleHead',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '角色名称',
@@ -93,7 +99,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '预约价格',
     field: 'price',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '预约信息',
@@ -118,6 +124,9 @@ export const formSchema: FormSchema[] = [
   {
     label: '所属用户',
     field: 'userId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_user,nick_name,id"
+     },
   },
 ];

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

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 景点表
+ * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
-@Api(tags="景点表")
+@Api(tags="地点表")
 @RestController
 @RequestMapping("/travelSpot/travelSpot")
 @Slf4j
@@ -59,8 +59,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "景点表-分页列表查询")
-	@ApiOperation(value="景点表-分页列表查询", notes="景点表-分页列表查询")
+	//@AutoLog(value = "地点表-分页列表查询")
+	@ApiOperation(value="地点表-分页列表查询", notes="地点表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<TravelSpot>> queryPageList(TravelSpot travelSpot,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param travelSpot
 	 * @return
 	 */
-	@AutoLog(value = "景点表-添加")
-	@ApiOperation(value="景点表-添加", notes="景点表-添加")
+	@AutoLog(value = "地点表-添加")
+	@ApiOperation(value="地点表-添加", notes="地点表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TravelSpot travelSpot) {
 		travelSpotService.save(travelSpot);
@@ -92,8 +92,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param travelSpot
 	 * @return
 	 */
-	@AutoLog(value = "景点表-编辑")
-	@ApiOperation(value="景点表-编辑", notes="景点表-编辑")
+	@AutoLog(value = "地点表-编辑")
+	@ApiOperation(value="地点表-编辑", notes="地点表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TravelSpot travelSpot) {
 		travelSpotService.updateById(travelSpot);
@@ -106,8 +106,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "景点表-通过id删除")
-	@ApiOperation(value="景点表-通过id删除", notes="景点表-通过id删除")
+	@AutoLog(value = "地点表-通过id删除")
+	@ApiOperation(value="地点表-通过id删除", notes="地点表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		travelSpotService.removeById(id);
@@ -120,8 +120,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "景点表-批量删除")
-	@ApiOperation(value="景点表-批量删除", notes="景点表-批量删除")
+	@AutoLog(value = "地点表-批量删除")
+	@ApiOperation(value="地点表-批量删除", notes="地点表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.travelSpotService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "景点表-通过id查询")
-	@ApiOperation(value="景点表-通过id查询", notes="景点表-通过id查询")
+	//@AutoLog(value = "地点表-通过id查询")
+	@ApiOperation(value="地点表-通过id查询", notes="地点表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<TravelSpot> queryById(@RequestParam(name="id",required=true) String id) {
 		TravelSpot travelSpot = travelSpotService.getById(id);
@@ -153,7 +153,7 @@ public class TravelSpotController extends JeecgController<TravelSpot, ITravelSpo
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TravelSpot travelSpot) {
-        return super.exportXls(request, travelSpot, TravelSpot.class, "景点表");
+        return super.exportXls(request, travelSpot, TravelSpot.class, "地点表");
     }
 
     /**

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

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 景点表
+ * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Data
 @TableName("travel_spot")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="travel_spot对象", description="景点表")
+@ApiModel(value="travel_spot对象", description="地点表")
 public class TravelSpot implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -35,20 +35,26 @@ public class TravelSpot implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
-	/**景点名字*/
-	@Excel(name = "景点名字", width = 15)
-    @ApiModelProperty(value = "景点名字")
+	/**地点名字*/
+	@Excel(name = "地点名字", width = 15)
+    @ApiModelProperty(value = "地点名字")
     private java.lang.String spotName;
-	/**景点图片*/
-	@Excel(name = "景点图片", width = 15)
-    @ApiModelProperty(value = "景点图片")
+	/**地点图片*/
+	@Excel(name = "地点图片", width = 15)
+    @ApiModelProperty(value = "地点图片")
     private java.lang.String spotImage;
-	/**景点坐标(经纬度)*/
-	@Excel(name = "景点坐标(经纬度)", width = 15)
-    @ApiModelProperty(value = "景点坐标(经纬度)")
+	/**地点坐标(经纬度)*/
+	@Excel(name = "地点坐标(经纬度)", width = 15)
+    @ApiModelProperty(value = "地点坐标(经纬度)")
     private java.lang.String spotPosition;
-	/**景点所属景区*/
-	@Excel(name = "景点所属景区", width = 15)
-    @ApiModelProperty(value = "景点所属景区")
+	/**地点所属景区*/
+	@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;
 }

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

@@ -7,9 +7,9 @@ import org.jeecg.modules.travelSpot.entity.TravelSpot;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 景点表
+ * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @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

@@ -4,9 +4,9 @@ import org.jeecg.modules.travelSpot.entity.TravelSpot;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 景点表
+ * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @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

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 景点表
+ * @Description: 地点表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-15
  * @Version: V1.0
  */
 @Service

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

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('景点表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('地点表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '景点表管理页面',
+        description: '地点表管理页面',
         // 表头
         columns: [
           {
@@ -123,25 +123,30 @@
             }
           },
           {
-            title:'景点名字',
+            title:'地点名字',
             align:"center",
             dataIndex: 'spotName'
           },
           {
-            title:'景点图片',
+            title:'地点图片',
             align:"center",
             dataIndex: 'spotImage',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'景点坐标(经纬度)',
+            title:'地点坐标(经纬度)',
             align:"center",
             dataIndex: 'spotPosition'
           },
           {
-            title:'景点所属景区',
+            title:'地点所属景区',
             align:"center",
-            dataIndex: 'areaId'
+            dataIndex: 'areaId_dictText'
+          },
+          {
+            title:'地点类型',
+            align:"center",
+            dataIndex: 'categoryId_dictText'
           },
           {
             title: '操作',
@@ -177,10 +182,11 @@
       },
       getSuperFieldList(){
         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:'string',value:'areaId',text:'景点所属景区',dictCode:"travel_area,area_name,id"})
+        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:'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

@@ -4,23 +4,28 @@
       <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="spotName">
-              <a-input v-model="model.spotName" placeholder="请输入景点名字"  ></a-input>
+            <a-form-model-item label="地点名字" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotName">
+              <a-input v-model="model.spotName" placeholder="请输入地点名字"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="景点图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotImage">
+            <a-form-model-item label="地点图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotImage">
               <j-image-upload isMultiple  v-model="model.spotImage" ></j-image-upload>
             </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="spotPosition">
+              <a-input v-model="model.spotPosition" placeholder="请输入地点坐标(经纬度)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="景点所属景区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
-              <a-input v-model="model.areaId" placeholder="请输入景点所属景区"  ></a-input>
+            <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>
+          </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>
           </a-col>
         </a-row>

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

@@ -5,25 +5,30 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '景点名字',
+    title: '地点名字',
     align:"center",
     dataIndex: 'spotName'
    },
    {
-    title: '景点图片',
+    title: '地点图片',
     align:"center",
     dataIndex: 'spotImage',
     customRender:render.renderAvatar,
    },
    {
-    title: '景点坐标(经纬度)',
+    title: '地点坐标(经纬度)',
     align:"center",
     dataIndex: 'spotPosition'
    },
    {
-    title: '景点所属景区',
+    title: '地点所属景区',
     align:"center",
-    dataIndex: 'areaId'
+    dataIndex: 'areaId_dictText'
+   },
+   {
+    title: '地点类型',
+    align:"center",
+    dataIndex: 'categoryId_dictText'
    },
 ];
 //查询数据
@@ -32,25 +37,36 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '景点名字',
+    label: '地点名字',
     field: 'spotName',
     component: 'Input',
   },
   {
-    label: '景点图片',
+    label: '地点图片',
     field: 'spotImage',
      component: 'JImageUpload',
      componentProps:{
       },
   },
   {
-    label: '景点坐标(经纬度)',
+    label: '地点坐标(经纬度)',
     field: 'spotPosition',
     component: 'Input',
   },
   {
-    label: '景点所属景区',
+    label: '地点所属景区',
     field: 'areaId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_area,area_name,id"
+     },
+  },
+  {
+    label: '地点类型',
+    field: 'categoryId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_category,category_name,id"
+     },
   },
 ];

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

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '景点表',
+           title: '地点表',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"景点表",
+            name:"地点表",
             url: getExportUrl,
           },
           importConfig: {

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

@@ -0,0 +1,126 @@
+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.apiService.IndexApiService;
+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 javax.annotation.Resource;
+
+
+@Api(tags="小程序-首页相关接口")
+@RestController
+@RequestMapping("/api/info")
+@Slf4j
+public class IndexApiController {
+
+    @Resource
+    private IndexApiService indexApiService;
+
+    //获取小程序任一文章或服务
+
+    //获取banner图列表
+    @ApiOperation(value="小程序-获取banner图列表", notes="小程序-获取banner图列表")
+    @GetMapping()
+    @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET})
+    public Result<?> queryBannerList(String bannerCategoryId){
+        return indexApiService.queryBannerList(bannerCategoryId);
+    };
+
+    //获取视频列表
+    @ApiOperation(value="小程序-获取视频列表", notes="小程序-获取视频列表")
+    @RequestMapping(value = "/queryVideoList", method = {RequestMethod.GET})
+    public Result<?> queryVideoList(){
+        return indexApiService.queryVideoList();
+    }
+
+    //获取文章列表-申遗历程/非遗体验
+    @ApiOperation(value="小程序-获取文章列表", notes="小程序-获取文章列表")
+    @RequestMapping(value = "/queryArticleList", method = {RequestMethod.GET})
+    public Result<?> queryArticleList(){
+        return indexApiService.queryArticleList();
+    }
+
+    //根据分类获取文章列表
+    @ApiOperation(value="小程序-根据分类获取文章列表", notes="小程序-根据分类获取文章列表")
+    @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET})
+    public Result<?> queryArticleListByType(String articleType){
+        return indexApiService.queryArticleListByType(articleType);
+    }
+
+    //根据id获取文章详情
+    @ApiOperation(value="小程序-根据id获取文章详情", notes="小程序-根据id获取文章详情")
+    @RequestMapping(value = "/queryArticleById", method = {RequestMethod.GET})
+    public Result<?> queryArticleById(String articleId){
+        return indexApiService.queryArticleById(articleId);
+    }
+
+    //获取景区列表
+    @ApiOperation(value="小程序-获取景区列表", notes="小程序-获取景区列表")
+    @RequestMapping(value = "/queryAreaList", method = {RequestMethod.GET})
+    public Result<?> queryAreaList(){
+        return indexApiService.queryAreaList();
+    }
+
+    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
+    @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿", notes="1-景区，2-厕所，3-美食店铺，4-民宿")
+    @RequestMapping(value = "/querySpotList", method = {RequestMethod.GET})
+    public Result<?> querySpotList(String areaId, int spotType){
+        return indexApiService.querySpotList(areaId, spotType);
+    }
+
+    //根据角色类型获取角色信息列表-讲解员/达人/摄影师
+    @ApiOperation(value="小程序-根据角色类型获取角色信息列表-讲解员/达人/摄影师", notes="1-讲解员，2-达人，3-摄影师")
+    @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
+    public Result<?> queryRoleInfoList(String roleType, String level, String spot){
+        return indexApiService.queryRoleInfoList(roleType, level, spot);
+    }
+
+    //根据角色id获取角色信息详情
+    @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="小程序-根据角色类型获取角色信息列表")
+    @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET})
+    public Result<?> queryRoleInfoById(String roleInfoId){
+        return indexApiService.queryRoleInfoById(roleInfoId);
+    }
+
+    //根据角色id获取视频列表
+    @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表")
+    @RequestMapping(value = "/queryVedioBySpot", method = {RequestMethod.GET})
+    public Result<?> queryVedioById(String roleInfoId){
+        return indexApiService.queryVedioById(roleInfoId);
+    }
+
+    //遗产路径-待补充
+
+    //我要研学-待补充
+
+    //文创好物-待补充
+
+    //瓷都美食-链接美团
+
+    //精品民宿-链接高德地图
+
+    //无忧租车-链接滴滴打车
+
+    //添加建议
+    @ApiOperation(value="小程序-添加建议", notes="小程序-添加建议")
+    @RequestMapping(value = "/addAdvice", method = {RequestMethod.POST})
+    public Result<?> addAdvice(){
+        return indexApiService.addAdvice();
+    }
+
+    /*************************我的***********************************/
+    //添加志愿者
+    @ApiOperation(value="小程序-添加支援者", notes="小程序-添加支援者")
+    @RequestMapping(value = "/addVolunteer", method = {RequestMethod.POST})
+    public Result<?> addVolunteer(){
+        return indexApiService.addVolunteer();
+    }
+
+
+}

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

@@ -1,27 +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.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;
-
-
-@Api(tags="小程序-详情相关接口")
-@RestController
-@RequestMapping("/api/info")
-@Slf4j
-public class InfoApiController {
-
-
-    //获取banner图列表接口
-    @ApiOperation(value="小程序-获取banner图列表接口", notes="小程序-获取banner图列表接口")
-    @GetMapping("/queryBannerList")
-    public Result<?> queryBannerList(String bannerCategoryId){
-        return Result.OK();
-    };
-
-}

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

@@ -0,0 +1,57 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+
+public interface IndexApiService {
+    //获取小程序任一文章或服务
+
+    //获取banner图列表
+    public Result<?> queryBannerList(String bannerCategoryId);
+
+    //获取视频列表
+    public Result<?> queryVideoList();
+
+    //获取文章列表-申遗历程/非遗体验
+    public Result<?> queryArticleList();
+
+    //根据分类获取文章列表
+    public Result<?> queryArticleListByType(String articleType);
+
+    //根据id获取文章详情
+    public Result<?> queryArticleById(String articleId);
+
+    //获取景区列表
+    public Result<?> queryAreaList();
+
+    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
+    public Result<?> querySpotList(String areaId, int spotType);
+
+    //根据角色类型获取角色信息列表-讲解员/达人/摄影师
+    public Result<?> queryRoleInfoList(String roleType, String level, String spot);
+
+    //根据角色id获取角色信息详情
+    public Result<?> queryRoleInfoById(String roleInfoId);
+
+    //根据角色id获取视频列表
+    public Result<?> queryVedioById(String roleInfoId);
+
+    //遗产路径-待补充
+
+    //我要研学-待补充
+
+    //文创好物-待补充
+
+    //瓷都美食-链接美团
+
+    //精品民宿-链接高德地图
+
+    //无忧租车-链接滴滴打车
+
+    //添加建议
+    public Result<?> addAdvice();
+
+    /*************************我的***********************************/
+    //添加志愿者
+    public Result<?> addVolunteer();
+
+}

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

@@ -1,4 +0,0 @@
-package org.jeecg.modules.apiService;
-
-public interface InfoApiService {
-}

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

@@ -0,0 +1,185 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.sun.org.glassfish.external.statistics.annotations.Reset;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiService.IndexApiService;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.travelArea.entity.TravelArea;
+import org.jeecg.modules.travelArea.service.ITravelAreaService;
+import org.jeecg.modules.travelArticle.entity.TravelArticle;
+import org.jeecg.modules.travelArticle.service.ITravelArticleService;
+import org.jeecg.modules.travelCategory.service.ITravelCategoryService;
+import org.jeecg.modules.travelCertification.service.ITravelCertificationService;
+import org.jeecg.modules.travelImage.entity.TravelImage;
+import org.jeecg.modules.travelImage.service.ITravelImageService;
+import org.jeecg.modules.travelOrder.service.ITravelOrderService;
+import org.jeecg.modules.travelRole.service.ITravelRoleService;
+import org.jeecg.modules.travelRoleInfo.entity.TravelRoleInfo;
+import org.jeecg.modules.travelRoleInfo.service.ITravelRoleInfoService;
+import org.jeecg.modules.travelSpot.entity.TravelSpot;
+import org.jeecg.modules.travelSpot.service.ITravelSpotService;
+import org.jeecg.modules.travelVideo.entity.TravelVideo;
+import org.jeecg.modules.travelVideo.service.ITravelVideoService;
+import org.jeecg.modules.travelVolunteer.service.ITravelVolunteerService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class IndexApiServiceImpl implements IndexApiService {
+
+    //获取小程序任一文章或服务
+
+    //用户表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //角色表
+    @Resource
+    private ITravelRoleService travelRoleService;
+    //角色信息表
+    @Resource
+    private ITravelRoleInfoService travelRoleInfoService;
+    //景区表
+    @Resource
+    private ITravelAreaService travelAreaService;
+    //景点表
+    @Resource
+    private ITravelSpotService travelSpotService;
+    //分类表
+    @Resource
+    private ITravelCategoryService travelCategoryService;
+    //图片表
+    @Resource
+    private ITravelImageService travelImageService;
+    //文章表
+    @Resource
+    private ITravelArticleService travelArticleService;
+    //视频表
+    @Resource
+    private ITravelVideoService travelVideoService;
+    //证件表
+    @Resource
+    private ITravelCertificationService travelCertificationService;
+    //订单表
+    @Resource
+    private ITravelOrderService travelOrderService;
+    //志愿者表
+    @Resource
+    private ITravelVolunteerService travelVolunteerService;
+
+    //获取轮播图列表
+    @Override
+    public Result<?> queryBannerList(String bannerCategoryId) {
+        List<TravelImage> list = travelImageService
+                .lambdaQuery()
+                .eq(TravelImage::getCategoryId, bannerCategoryId)
+                .list();
+
+        return Result.OK("轮播图列表", list);
+    }
+
+    //获取视频列表
+    @Override
+    public Result<?> queryVideoList() {
+        List<TravelVideo> list = travelVideoService.list();
+
+        return Result.OK("视频列表", list);
+    }
+
+    //获取文章列表
+    @Override
+    public Result<?> queryArticleList() {
+        List<TravelArticle> list = travelArticleService.list();
+
+        return Result.OK("文章列表", list);
+    }
+
+    //根据文章类型获取文章列表
+    @Override
+    public Result<?> queryArticleListByType(String articleType) {
+        List<TravelArticle> list = travelArticleService
+                .lambdaQuery()
+                .eq(TravelArticle::getCategoryId, articleType)
+                .list();
+
+        return Result.OK("文章列表", list);
+    }
+
+    //根据文章id获取文章详情
+    @Override
+    public Result<?> queryArticleById(String articleId) {
+        TravelArticle one = travelArticleService
+                .lambdaQuery()
+                .eq(TravelArticle::getId, articleId)
+                .one();
+
+        return Result.OK("文章列表", one);
+    }
+
+    //获取景区列表
+    @Override
+    public Result<?> queryAreaList() {
+        List<TravelArea> list = travelAreaService.list();
+
+        return Result.OK("景区列表", list);
+    }
+
+    //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
+    @Override
+    public Result<?> querySpotList(String areaId, int spotType) {
+        List<TravelSpot> list = travelSpotService
+                .lambdaQuery()
+                .eq(TravelSpot::getAreaId, areaId)
+                .list();
+
+        return Result.OK("景点列表", list);
+    }
+
+    //根据角色类型获取角色信息列表
+    @Override
+    public Result<?> queryRoleInfoList(String roleType, String level, String spot) {
+        List<TravelRoleInfo> list = travelRoleInfoService
+                .lambdaQuery()
+                .eq(TravelRoleInfo::getRoleId, roleType)
+                .eq(TravelRoleInfo::getRoleLevel, level)
+                .like(TravelRoleInfo::getSkill, spot)
+                .list();
+
+        return Result.OK("景点列表", list);
+    }
+
+    //根据角色id获取角色详情
+    @Override
+    public Result<?> queryRoleInfoById(String roleInfoId) {
+        TravelRoleInfo one = travelRoleInfoService
+                .lambdaQuery()
+                .eq(TravelRoleInfo::getId, roleInfoId)
+                .one();
+
+        return Result.OK("角色详情", one);
+    }
+
+    //根据视频创建者获取视频列表
+    @Override
+    public Result<?> queryVedioById(String roleInfoId) {
+        List<TravelVideo> list = travelVideoService
+                .lambdaQuery()
+                .eq(TravelVideo::getCreateBy, roleInfoId)
+                .list();
+
+        return Result.OK("视频列表", list);
+    }
+
+    //添加建议
+    @Override
+    public Result<?> addAdvice() {
+        return null;
+    }
+
+    //添加志愿者
+    @Override
+    public Result<?> addVolunteer() {
+        return null;
+    }
+}

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

@@ -1,7 +0,0 @@
-package org.jeecg.modules.apiService.impl;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class InfoApiServiceImpl {
-}