1、地点-景区添加关联

2、添加购物车

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/controller/TravelAdvanceController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelAdvance.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelAdvance.service.ITravelAdvanceService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 建议表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Api(tags="建议表")
+@RestController
+@RequestMapping("/travelAdvance/travelAdvance")
+@Slf4j
+public class TravelAdvanceController extends JeecgController<TravelAdvance, ITravelAdvanceService> {
+	@Autowired
+	private ITravelAdvanceService travelAdvanceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelAdvance
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "建议表-分页列表查询")
+	@ApiOperation(value="建议表-分页列表查询", notes="建议表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelAdvance>> queryPageList(TravelAdvance travelAdvance,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelAdvance> queryWrapper = QueryGenerator.initQueryWrapper(travelAdvance, req.getParameterMap());
+		Page<TravelAdvance> page = new Page<TravelAdvance>(pageNo, pageSize);
+		IPage<TravelAdvance> pageList = travelAdvanceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelAdvance
+	 * @return
+	 */
+	@AutoLog(value = "建议表-添加")
+	@ApiOperation(value="建议表-添加", notes="建议表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelAdvance travelAdvance) {
+		travelAdvanceService.save(travelAdvance);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelAdvance
+	 * @return
+	 */
+	@AutoLog(value = "建议表-编辑")
+	@ApiOperation(value="建议表-编辑", notes="建议表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelAdvance travelAdvance) {
+		travelAdvanceService.updateById(travelAdvance);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "建议表-通过id删除")
+	@ApiOperation(value="建议表-通过id删除", notes="建议表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		travelAdvanceService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "建议表-批量删除")
+	@ApiOperation(value="建议表-批量删除", notes="建议表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.travelAdvanceService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "建议表-通过id查询")
+	@ApiOperation(value="建议表-通过id查询", notes="建议表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TravelAdvance> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelAdvance travelAdvance = travelAdvanceService.getById(id);
+		if(travelAdvance==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelAdvance);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelAdvance
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelAdvance travelAdvance) {
+        return super.exportXls(request, travelAdvance, TravelAdvance.class, "建议表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TravelAdvance.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/entity/TravelAdvance.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.travelAdvance.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 建议表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_advance")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_advance对象", description="建议表")
+public class TravelAdvance implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**问题和意见*/
+	@Excel(name = "问题和意见", width = 15)
+    @ApiModelProperty(value = "问题和意见")
+    private java.lang.String question;
+	/**问题截图*/
+	@Excel(name = "问题截图", width = 15)
+    @ApiModelProperty(value = "问题截图")
+    private java.lang.String image;
+	/**联系姓名*/
+	@Excel(name = "联系姓名", width = 15)
+    @ApiModelProperty(value = "联系姓名")
+    private java.lang.String name;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/TravelAdvanceMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelAdvance.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 建议表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface TravelAdvanceMapper extends BaseMapper<TravelAdvance> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/mapper/xml/TravelAdvanceMapper.xml

@@ -0,0 +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.travelAdvance.mapper.TravelAdvanceMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/ITravelAdvanceService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelAdvance.service;
+
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 建议表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface ITravelAdvanceService extends IService<TravelAdvance> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/service/impl/TravelAdvanceServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelAdvance.service.impl;
+
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelAdvance.mapper.TravelAdvanceMapper;
+import org.jeecg.modules.travelAdvance.service.ITravelAdvanceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 建议表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Service
+public class TravelAdvanceServiceImpl extends ServiceImpl<TravelAdvanceMapper, TravelAdvance> implements ITravelAdvanceService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/TravelAdvanceList.vue

@@ -0,0 +1,190 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-advance-modal ref="modalForm" @ok="modalFormOk"></travel-advance-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelAdvanceModal from './modules/TravelAdvanceModal'
+
+  export default {
+    name: 'TravelAdvanceList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelAdvanceModal
+    },
+    data () {
+      return {
+        description: '建议表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'问题和意见',
+            align:"center",
+            dataIndex: 'question'
+          },
+          {
+            title:'问题截图',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'联系姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelAdvance/travelAdvance/list",
+          delete: "/travelAdvance/travelAdvance/delete",
+          deleteBatch: "/travelAdvance/travelAdvance/deleteBatch",
+          exportXlsUrl: "/travelAdvance/travelAdvance/exportXls",
+          importExcelUrl: "travelAdvance/travelAdvance/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'question',text:'问题和意见',dictCode:''})
+        fieldList.push({type:'string',value:'image',text:'问题截图',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'联系姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/modules/TravelAdvanceForm.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="question">
+              <a-input v-model="model.question" placeholder="请输入问题和意见"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="问题截图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入联系姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TravelAdvanceForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/travelAdvance/travelAdvance/add",
+          edit: "/travelAdvance/travelAdvance/edit",
+          queryById: "/travelAdvance/travelAdvance/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/modules/TravelAdvanceModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-advance-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-advance-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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TravelAdvanceForm from './TravelAdvanceForm'
+
+  export default {
+    name: 'TravelAdvanceModal',
+    components: {
+      TravelAdvanceForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue/modules/TravelAdvanceModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <travel-advance-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-advance-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelAdvanceForm from './TravelAdvanceForm'
+  export default {
+    name: 'TravelAdvanceModal',
+    components: {
+      TravelAdvanceForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue3/TravelAdvance.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelAdvance/travelAdvance/list',
+  save='/travelAdvance/travelAdvance/add',
+  edit='/travelAdvance/travelAdvance/edit',
+  deleteOne = '/travelAdvance/travelAdvance/delete',
+  deleteBatch = '/travelAdvance/travelAdvance/deleteBatch',
+  importExcel = '/travelAdvance/travelAdvance/importExcel',
+  exportXls = '/travelAdvance/travelAdvance/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue3/TravelAdvance.data.ts

@@ -0,0 +1,56 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '问题和意见',
+    align:"center",
+    dataIndex: 'question'
+   },
+   {
+    title: '问题截图',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '联系姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '问题和意见',
+    field: 'question',
+    component: 'Input',
+  },
+  {
+    label: '问题截图',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '联系姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue3/TravelAdvanceList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelAdvanceModal @register="registerModal" @success="handleSuccess"></TravelAdvanceModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelAdvance-travelAdvance" 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 TravelAdvanceModal from './components/TravelAdvanceModal.vue'
+  import {columns, searchFormSchema} from './travelAdvance.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelAdvance.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '建议表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"建议表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAdvance/vue3/components/TravelAdvanceModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelAdvance.data';
+    import {saveOrUpdate} from '../travelAdvance.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelCollection.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.travelCollection.entity.TravelCollection;
+import org.jeecg.modules.travelCollection.service.ITravelCollectionService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 收藏表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Api(tags="收藏表")
+@RestController
+@RequestMapping("/travelCollection/travelCollection")
+@Slf4j
+public class TravelCollectionController extends JeecgController<TravelCollection, ITravelCollectionService> {
+	@Autowired
+	private ITravelCollectionService travelCollectionService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelCollection
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "收藏表-分页列表查询")
+	@ApiOperation(value="收藏表-分页列表查询", notes="收藏表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelCollection>> queryPageList(TravelCollection travelCollection,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelCollection> queryWrapper = QueryGenerator.initQueryWrapper(travelCollection, req.getParameterMap());
+		Page<TravelCollection> page = new Page<TravelCollection>(pageNo, pageSize);
+		IPage<TravelCollection> pageList = travelCollectionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelCollection
+	 * @return
+	 */
+	@AutoLog(value = "收藏表-添加")
+	@ApiOperation(value="收藏表-添加", notes="收藏表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelCollection travelCollection) {
+		travelCollectionService.save(travelCollection);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelCollection
+	 * @return
+	 */
+	@AutoLog(value = "收藏表-编辑")
+	@ApiOperation(value="收藏表-编辑", notes="收藏表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelCollection travelCollection) {
+		travelCollectionService.updateById(travelCollection);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "收藏表-通过id删除")
+	@ApiOperation(value="收藏表-通过id删除", notes="收藏表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		travelCollectionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "收藏表-批量删除")
+	@ApiOperation(value="收藏表-批量删除", notes="收藏表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.travelCollectionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "收藏表-通过id查询")
+	@ApiOperation(value="收藏表-通过id查询", notes="收藏表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TravelCollection> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelCollection travelCollection = travelCollectionService.getById(id);
+		if(travelCollection==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelCollection);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelCollection
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelCollection travelCollection) {
+        return super.exportXls(request, travelCollection, TravelCollection.class, "收藏表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TravelCollection.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.travelCollection.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 收藏表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_collection")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_collection对象", description="收藏表")
+public class TravelCollection implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)*/
+	@Excel(name = "收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)", width = 15)
+    @ApiModelProperty(value = "收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)")
+    private java.lang.String collectionType;
+	/**收藏项目编号*/
+	@Excel(name = "收藏项目编号", width = 15)
+    @ApiModelProperty(value = "收藏项目编号")
+    private java.lang.String collectionItmeId;
+	/**收藏项目主题*/
+	@Excel(name = "收藏项目主题", width = 15)
+    @ApiModelProperty(value = "收藏项目主题")
+    private java.lang.String collectionTitle;
+	/**收藏项目预约时间*/
+	@Excel(name = "收藏项目预约时间", width = 15)
+    @ApiModelProperty(value = "收藏项目预约时间")
+    private java.lang.String collectionPretime;
+	/**收藏项目价格*/
+	@Excel(name = "收藏项目价格", width = 15)
+    @ApiModelProperty(value = "收藏项目价格")
+    private java.math.BigDecimal collectionPrice;
+	/**收藏项目封面*/
+	@Excel(name = "收藏项目封面", width = 15)
+    @ApiModelProperty(value = "收藏项目封面")
+    private java.lang.String collectionImage;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelCollection.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 收藏表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface TravelCollectionMapper extends BaseMapper<TravelCollection> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/xml/TravelCollectionMapper.xml

@@ -0,0 +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.travelCollection.mapper.TravelCollectionMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelCollection.service;
+
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 收藏表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface ITravelCollectionService extends IService<TravelCollection> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelCollection.service.impl;
+
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import org.jeecg.modules.travelCollection.mapper.TravelCollectionMapper;
+import org.jeecg.modules.travelCollection.service.ITravelCollectionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 收藏表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Service
+public class TravelCollectionServiceImpl extends ServiceImpl<TravelCollectionMapper, TravelCollection> implements ITravelCollectionService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue

@@ -0,0 +1,201 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-collection-modal ref="modalForm" @ok="modalFormOk"></travel-collection-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelCollectionModal from './modules/TravelCollectionModal'
+
+  export default {
+    name: 'TravelCollectionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelCollectionModal
+    },
+    data () {
+      return {
+        description: '收藏表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',
+            align:"center",
+            dataIndex: 'collectionType'
+          },
+          {
+            title:'收藏项目编号',
+            align:"center",
+            dataIndex: 'collectionItmeId'
+          },
+          {
+            title:'收藏项目主题',
+            align:"center",
+            dataIndex: 'collectionTitle'
+          },
+          {
+            title:'收藏项目预约时间',
+            align:"center",
+            dataIndex: 'collectionPretime'
+          },
+          {
+            title:'收藏项目价格',
+            align:"center",
+            dataIndex: 'collectionPrice'
+          },
+          {
+            title:'收藏项目封面',
+            align:"center",
+            dataIndex: 'collectionImage'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelCollection/travelCollection/list",
+          delete: "/travelCollection/travelCollection/delete",
+          deleteBatch: "/travelCollection/travelCollection/deleteBatch",
+          exportXlsUrl: "/travelCollection/travelCollection/exportXls",
+          importExcelUrl: "travelCollection/travelCollection/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'collectionType',text:'收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',dictCode:''})
+        fieldList.push({type:'string',value:'collectionItmeId',text:'收藏项目编号',dictCode:''})
+        fieldList.push({type:'string',value:'collectionTitle',text:'收藏项目主题',dictCode:''})
+        fieldList.push({type:'string',value:'collectionPretime',text:'收藏项目预约时间',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'collectionPrice',text:'收藏项目价格',dictCode:''})
+        fieldList.push({type:'string',value:'collectionImage',text:'收藏项目封面',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionType">
+              <a-input v-model="model.collectionType" placeholder="请输入收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionItmeId">
+              <a-input v-model="model.collectionItmeId" placeholder="请输入收藏项目编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目主题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionTitle">
+              <a-input v-model="model.collectionTitle" placeholder="请输入收藏项目主题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目预约时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionPretime">
+              <a-input v-model="model.collectionPretime" placeholder="请输入收藏项目预约时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionPrice">
+              <a-input-number v-model="model.collectionPrice" placeholder="请输入收藏项目价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收藏项目封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionImage">
+              <a-input v-model="model.collectionImage" placeholder="请输入收藏项目封面"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TravelCollectionForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/travelCollection/travelCollection/add",
+          edit: "/travelCollection/travelCollection/edit",
+          queryById: "/travelCollection/travelCollection/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-collection-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-collection-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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TravelCollectionForm from './TravelCollectionForm'
+
+  export default {
+    name: 'TravelCollectionModal',
+    components: {
+      TravelCollectionForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <travel-collection-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-collection-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelCollectionForm from './TravelCollectionForm'
+  export default {
+    name: 'TravelCollectionModal',
+    components: {
+      TravelCollectionForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelCollection/travelCollection/list',
+  save='/travelCollection/travelCollection/add',
+  edit='/travelCollection/travelCollection/edit',
+  deleteOne = '/travelCollection/travelCollection/delete',
+  deleteBatch = '/travelCollection/travelCollection/deleteBatch',
+  importExcel = '/travelCollection/travelCollection/importExcel',
+  exportXls = '/travelCollection/travelCollection/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts

@@ -0,0 +1,73 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',
+    align:"center",
+    dataIndex: 'collectionType'
+   },
+   {
+    title: '收藏项目编号',
+    align:"center",
+    dataIndex: 'collectionItmeId'
+   },
+   {
+    title: '收藏项目主题',
+    align:"center",
+    dataIndex: 'collectionTitle'
+   },
+   {
+    title: '收藏项目预约时间',
+    align:"center",
+    dataIndex: 'collectionPretime'
+   },
+   {
+    title: '收藏项目价格',
+    align:"center",
+    dataIndex: 'collectionPrice'
+   },
+   {
+    title: '收藏项目封面',
+    align:"center",
+    dataIndex: 'collectionImage'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',
+    field: 'collectionType',
+    component: 'Input',
+  },
+  {
+    label: '收藏项目编号',
+    field: 'collectionItmeId',
+    component: 'Input',
+  },
+  {
+    label: '收藏项目主题',
+    field: 'collectionTitle',
+    component: 'Input',
+  },
+  {
+    label: '收藏项目预约时间',
+    field: 'collectionPretime',
+    component: 'Input',
+  },
+  {
+    label: '收藏项目价格',
+    field: 'collectionPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '收藏项目封面',
+    field: 'collectionImage',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollectionList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelCollectionModal @register="registerModal" @success="handleSuccess"></TravelCollectionModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelCollection-travelCollection" 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 TravelCollectionModal from './components/TravelCollectionModal.vue'
+  import {columns, searchFormSchema} from './travelCollection.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelCollection.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '收藏表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"收藏表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/components/TravelCollectionModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelCollection.data';
+    import {saveOrUpdate} from '../travelCollection.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/controller/TravelShopcarController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelShopcar.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.travelShopcar.entity.TravelShopcar;
+import org.jeecg.modules.travelShopcar.service.ITravelShopcarService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 购物车表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Api(tags="购物车表")
+@RestController
+@RequestMapping("/travelShopcar/travelShopcar")
+@Slf4j
+public class TravelShopcarController extends JeecgController<TravelShopcar, ITravelShopcarService> {
+	@Autowired
+	private ITravelShopcarService travelShopcarService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelShopcar
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "购物车表-分页列表查询")
+	@ApiOperation(value="购物车表-分页列表查询", notes="购物车表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelShopcar>> queryPageList(TravelShopcar travelShopcar,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelShopcar> queryWrapper = QueryGenerator.initQueryWrapper(travelShopcar, req.getParameterMap());
+		Page<TravelShopcar> page = new Page<TravelShopcar>(pageNo, pageSize);
+		IPage<TravelShopcar> pageList = travelShopcarService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelShopcar
+	 * @return
+	 */
+	@AutoLog(value = "购物车表-添加")
+	@ApiOperation(value="购物车表-添加", notes="购物车表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelShopcar travelShopcar) {
+		travelShopcarService.save(travelShopcar);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelShopcar
+	 * @return
+	 */
+	@AutoLog(value = "购物车表-编辑")
+	@ApiOperation(value="购物车表-编辑", notes="购物车表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelShopcar travelShopcar) {
+		travelShopcarService.updateById(travelShopcar);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "购物车表-通过id删除")
+	@ApiOperation(value="购物车表-通过id删除", notes="购物车表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		travelShopcarService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "购物车表-批量删除")
+	@ApiOperation(value="购物车表-批量删除", notes="购物车表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.travelShopcarService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "购物车表-通过id查询")
+	@ApiOperation(value="购物车表-通过id查询", notes="购物车表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TravelShopcar> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelShopcar travelShopcar = travelShopcarService.getById(id);
+		if(travelShopcar==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelShopcar);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelShopcar
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelShopcar travelShopcar) {
+        return super.exportXls(request, travelShopcar, TravelShopcar.class, "购物车表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TravelShopcar.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/entity/TravelShopcar.java

@@ -0,0 +1,80 @@
+package org.jeecg.modules.travelShopcar.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 购物车表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_shopcar")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_shopcar对象", description="购物车表")
+public class TravelShopcar implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private java.lang.String shopcarName;
+	/**商品规格*/
+	@Excel(name = "商品规格", width = 15)
+    @ApiModelProperty(value = "商品规格")
+    private java.lang.String shopcarParam;
+	/**商品价格*/
+	@Excel(name = "商品价格", width = 15)
+    @ApiModelProperty(value = "商品价格")
+    private java.math.BigDecimal shopcarPrice;
+	/**商品购买数量*/
+	@Excel(name = "商品购买数量", width = 15)
+    @ApiModelProperty(value = "商品购买数量")
+    private java.lang.Integer shopcarNumber;
+	/**商品销售量*/
+	@Excel(name = "商品销售量", width = 15)
+    @ApiModelProperty(value = "商品销售量")
+    private java.lang.Integer shopcarSales;
+	/**关联商品id*/
+	@Excel(name = "关联商品id", width = 15, dictTable = "travel_wares", dicText = "wares_title", dicCode = "id")
+	@Dict(dictTable = "travel_wares", dicText = "wares_title", dicCode = "id")
+    @ApiModelProperty(value = "关联商品id")
+    private java.lang.String waresId;
+	/**关联用户*/
+	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户")
+    private java.lang.String userId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/mapper/TravelShopcarMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelShopcar.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 购物车表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface TravelShopcarMapper extends BaseMapper<TravelShopcar> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/mapper/xml/TravelShopcarMapper.xml

@@ -0,0 +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.travelShopcar.mapper.TravelShopcarMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/service/ITravelShopcarService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelShopcar.service;
+
+import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 购物车表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface ITravelShopcarService extends IService<TravelShopcar> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/service/impl/TravelShopcarServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelShopcar.service.impl;
+
+import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
+import org.jeecg.modules.travelShopcar.mapper.TravelShopcarMapper;
+import org.jeecg.modules.travelShopcar.service.ITravelShopcarService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 购物车表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Service
+public class TravelShopcarServiceImpl extends ServiceImpl<TravelShopcarMapper, TravelShopcar> implements ITravelShopcarService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/TravelShopcarList.vue

@@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-shopcar-modal ref="modalForm" @ok="modalFormOk"></travel-shopcar-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelShopcarModal from './modules/TravelShopcarModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TravelShopcarList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelShopcarModal
+    },
+    data () {
+      return {
+        description: '购物车表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'商品名称',
+            align:"center",
+            dataIndex: 'shopcarName'
+          },
+          {
+            title:'商品规格',
+            align:"center",
+            dataIndex: 'shopcarParam'
+          },
+          {
+            title:'商品价格',
+            align:"center",
+            dataIndex: 'shopcarPrice'
+          },
+          {
+            title:'商品购买数量',
+            align:"center",
+            dataIndex: 'shopcarNumber'
+          },
+          {
+            title:'商品销售量',
+            align:"center",
+            dataIndex: 'shopcarSales'
+          },
+          {
+            title:'关联商品id',
+            align:"center",
+            dataIndex: 'waresId_dictText'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelShopcar/travelShopcar/list",
+          delete: "/travelShopcar/travelShopcar/delete",
+          deleteBatch: "/travelShopcar/travelShopcar/deleteBatch",
+          exportXlsUrl: "/travelShopcar/travelShopcar/exportXls",
+          importExcelUrl: "travelShopcar/travelShopcar/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'shopcarName',text:'商品名称',dictCode:''})
+        fieldList.push({type:'string',value:'shopcarParam',text:'商品规格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'shopcarPrice',text:'商品价格',dictCode:''})
+        fieldList.push({type:'int',value:'shopcarNumber',text:'商品购买数量',dictCode:''})
+        fieldList.push({type:'int',value:'shopcarSales',text:'商品销售量',dictCode:''})
+        fieldList.push({type:'string',value:'waresId',text:'关联商品id',dictCode:"travel_wares,wares_title,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/modules/TravelShopcarForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="shopcarName">
+              <a-input v-model="model.shopcarName" placeholder="请输入商品名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarParam">
+              <a-input v-model="model.shopcarParam" placeholder="请输入商品规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarPrice">
+              <a-input-number v-model="model.shopcarPrice" placeholder="请输入商品价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品购买数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarNumber">
+              <a-input-number v-model="model.shopcarNumber" placeholder="请输入商品购买数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品销售量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarSales">
+              <a-input-number v-model="model.shopcarSales" placeholder="请输入商品销售量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联商品id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresId">
+              <j-dict-select-tag type="list" v-model="model.waresId" dictCode="travel_wares,wares_title,id" placeholder="请选择关联商品id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TravelShopcarForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/travelShopcar/travelShopcar/add",
+          edit: "/travelShopcar/travelShopcar/edit",
+          queryById: "/travelShopcar/travelShopcar/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/modules/TravelShopcarModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-shopcar-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-shopcar-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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TravelShopcarForm from './TravelShopcarForm'
+
+  export default {
+    name: 'TravelShopcarModal',
+    components: {
+      TravelShopcarForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/modules/TravelShopcarModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <travel-shopcar-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-shopcar-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelShopcarForm from './TravelShopcarForm'
+  export default {
+    name: 'TravelShopcarModal',
+    components: {
+      TravelShopcarForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue3/TravelShopcar.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelShopcar/travelShopcar/list',
+  save='/travelShopcar/travelShopcar/add',
+  edit='/travelShopcar/travelShopcar/edit',
+  deleteOne = '/travelShopcar/travelShopcar/delete',
+  deleteBatch = '/travelShopcar/travelShopcar/deleteBatch',
+  importExcel = '/travelShopcar/travelShopcar/importExcel',
+  exportXls = '/travelShopcar/travelShopcar/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue3/TravelShopcar.data.ts

@@ -0,0 +1,89 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '商品名称',
+    align:"center",
+    dataIndex: 'shopcarName'
+   },
+   {
+    title: '商品规格',
+    align:"center",
+    dataIndex: 'shopcarParam'
+   },
+   {
+    title: '商品价格',
+    align:"center",
+    dataIndex: 'shopcarPrice'
+   },
+   {
+    title: '商品购买数量',
+    align:"center",
+    dataIndex: 'shopcarNumber'
+   },
+   {
+    title: '商品销售量',
+    align:"center",
+    dataIndex: 'shopcarSales'
+   },
+   {
+    title: '关联商品id',
+    align:"center",
+    dataIndex: 'waresId_dictText'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '商品名称',
+    field: 'shopcarName',
+    component: 'Input',
+  },
+  {
+    label: '商品规格',
+    field: 'shopcarParam',
+    component: 'Input',
+  },
+  {
+    label: '商品价格',
+    field: 'shopcarPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '商品购买数量',
+    field: 'shopcarNumber',
+    component: 'InputNumber',
+  },
+  {
+    label: '商品销售量',
+    field: 'shopcarSales',
+    component: 'InputNumber',
+  },
+  {
+    label: '关联商品id',
+    field: 'waresId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"travel_wares,wares_title,id"
+     },
+  },
+  {
+    label: '关联用户',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue3/TravelShopcarList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelShopcarModal @register="registerModal" @success="handleSuccess"></TravelShopcarModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelShopcar-travelShopcar" 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 TravelShopcarModal from './components/TravelShopcarModal.vue'
+  import {columns, searchFormSchema} from './travelShopcar.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelShopcar.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '购物车表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"购物车表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue3/components/TravelShopcarModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelShopcar.data';
+    import {saveOrUpdate} from '../travelShopcar.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

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-24
+ * @Date:   2024-09-25
  * @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-24
+ * @Date:   2024-09-25
  * @Version: V1.0
  */
 @Data
@@ -52,11 +52,16 @@ public class TravelSpot implements Serializable {
     @ApiModelProperty(value = "地点坐标_纬度")
     private java.math.BigDecimal spotLatitude;
 	/**地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)*/
-	@Excel(name = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)", width = 15)
+	@Excel(name = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)", width = 15, dictTable = "travel_area", dicText = "area_name", dicCode = "id")
+	@Dict(dictTable = "travel_area", dicText = "area_name", dicCode = "id")
     @ApiModelProperty(value = "地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)")
-    private java.lang.Integer areaId;
+    private java.lang.String areaId;
 	/**地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)*/
 	@Excel(name = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)", width = 15)
     @ApiModelProperty(value = "地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)")
     private java.lang.Integer categoryId;
+	/**地点详情*/
+	@Excel(name = "地点详情", width = 15)
+    @ApiModelProperty(value = "地点详情")
+    private java.lang.String spotDetail;
 }

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

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

@@ -99,6 +99,7 @@
   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',
@@ -152,6 +153,12 @@
             align:"center",
             dataIndex: 'categoryId_dictText'
           },
+          {
+            title:'地点详情',
+            align:"center",
+            dataIndex: 'spotDetail',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -190,8 +197,9 @@
         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:'int',value:'areaId',text:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',dictCode:''})
+        fieldList.push({type:'string',value:'areaId',text:'地点所属景区(0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区)',dictCode:"travel_area,area_name,id"})
         fieldList.push({type:'int',value:'categoryId',text:'地点类型(0-景点 1-美食店铺 2-民宿 3-厕所)',dictCode:''})
+        fieldList.push({type:'string',value:'spotDetail',text:'地点详情',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

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

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

@@ -35,6 +35,12 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'categoryId_dictText'
    },
+   {
+    title: '地点详情',
+    align:"center",
+    dataIndex: 'spotDetail',
+    slots: { customRender: 'htmlSlot' },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -68,7 +74,7 @@ export const formSchema: FormSchema[] = [
     field: 'areaId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:""
+        dictCode:"travel_area,area_name,id"
      },
   },
   {
@@ -79,4 +85,9 @@ export const formSchema: FormSchema[] = [
         dictCode:""
      },
   },
+  {
+    label: '地点详情',
+    field: 'spotDetail',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/controller/TravelTimeController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelTime.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.travelTime.entity.TravelTime;
+import org.jeecg.modules.travelTime.service.ITravelTimeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 时间段表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Api(tags="时间段表")
+@RestController
+@RequestMapping("/travelTime/travelTime")
+@Slf4j
+public class TravelTimeController extends JeecgController<TravelTime, ITravelTimeService> {
+	@Autowired
+	private ITravelTimeService travelTimeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelTime
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "时间段表-分页列表查询")
+	@ApiOperation(value="时间段表-分页列表查询", notes="时间段表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelTime>> queryPageList(TravelTime travelTime,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelTime> queryWrapper = QueryGenerator.initQueryWrapper(travelTime, req.getParameterMap());
+		Page<TravelTime> page = new Page<TravelTime>(pageNo, pageSize);
+		IPage<TravelTime> pageList = travelTimeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelTime
+	 * @return
+	 */
+	@AutoLog(value = "时间段表-添加")
+	@ApiOperation(value="时间段表-添加", notes="时间段表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelTime travelTime) {
+		travelTimeService.save(travelTime);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelTime
+	 * @return
+	 */
+	@AutoLog(value = "时间段表-编辑")
+	@ApiOperation(value="时间段表-编辑", notes="时间段表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelTime travelTime) {
+		travelTimeService.updateById(travelTime);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "时间段表-通过id删除")
+	@ApiOperation(value="时间段表-通过id删除", notes="时间段表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		travelTimeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "时间段表-批量删除")
+	@ApiOperation(value="时间段表-批量删除", notes="时间段表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.travelTimeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "时间段表-通过id查询")
+	@ApiOperation(value="时间段表-通过id查询", notes="时间段表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TravelTime> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelTime travelTime = travelTimeService.getById(id);
+		if(travelTime==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelTime);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelTime
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelTime travelTime) {
+        return super.exportXls(request, travelTime, TravelTime.class, "时间段表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TravelTime.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/entity/TravelTime.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.travelTime.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 时间段表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_time")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_time对象", description="时间段表")
+public class TravelTime implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**时间点*/
+	@Excel(name = "时间点", width = 15)
+    @ApiModelProperty(value = "时间点")
+    private java.lang.String timeDot;
+	/**时间点类型(0-上午 1-下午)*/
+	@Excel(name = "时间点类型(0-上午 1-下午)", width = 15)
+    @ApiModelProperty(value = "时间点类型(0-上午 1-下午)")
+    private java.lang.String timeType;
+	/**排序字段*/
+	@Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private java.lang.Integer timeOrder;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/mapper/TravelTimeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelTime.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelTime.entity.TravelTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 时间段表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface TravelTimeMapper extends BaseMapper<TravelTime> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/mapper/xml/TravelTimeMapper.xml

@@ -0,0 +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.travelTime.mapper.TravelTimeMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/service/ITravelTimeService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelTime.service;
+
+import org.jeecg.modules.travelTime.entity.TravelTime;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 时间段表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface ITravelTimeService extends IService<TravelTime> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/service/impl/TravelTimeServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelTime.service.impl;
+
+import org.jeecg.modules.travelTime.entity.TravelTime;
+import org.jeecg.modules.travelTime.mapper.TravelTimeMapper;
+import org.jeecg.modules.travelTime.service.ITravelTimeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 时间段表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Service
+public class TravelTimeServiceImpl extends ServiceImpl<TravelTimeMapper, TravelTime> implements ITravelTimeService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue/TravelTimeList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-time-modal ref="modalForm" @ok="modalFormOk"></travel-time-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelTimeModal from './modules/TravelTimeModal'
+
+  export default {
+    name: 'TravelTimeList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelTimeModal
+    },
+    data () {
+      return {
+        description: '时间段表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'时间点',
+            align:"center",
+            dataIndex: 'timeDot'
+          },
+          {
+            title:'时间点类型(0-上午 1-下午)',
+            align:"center",
+            dataIndex: 'timeType'
+          },
+          {
+            title:'排序字段',
+            align:"center",
+            dataIndex: 'timeOrder'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelTime/travelTime/list",
+          delete: "/travelTime/travelTime/delete",
+          deleteBatch: "/travelTime/travelTime/deleteBatch",
+          exportXlsUrl: "/travelTime/travelTime/exportXls",
+          importExcelUrl: "travelTime/travelTime/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'timeDot',text:'时间点',dictCode:''})
+        fieldList.push({type:'string',value:'timeType',text:'时间点类型(0-上午 1-下午)',dictCode:''})
+        fieldList.push({type:'int',value:'timeOrder',text:'排序字段',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue/modules/TravelTimeForm.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="timeDot">
+              <a-input v-model="model.timeDot" placeholder="请输入时间点"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时间点类型(0-上午 1-下午)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="timeType">
+              <a-input v-model="model.timeType" placeholder="请输入时间点类型(0-上午 1-下午)"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="timeOrder">
+              <a-input-number v-model="model.timeOrder" placeholder="请输入排序字段" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TravelTimeForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/travelTime/travelTime/add",
+          edit: "/travelTime/travelTime/edit",
+          queryById: "/travelTime/travelTime/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue/modules/TravelTimeModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-time-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-time-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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TravelTimeForm from './TravelTimeForm'
+
+  export default {
+    name: 'TravelTimeModal',
+    components: {
+      TravelTimeForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue/modules/TravelTimeModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <travel-time-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-time-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelTimeForm from './TravelTimeForm'
+  export default {
+    name: 'TravelTimeModal',
+    components: {
+      TravelTimeForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue3/TravelTime.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelTime/travelTime/list',
+  save='/travelTime/travelTime/add',
+  edit='/travelTime/travelTime/edit',
+  deleteOne = '/travelTime/travelTime/delete',
+  deleteBatch = '/travelTime/travelTime/deleteBatch',
+  importExcel = '/travelTime/travelTime/importExcel',
+  exportXls = '/travelTime/travelTime/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue3/TravelTime.data.ts

@@ -0,0 +1,43 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '时间点',
+    align:"center",
+    dataIndex: 'timeDot'
+   },
+   {
+    title: '时间点类型(0-上午 1-下午)',
+    align:"center",
+    dataIndex: 'timeType'
+   },
+   {
+    title: '排序字段',
+    align:"center",
+    dataIndex: 'timeOrder'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '时间点',
+    field: 'timeDot',
+    component: 'Input',
+  },
+  {
+    label: '时间点类型(0-上午 1-下午)',
+    field: 'timeType',
+    component: 'Input',
+  },
+  {
+    label: '排序字段',
+    field: 'timeOrder',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue3/TravelTimeList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelTimeModal @register="registerModal" @success="handleSuccess"></TravelTimeModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelTime-travelTime" 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 TravelTimeModal from './components/TravelTimeModal.vue'
+  import {columns, searchFormSchema} from './travelTime.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelTime.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '时间段表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"时间段表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/vue3/components/TravelTimeModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelTime.data';
+    import {saveOrUpdate} from '../travelTime.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/controller/TravelWaresController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelWares.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.travelWares.entity.TravelWares;
+import org.jeecg.modules.travelWares.service.ITravelWaresService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Api(tags="商品信息表")
+@RestController
+@RequestMapping("/travelWares/travelWares")
+@Slf4j
+public class TravelWaresController extends JeecgController<TravelWares, ITravelWaresService> {
+	@Autowired
+	private ITravelWaresService travelWaresService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelWares
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "商品信息表-分页列表查询")
+	@ApiOperation(value="商品信息表-分页列表查询", notes="商品信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelWares>> queryPageList(TravelWares travelWares,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelWares> queryWrapper = QueryGenerator.initQueryWrapper(travelWares, req.getParameterMap());
+		Page<TravelWares> page = new Page<TravelWares>(pageNo, pageSize);
+		IPage<TravelWares> pageList = travelWaresService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelWares
+	 * @return
+	 */
+	@AutoLog(value = "商品信息表-添加")
+	@ApiOperation(value="商品信息表-添加", notes="商品信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelWares travelWares) {
+		travelWaresService.save(travelWares);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelWares
+	 * @return
+	 */
+	@AutoLog(value = "商品信息表-编辑")
+	@ApiOperation(value="商品信息表-编辑", notes="商品信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelWares travelWares) {
+		travelWaresService.updateById(travelWares);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "商品信息表-通过id删除")
+	@ApiOperation(value="商品信息表-通过id删除", notes="商品信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		travelWaresService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "商品信息表-批量删除")
+	@ApiOperation(value="商品信息表-批量删除", notes="商品信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.travelWaresService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "商品信息表-通过id查询")
+	@ApiOperation(value="商品信息表-通过id查询", notes="商品信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TravelWares> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelWares travelWares = travelWaresService.getById(id);
+		if(travelWares==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelWares);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelWares
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelWares travelWares) {
+        return super.exportXls(request, travelWares, TravelWares.class, "商品信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TravelWares.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/entity/TravelWares.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.travelWares.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_wares")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_wares对象", description="商品信息表")
+public class TravelWares implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private java.lang.String waresTitle;
+	/**商品图片*/
+	@Excel(name = "商品图片", width = 15)
+    @ApiModelProperty(value = "商品图片")
+    private java.lang.String waresImage;
+	/**商品价格*/
+	@Excel(name = "商品价格", width = 15)
+    @ApiModelProperty(value = "商品价格")
+    private java.math.BigDecimal waresPrice;
+	/**商品折扣*/
+	@Excel(name = "商品折扣", width = 15)
+    @ApiModelProperty(value = "商品折扣")
+    private java.math.BigDecimal waresDiscount;
+	/**商品销量*/
+	@Excel(name = "商品销量", width = 15)
+    @ApiModelProperty(value = "商品销量")
+    private java.lang.Integer waresSales;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/TravelWaresMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelWares.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelWares.entity.TravelWares;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface TravelWaresMapper extends BaseMapper<TravelWares> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/xml/TravelWaresMapper.xml

@@ -0,0 +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.travelWares.mapper.TravelWaresMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/ITravelWaresService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelWares.service;
+
+import org.jeecg.modules.travelWares.entity.TravelWares;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+public interface ITravelWaresService extends IService<TravelWares> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/impl/TravelWaresServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelWares.service.impl;
+
+import org.jeecg.modules.travelWares.entity.TravelWares;
+import org.jeecg.modules.travelWares.mapper.TravelWaresMapper;
+import org.jeecg.modules.travelWares.service.ITravelWaresService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-24
+ * @Version: V1.0
+ */
+@Service
+public class TravelWaresServiceImpl extends ServiceImpl<TravelWaresMapper, TravelWares> implements ITravelWaresService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/TravelWaresList.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-wares-modal ref="modalForm" @ok="modalFormOk"></travel-wares-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelWaresModal from './modules/TravelWaresModal'
+
+  export default {
+    name: 'TravelWaresList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelWaresModal
+    },
+    data () {
+      return {
+        description: '商品信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'商品名称',
+            align:"center",
+            dataIndex: 'waresTitle'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'waresImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'商品价格',
+            align:"center",
+            dataIndex: 'waresPrice'
+          },
+          {
+            title:'商品折扣',
+            align:"center",
+            dataIndex: 'waresDiscount'
+          },
+          {
+            title:'商品销量',
+            align:"center",
+            dataIndex: 'waresSales'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelWares/travelWares/list",
+          delete: "/travelWares/travelWares/delete",
+          deleteBatch: "/travelWares/travelWares/deleteBatch",
+          exportXlsUrl: "/travelWares/travelWares/exportXls",
+          importExcelUrl: "travelWares/travelWares/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'waresTitle',text:'商品名称',dictCode:''})
+        fieldList.push({type:'string',value:'waresImage',text:'商品图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'waresPrice',text:'商品价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'waresDiscount',text:'商品折扣',dictCode:''})
+        fieldList.push({type:'int',value:'waresSales',text:'商品销量',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue

@@ -0,0 +1,124 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <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="waresTitle">
+              <a-input v-model="model.waresTitle" placeholder="请输入商品名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresImage">
+              <j-image-upload isMultiple  v-model="model.waresImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresPrice">
+              <a-input-number v-model="model.waresPrice" placeholder="请输入商品价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品折扣" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresDiscount">
+              <a-input-number v-model="model.waresDiscount" placeholder="请输入商品折扣" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品销量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresSales">
+              <a-input-number v-model="model.waresSales" placeholder="请输入商品销量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TravelWaresForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/travelWares/travelWares/add",
+          edit: "/travelWares/travelWares/edit",
+          queryById: "/travelWares/travelWares/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-wares-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-wares-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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TravelWaresForm from './TravelWaresForm'
+
+  export default {
+    name: 'TravelWaresModal',
+    components: {
+      TravelWaresForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <travel-wares-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-wares-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelWaresForm from './TravelWaresForm'
+  export default {
+    name: 'TravelWaresModal',
+    components: {
+      TravelWaresForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelWares/travelWares/list',
+  save='/travelWares/travelWares/add',
+  edit='/travelWares/travelWares/edit',
+  deleteOne = '/travelWares/travelWares/delete',
+  deleteBatch = '/travelWares/travelWares/deleteBatch',
+  importExcel = '/travelWares/travelWares/importExcel',
+  exportXls = '/travelWares/travelWares/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.data.ts

@@ -0,0 +1,66 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '商品名称',
+    align:"center",
+    dataIndex: 'waresTitle'
+   },
+   {
+    title: '商品图片',
+    align:"center",
+    dataIndex: 'waresImage',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '商品价格',
+    align:"center",
+    dataIndex: 'waresPrice'
+   },
+   {
+    title: '商品折扣',
+    align:"center",
+    dataIndex: 'waresDiscount'
+   },
+   {
+    title: '商品销量',
+    align:"center",
+    dataIndex: 'waresSales'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '商品名称',
+    field: 'waresTitle',
+    component: 'Input',
+  },
+  {
+    label: '商品图片',
+    field: 'waresImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '商品价格',
+    field: 'waresPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '商品折扣',
+    field: 'waresDiscount',
+    component: 'InputNumber',
+  },
+  {
+    label: '商品销量',
+    field: 'waresSales',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWaresList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelWaresModal @register="registerModal" @success="handleSuccess"></TravelWaresModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelWares-travelWares" 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 TravelWaresModal from './components/TravelWaresModal.vue'
+  import {columns, searchFormSchema} from './travelWares.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelWares.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '商品信息表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"商品信息表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/components/TravelWaresModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelWares.data';
+    import {saveOrUpdate} from '../travelWares.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -8,6 +8,7 @@ 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.travelShopcar.entity.TravelShopcar;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -80,18 +81,10 @@ public class IndexApiController {
     }
 
 
-    //我的收藏
-    @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表")
-    @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);
-    }
+
+
+    //添加购物车
 
 
     //文创好物-待补充

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

@@ -7,6 +7,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
+import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -64,4 +66,32 @@ public class UserInfoApiController {
         return indexApiService.updateAddress(travelAddress);
     }
 
+    //我的收藏
+    @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表")
+    @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 = "/queryShopcarList", method = {RequestMethod.GET})
+    public Result<?> queryShopcarList(PageBean pageBean){
+        return indexApiService.queryShopcarList(pageBean);
+    }
+
+    //获取购物车列表
+    @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
+    @RequestMapping(value = "/addShopcar", method = {RequestMethod.GET})
+    public Result<?> addShopcar(TravelShopcar travelShopcar){
+        return indexApiService.addShopcar(travelShopcar);
+    }
+
 }

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

@@ -6,6 +6,7 @@ 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.travelShopcar.entity.TravelShopcar;
 import org.jeecg.modules.travelTime.entity.TravelTime;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 
@@ -87,6 +88,12 @@ public interface IndexApiService {
     //根据Id获取文创好物详情
     public Result<?> queryWaresById(String waresId);
 
+    //获取购物车列表
+    public Result<?> queryShopcarList(PageBean pageBean);
+
+    //添加购物车
+    public Result<?> addShopcar(TravelShopcar travelShopcar);
+
 
 
     //文创好物-待补充

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

@@ -15,7 +15,6 @@ 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.entity.TravelCategory;
 import org.jeecg.modules.travelCategory.service.ITravelCategoryService;
 import org.jeecg.modules.travelCertification.service.ITravelCertificationService;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
@@ -29,6 +28,8 @@ 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.travelShopcar.entity.TravelShopcar;
+import org.jeecg.modules.travelShopcar.service.ITravelShopcarService;
 import org.jeecg.modules.travelSpot.entity.TravelSpot;
 import org.jeecg.modules.travelSpot.service.ITravelSpotService;
 import org.jeecg.modules.travelTime.entity.TravelTime;
@@ -105,6 +106,10 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Resource
     private ITravelCollectionService travelCollectionService;
 
+    //购物车
+    @Resource
+    private ITravelShopcarService travelShopcarService;
+
     //建议表
     @Resource
     private ITravelAdvanceService travelAdvanceService;
@@ -236,6 +241,23 @@ public class IndexApiServiceImpl implements IndexApiService {
         //areaId：0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区
         //categoryId：0-景点 1-美食店铺 2-民宿 3-厕所
 
+        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;
+            }
+        }
+
+
         Page<TravelSpot> page = new Page<TravelSpot>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelSpot> pageList = null;
         if(null != areaId && null != categoryId){
@@ -575,6 +597,31 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("文创好物详情", one);
     }
 
+    //获取购物车列表
+    @Override
+    public Result<?> queryShopcarList(PageBean pageBean) {
+        Page<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelShopcar> pageList;
+
+        pageList = travelShopcarService
+                .lambdaQuery()
+                .orderByDesc(TravelShopcar::getCreateTime)
+                .page(page);
+
+        return Result.OK("文创好物列表", pageList);
+    }
+
+    //添加购物车
+    @Override
+    public Result<?> addShopcar(TravelShopcar travelShopcar) {
+        boolean flag = travelShopcarService.save(travelShopcar);
+        if(flag){
+            return Result.OK("添加购物车成功！");
+        }else {
+            return Result.OK("添加购物车失败！");
+        }
+    }
+
 
     //我要帮助-添加建议
     @Override