项目提交

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java

@@ -1,40 +1,40 @@
-package org.jeecg.modules.bean;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.jeecg.common.exception.JeecgBootException;
-import org.springframework.stereotype.Component;
-
-@Component
-public class HttpConf {
-
-
-    /**
-     * 微信授权登录工具类
-     * @param url
-     * @return
-     */
-    public JSONObject getJSONObject(String url){
-        String jsonObjectStr = null;
-        try {
-            CloseableHttpClient client = null;
-            CloseableHttpResponse response = null;
-            HttpGet httpGet = new HttpGet(url);
-            client = HttpClients.createDefault();
-            response = client.execute(httpGet);
-            HttpEntity entity = response.getEntity();
-            jsonObjectStr = EntityUtils.toString(entity);
-        } catch (Exception e) {
-            throw new JeecgBootException("授权失败，请稍后重试");
-        }
-        JSONObject jsonObject = JSONObject.parseObject(jsonObjectStr);
-        return jsonObject;
-    }
-
-}
-
+package org.jeecg.modules.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.jeecg.common.exception.JeecgBootException;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HttpConf {
+
+
+    /**
+     * 微信授权登录工具类
+     * @param url
+     * @return
+     */
+    public JSONObject getJSONObject(String url){
+        String jsonObjectStr = null;
+        try {
+            CloseableHttpClient client = null;
+            CloseableHttpResponse response = null;
+            HttpGet httpGet = new HttpGet(url);
+            client = HttpClients.createDefault();
+            response = client.execute(httpGet);
+            HttpEntity entity = response.getEntity();
+            jsonObjectStr = EntityUtils.toString(entity);
+        } catch (Exception e) {
+            throw new JeecgBootException("授权失败，请稍后重试");
+        }
+        JSONObject jsonObject = JSONObject.parseObject(jsonObjectStr);
+        return jsonObject;
+    }
+
+}
+

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java

@@ -1,61 +1,61 @@
-package org.jeecg.modules.bean;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-public class LoginReq {
-
-    /**
-     * 参数信息
-     */
-    @ApiModelProperty(value = "参数信息")
-    private String code;
-
-    /**
-     * 参数信息
-     */
-    @ApiModelProperty(value = "参数信息")
-    private String vid;
-
-    /**
-     * 用户唯一标识
-     */
-    @ApiModelProperty(value = "用户唯一标识")
-    private String openid;
-    /**
-     * 会话密钥
-     */
-    @ApiModelProperty(value = "会话密钥")
-    private String session_key;
-    /**
-     * 用户姓名
-     */
-    @ApiModelProperty(value = "用户姓名")
-    private String nickName;
-    /**
-     * 用户头像
-     */
-    @ApiModelProperty(value = "用户头像")
-    private String headimgurl;
-
-    /**
-     * 解密标签
-     */
-    @ApiModelProperty(value = "解密标签")
-    private String iv;
-
-    /**
-     * 解密
-     */
-    @ApiModelProperty(value = "解密")
-    private String encryptedData;
-
-
-    /**
-     * 邀请者标识
-     */
-    @ApiModelProperty(value = "邀请者销售标识")
-    private String shareId;
-}
+package org.jeecg.modules.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class LoginReq {
+
+    /**
+     * 参数信息
+     */
+    @ApiModelProperty(value = "参数信息")
+    private String code;
+
+    /**
+     * 参数信息
+     */
+    @ApiModelProperty(value = "参数信息")
+    private String vid;
+
+    /**
+     * 用户唯一标识
+     */
+    @ApiModelProperty(value = "用户唯一标识")
+    private String openid;
+    /**
+     * 会话密钥
+     */
+    @ApiModelProperty(value = "会话密钥")
+    private String session_key;
+    /**
+     * 用户姓名
+     */
+    @ApiModelProperty(value = "用户姓名")
+    private String nickName;
+    /**
+     * 用户头像
+     */
+    @ApiModelProperty(value = "用户头像")
+    private String headimgurl;
+
+    /**
+     * 解密标签
+     */
+    @ApiModelProperty(value = "解密标签")
+    private String iv;
+
+    /**
+     * 解密
+     */
+    @ApiModelProperty(value = "解密")
+    private String encryptedData;
+
+
+    /**
+     * 邀请者标识
+     */
+    @ApiModelProperty(value = "邀请者销售标识")
+    private String shareId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/controller/CheerAdminController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cheerAdmin.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.cheerAdmin.entity.CheerAdmin;
+import org.jeecg.modules.cheerAdmin.service.ICheerAdminService;
+
+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-10-06
+ * @Version: V1.0
+ */
+@Api(tags="二维码管理员")
+@RestController
+@RequestMapping("/cheerAdmin/cheerAdmin")
+@Slf4j
+public class CheerAdminController extends JeecgController<CheerAdmin, ICheerAdminService> {
+	@Autowired
+	private ICheerAdminService cheerAdminService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cheerAdmin
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "二维码管理员-分页列表查询")
+	@ApiOperation(value="二维码管理员-分页列表查询", notes="二维码管理员-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CheerAdmin>> queryPageList(CheerAdmin cheerAdmin,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CheerAdmin> queryWrapper = QueryGenerator.initQueryWrapper(cheerAdmin, req.getParameterMap());
+		Page<CheerAdmin> page = new Page<CheerAdmin>(pageNo, pageSize);
+		IPage<CheerAdmin> pageList = cheerAdminService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cheerAdmin
+	 * @return
+	 */
+	@AutoLog(value = "二维码管理员-添加")
+	@ApiOperation(value="二维码管理员-添加", notes="二维码管理员-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CheerAdmin cheerAdmin) {
+		cheerAdminService.save(cheerAdmin);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cheerAdmin
+	 * @return
+	 */
+	@AutoLog(value = "二维码管理员-编辑")
+	@ApiOperation(value="二维码管理员-编辑", notes="二维码管理员-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CheerAdmin cheerAdmin) {
+		cheerAdminService.updateById(cheerAdmin);
+		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) {
+		cheerAdminService.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.cheerAdminService.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<CheerAdmin> queryById(@RequestParam(name="id",required=true) String id) {
+		CheerAdmin cheerAdmin = cheerAdminService.getById(id);
+		if(cheerAdmin==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cheerAdmin);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cheerAdmin
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CheerAdmin cheerAdmin) {
+        return super.exportXls(request, cheerAdmin, CheerAdmin.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, CheerAdmin.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/entity/CheerAdmin.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.cheerAdmin.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-10-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("cheer_admin")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="cheer_admin对象", description="二维码管理员")
+public class CheerAdmin 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, dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "加油站")
+    private java.lang.String shopId;
+	/**管理员*/
+	@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/cheerAdmin/mapper/CheerAdminMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cheerAdmin.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cheerAdmin.entity.CheerAdmin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 二维码管理员
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+public interface CheerAdminMapper extends BaseMapper<CheerAdmin> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/mapper/xml/CheerAdminMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/service/ICheerAdminService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cheerAdmin.service;
+
+import org.jeecg.modules.cheerAdmin.entity.CheerAdmin;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 二维码管理员
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+public interface ICheerAdminService extends IService<CheerAdmin> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/service/impl/CheerAdminServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cheerAdmin.service.impl;
+
+import org.jeecg.modules.cheerAdmin.entity.CheerAdmin;
+import org.jeecg.modules.cheerAdmin.mapper.CheerAdminMapper;
+import org.jeecg.modules.cheerAdmin.service.ICheerAdminService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 二维码管理员
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+@Service
+public class CheerAdminServiceImpl extends ServiceImpl<CheerAdminMapper, CheerAdmin> implements ICheerAdminService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/vue/CheerAdminList.vue

@@ -0,0 +1,178 @@
+<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>
+
+    <cheer-admin-modal ref="modalForm" @ok="modalFormOk"></cheer-admin-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CheerAdminModal from './modules/CheerAdminModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CheerAdminList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CheerAdminModal
+    },
+    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: 'shopId_dictText'
+          },
+          {
+            title:'管理员',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cheerAdmin/cheerAdmin/list",
+          delete: "/cheerAdmin/cheerAdmin/delete",
+          deleteBatch: "/cheerAdmin/cheerAdmin/deleteBatch",
+          exportXlsUrl: "/cheerAdmin/cheerAdmin/exportXls",
+          importExcelUrl: "cheerAdmin/cheerAdmin/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'shopId',text:'加油站',dictTable:"cheer_shop", dictText:'name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'userId',text:'管理员',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'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/cheerAdmin/vue/modules/CheerAdminForm.vue

@@ -0,0 +1,109 @@
+<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="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="cheer_shop,name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="管理员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </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: 'CheerAdminForm',
+    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: "/cheerAdmin/cheerAdmin/add",
+          edit: "/cheerAdmin/cheerAdmin/edit",
+          queryById: "/cheerAdmin/cheerAdmin/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/cheerAdmin/vue/modules/CheerAdminModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <cheer-admin-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-admin-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 CheerAdminForm from './CheerAdminForm'
+
+  export default {
+    name: 'CheerAdminModal',
+    components: {
+      CheerAdminForm
+    },
+    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/cheerAdmin/vue/modules/CheerAdminModal.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="关闭">
+    <cheer-admin-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-admin-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CheerAdminForm from './CheerAdminForm'
+  export default {
+    name: 'CheerAdminModal',
+    components: {
+      CheerAdminForm
+    },
+    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/cheerAdmin/vue3/CheerAdmin.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cheerAdmin/cheerAdmin/list',
+  save='/cheerAdmin/cheerAdmin/add',
+  edit='/cheerAdmin/cheerAdmin/edit',
+  deleteOne = '/cheerAdmin/cheerAdmin/delete',
+  deleteBatch = '/cheerAdmin/cheerAdmin/deleteBatch',
+  importExcel = '/cheerAdmin/cheerAdmin/importExcel',
+  exportXls = '/cheerAdmin/cheerAdmin/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/cheerAdmin/vue3/CheerAdmin.data.ts

@@ -0,0 +1,39 @@
+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: 'shopId_dictText'
+   },
+   {
+    title: '管理员',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '加油站',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"cheer_shop,name,id"
+    },
+  },
+  {
+    label: '管理员',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerAdmin/vue3/CheerAdminList.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>
+    <!-- 表单区域 -->
+    <CheerAdminModal @register="registerModal" @success="handleSuccess"></CheerAdminModal>
+  </div>
+</template>
+
+<script lang="ts" name="cheerAdmin-cheerAdmin" 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 CheerAdminModal from './components/CheerAdminModal.vue'
+  import {columns, searchFormSchema} from './CheerAdmin.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './CheerAdmin.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/cheerAdmin/vue3/components/CheerAdminModal.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 '../CheerAdmin.data';
+    import {saveOrUpdate} from '../CheerAdmin.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/cheerPrinter/controller/CheerPrinterController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cheerPrinter.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.cheerPrinter.entity.CheerPrinter;
+import org.jeecg.modules.cheerPrinter.service.ICheerPrinterService;
+
+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-10-06
+ * @Version: V1.0
+ */
+@Api(tags="打印机配置")
+@RestController
+@RequestMapping("/cheerPrinter/cheerPrinter")
+@Slf4j
+public class CheerPrinterController extends JeecgController<CheerPrinter, ICheerPrinterService> {
+	@Autowired
+	private ICheerPrinterService cheerPrinterService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cheerPrinter
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "打印机配置-分页列表查询")
+	@ApiOperation(value="打印机配置-分页列表查询", notes="打印机配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CheerPrinter>> queryPageList(CheerPrinter cheerPrinter,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CheerPrinter> queryWrapper = QueryGenerator.initQueryWrapper(cheerPrinter, req.getParameterMap());
+		Page<CheerPrinter> page = new Page<CheerPrinter>(pageNo, pageSize);
+		IPage<CheerPrinter> pageList = cheerPrinterService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cheerPrinter
+	 * @return
+	 */
+	@AutoLog(value = "打印机配置-添加")
+	@ApiOperation(value="打印机配置-添加", notes="打印机配置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CheerPrinter cheerPrinter) {
+		cheerPrinterService.save(cheerPrinter);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cheerPrinter
+	 * @return
+	 */
+	@AutoLog(value = "打印机配置-编辑")
+	@ApiOperation(value="打印机配置-编辑", notes="打印机配置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CheerPrinter cheerPrinter) {
+		cheerPrinterService.updateById(cheerPrinter);
+		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) {
+		cheerPrinterService.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.cheerPrinterService.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<CheerPrinter> queryById(@RequestParam(name="id",required=true) String id) {
+		CheerPrinter cheerPrinter = cheerPrinterService.getById(id);
+		if(cheerPrinter==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cheerPrinter);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cheerPrinter
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CheerPrinter cheerPrinter) {
+        return super.exportXls(request, cheerPrinter, CheerPrinter.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, CheerPrinter.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/entity/CheerPrinter.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.cheerPrinter.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-10-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("cheer_printer")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="cheer_printer对象", description="打印机配置")
+public class CheerPrinter 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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**接口地址*/
+	@Excel(name = "接口地址", width = 15)
+    @ApiModelProperty(value = "接口地址")
+    private java.lang.String url;
+	/**打印机用户*/
+	@Excel(name = "打印机用户", width = 15)
+    @ApiModelProperty(value = "打印机用户")
+    private java.lang.String user;
+	/**UKEY*/
+	@Excel(name = "UKEY", width = 15)
+    @ApiModelProperty(value = "UKEY")
+    private java.lang.String userKey;
+	/**打印机编号*/
+	@Excel(name = "打印机编号", width = 15)
+    @ApiModelProperty(value = "打印机编号")
+    private java.lang.String sn;
+	/**打印机*/
+	@Excel(name = "打印机", width = 15)
+    @ApiModelProperty(value = "打印机")
+    private java.lang.String snList;
+	/**加油站名称*/
+	@Excel(name = "加油站名称", width = 15)
+    @ApiModelProperty(value = "加油站名称")
+    private java.lang.String name;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/mapper/CheerPrinterMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cheerPrinter.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cheerPrinter.entity.CheerPrinter;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 打印机配置
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+public interface CheerPrinterMapper extends BaseMapper<CheerPrinter> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/mapper/xml/CheerPrinterMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/service/ICheerPrinterService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cheerPrinter.service;
+
+import org.jeecg.modules.cheerPrinter.entity.CheerPrinter;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 打印机配置
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+public interface ICheerPrinterService extends IService<CheerPrinter> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/service/impl/CheerPrinterServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cheerPrinter.service.impl;
+
+import org.jeecg.modules.cheerPrinter.entity.CheerPrinter;
+import org.jeecg.modules.cheerPrinter.mapper.CheerPrinterMapper;
+import org.jeecg.modules.cheerPrinter.service.ICheerPrinterService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 打印机配置
+ * @Author: jeecg-boot
+ * @Date:   2024-10-06
+ * @Version: V1.0
+ */
+@Service
+public class CheerPrinterServiceImpl extends ServiceImpl<CheerPrinterMapper, CheerPrinter> implements ICheerPrinterService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/vue/CheerPrinterList.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>
+
+    <cheer-printer-modal ref="modalForm" @ok="modalFormOk"></cheer-printer-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CheerPrinterModal from './modules/CheerPrinterModal'
+
+  export default {
+    name: 'CheerPrinterList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CheerPrinterModal
+    },
+    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: 'url'
+          },
+          {
+            title:'打印机用户',
+            align:"center",
+            dataIndex: 'user'
+          },
+          {
+            title:'UKEY',
+            align:"center",
+            dataIndex: 'userKey'
+          },
+          {
+            title:'打印机编号',
+            align:"center",
+            dataIndex: 'sn'
+          },
+          {
+            title:'打印机',
+            align:"center",
+            dataIndex: 'snList'
+          },
+          {
+            title:'加油站名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cheerPrinter/cheerPrinter/list",
+          delete: "/cheerPrinter/cheerPrinter/delete",
+          deleteBatch: "/cheerPrinter/cheerPrinter/deleteBatch",
+          exportXlsUrl: "/cheerPrinter/cheerPrinter/exportXls",
+          importExcelUrl: "cheerPrinter/cheerPrinter/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:'url',text:'接口地址',dictCode:''})
+        fieldList.push({type:'string',value:'user',text:'打印机用户',dictCode:''})
+        fieldList.push({type:'string',value:'userKey',text:'UKEY',dictCode:''})
+        fieldList.push({type:'string',value:'sn',text:'打印机编号',dictCode:''})
+        fieldList.push({type:'string',value:'snList',text:'打印机',dictCode:''})
+        fieldList.push({type:'string',value:'name',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/cheerPrinter/vue/modules/CheerPrinterForm.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="接口地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url">
+              <a-input v-model="model.url" placeholder="请输入接口地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印机用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="user">
+              <a-input v-model="model.user" placeholder="请输入打印机用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="UKEY" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userKey">
+              <a-input v-model="model.userKey" placeholder="请输入UKEY"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印机编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sn">
+              <a-input v-model="model.sn" placeholder="请输入打印机编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="snList">
+              <a-input v-model="model.snList" placeholder="请输入打印机"  ></a-input>
+            </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-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: 'CheerPrinterForm',
+    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: "/cheerPrinter/cheerPrinter/add",
+          edit: "/cheerPrinter/cheerPrinter/edit",
+          queryById: "/cheerPrinter/cheerPrinter/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/cheerPrinter/vue/modules/CheerPrinterModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <cheer-printer-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-printer-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 CheerPrinterForm from './CheerPrinterForm'
+
+  export default {
+    name: 'CheerPrinterModal',
+    components: {
+      CheerPrinterForm
+    },
+    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/cheerPrinter/vue/modules/CheerPrinterModal.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="关闭">
+    <cheer-printer-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-printer-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CheerPrinterForm from './CheerPrinterForm'
+  export default {
+    name: 'CheerPrinterModal',
+    components: {
+      CheerPrinterForm
+    },
+    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/cheerPrinter/vue3/CheerPrinter.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cheerPrinter/cheerPrinter/list',
+  save='/cheerPrinter/cheerPrinter/add',
+  edit='/cheerPrinter/cheerPrinter/edit',
+  deleteOne = '/cheerPrinter/cheerPrinter/delete',
+  deleteBatch = '/cheerPrinter/cheerPrinter/deleteBatch',
+  importExcel = '/cheerPrinter/cheerPrinter/importExcel',
+  exportXls = '/cheerPrinter/cheerPrinter/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/cheerPrinter/vue3/CheerPrinter.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: '接口地址',
+    align:"center",
+    dataIndex: 'url'
+   },
+   {
+    title: '打印机用户',
+    align:"center",
+    dataIndex: 'user'
+   },
+   {
+    title: 'UKEY',
+    align:"center",
+    dataIndex: 'userKey'
+   },
+   {
+    title: '打印机编号',
+    align:"center",
+    dataIndex: 'sn'
+   },
+   {
+    title: '打印机',
+    align:"center",
+    dataIndex: 'snList'
+   },
+   {
+    title: '加油站名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '接口地址',
+    field: 'url',
+    component: 'Input',
+  },
+  {
+    label: '打印机用户',
+    field: 'user',
+    component: 'Input',
+  },
+  {
+    label: 'UKEY',
+    field: 'userKey',
+    component: 'Input',
+  },
+  {
+    label: '打印机编号',
+    field: 'sn',
+    component: 'Input',
+  },
+  {
+    label: '打印机',
+    field: 'snList',
+    component: 'Input',
+  },
+  {
+    label: '加油站名称',
+    field: 'name',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerPrinter/vue3/CheerPrinterList.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>
+    <!-- 表单区域 -->
+    <CheerPrinterModal @register="registerModal" @success="handleSuccess"></CheerPrinterModal>
+  </div>
+</template>
+
+<script lang="ts" name="cheerPrinter-cheerPrinter" 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 CheerPrinterModal from './components/CheerPrinterModal.vue'
+  import {columns, searchFormSchema} from './CheerPrinter.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './CheerPrinter.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/cheerPrinter/vue3/components/CheerPrinterModal.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 '../CheerPrinter.data';
+    import {saveOrUpdate} from '../CheerPrinter.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/cheerShop/controller/CheerShopController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cheerShop.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.cheerShop.entity.CheerShop;
+import org.jeecg.modules.cheerShop.service.ICheerShopService;
+
+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-10-10
+ * @Version: V1.0
+ */
+@Api(tags="加油站管理")
+@RestController
+@RequestMapping("/cheerShop/cheerShop")
+@Slf4j
+public class CheerShopController extends JeecgController<CheerShop, ICheerShopService> {
+	@Autowired
+	private ICheerShopService cheerShopService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cheerShop
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "加油站管理-分页列表查询")
+	@ApiOperation(value="加油站管理-分页列表查询", notes="加油站管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CheerShop>> queryPageList(CheerShop cheerShop,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CheerShop> queryWrapper = QueryGenerator.initQueryWrapper(cheerShop, req.getParameterMap());
+		Page<CheerShop> page = new Page<CheerShop>(pageNo, pageSize);
+		IPage<CheerShop> pageList = cheerShopService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cheerShop
+	 * @return
+	 */
+	@AutoLog(value = "加油站管理-添加")
+	@ApiOperation(value="加油站管理-添加", notes="加油站管理-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CheerShop cheerShop) {
+		cheerShopService.save(cheerShop);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cheerShop
+	 * @return
+	 */
+	@AutoLog(value = "加油站管理-编辑")
+	@ApiOperation(value="加油站管理-编辑", notes="加油站管理-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CheerShop cheerShop) {
+		cheerShopService.updateById(cheerShop);
+		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) {
+		cheerShopService.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.cheerShopService.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<CheerShop> queryById(@RequestParam(name="id",required=true) String id) {
+		CheerShop cheerShop = cheerShopService.getById(id);
+		if(cheerShop==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cheerShop);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cheerShop
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CheerShop cheerShop) {
+        return super.exportXls(request, cheerShop, CheerShop.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, CheerShop.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/entity/CheerShop.java

@@ -0,0 +1,95 @@
+package org.jeecg.modules.cheerShop.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-10-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("cheer_shop")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="cheer_shop对象", description="加油站管理")
+public class CheerShop implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**是否启用*/
+	@Excel(name = "是否启用", width = 15)
+    @ApiModelProperty(value = "是否启用")
+    private java.lang.String isOpen;
+	/**加油站名称*/
+	@Excel(name = "加油站名称", width = 15)
+    @ApiModelProperty(value = "加油站名称")
+    private java.lang.String name;
+	/**微信*/
+	@Excel(name = "微信", width = 15)
+    @ApiModelProperty(value = "微信")
+    private java.lang.String wx;
+	/**打印次数*/
+	@Excel(name = "打印次数", width = 15)
+    @ApiModelProperty(value = "打印次数")
+    private java.lang.Integer num;
+	/**几号汽油*/
+	@Excel(name = "几号汽油", width = 15)
+    @ApiModelProperty(value = "几号汽油")
+    private java.lang.String title;
+	/**加油折扣*/
+	@Excel(name = "加油折扣", width = 15)
+    @ApiModelProperty(value = "加油折扣")
+    private java.math.BigDecimal preferential;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+	/**单价*/
+	@Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private java.math.BigDecimal price;
+	/**管理员微信*/
+	@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;
+	/**打印机*/
+	@Excel(name = "打印机", width = 15, dictTable = "cheer_printer", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "cheer_printer", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "打印机")
+    private java.lang.String printerId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/mapper/CheerShopMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cheerShop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cheerShop.entity.CheerShop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 加油站管理
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface CheerShopMapper extends BaseMapper<CheerShop> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/mapper/xml/CheerShopMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/service/ICheerShopService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cheerShop.service;
+
+import org.jeecg.modules.cheerShop.entity.CheerShop;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 加油站管理
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface ICheerShopService extends IService<CheerShop> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/service/impl/CheerShopServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cheerShop.service.impl;
+
+import org.jeecg.modules.cheerShop.entity.CheerShop;
+import org.jeecg.modules.cheerShop.mapper.CheerShopMapper;
+import org.jeecg.modules.cheerShop.service.ICheerShopService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 加油站管理
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+@Service
+public class CheerShopServiceImpl extends ServiceImpl<CheerShopMapper, CheerShop> implements ICheerShopService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/vue/CheerShopList.vue

@@ -0,0 +1,255 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="加油站名称">
+              <a-input placeholder="请输入加油站名称" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="管理员微信">
+              <j-search-select-tag placeholder="请选择管理员微信" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </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>
+
+    <cheer-shop-modal ref="modalForm" @ok="modalFormOk"></cheer-shop-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CheerShopModal from './modules/CheerShopModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CheerShopList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CheerShopModal
+    },
+    data () {
+      return {
+        description: '加油站管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'是否启用',
+            align:"center",
+            dataIndex: 'isOpen',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
+          },
+          {
+            title:'加油站名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'微信',
+            align:"center",
+            dataIndex: 'wx'
+          },
+          {
+            title:'打印次数',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'几号汽油',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'加油折扣',
+            align:"center",
+            dataIndex: 'preferential'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'管理员微信',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'打印机',
+            align:"center",
+            dataIndex: 'printerId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cheerShop/cheerShop/list",
+          delete: "/cheerShop/cheerShop/delete",
+          deleteBatch: "/cheerShop/cheerShop/deleteBatch",
+          exportXlsUrl: "/cheerShop/cheerShop/exportXls",
+          importExcelUrl: "cheerShop/cheerShop/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'switch',value:'isOpen',text:'是否启用'})
+        fieldList.push({type:'string',value:'name',text:'加油站名称',dictCode:''})
+        fieldList.push({type:'string',value:'wx',text:'微信',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'打印次数',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'几号汽油',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'preferential',text:'加油折扣',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'管理员微信',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'printerId',text:'打印机',dictTable:"cheer_printer", dictText:'name', dictCode:'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/cheerShop/vue/modules/CheerShopForm.vue

@@ -0,0 +1,149 @@
+<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="isOpen">
+              <j-switch v-model="model.isOpen"  ></j-switch>
+            </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="wx">
+              <a-input v-model="model.wx" placeholder="请输入微信"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印次数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入打印次数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="几号汽油" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入几号汽油"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="加油折扣" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="preferential">
+              <a-input-number v-model="model.preferential" placeholder="请输入加油折扣" style="width: 100%" />
+            </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-col :span="24">
+            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="管理员微信" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="printerId">
+              <j-search-select-tag v-model="model.printerId" dict="cheer_printer,name,id"  />
+            </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: 'CheerShopForm',
+    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: "/cheerShop/cheerShop/add",
+          edit: "/cheerShop/cheerShop/edit",
+          queryById: "/cheerShop/cheerShop/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/cheerShop/vue/modules/CheerShopModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <cheer-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-shop-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 CheerShopForm from './CheerShopForm'
+
+  export default {
+    name: 'CheerShopModal',
+    components: {
+      CheerShopForm
+    },
+    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/cheerShop/vue/modules/CheerShopModal.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="关闭">
+    <cheer-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-shop-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CheerShopForm from './CheerShopForm'
+  export default {
+    name: 'CheerShopModal',
+    components: {
+      CheerShopForm
+    },
+    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/cheerShop/vue3/CheerShop.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cheerShop/cheerShop/list',
+  save='/cheerShop/cheerShop/add',
+  edit='/cheerShop/cheerShop/edit',
+  deleteOne = '/cheerShop/cheerShop/delete',
+  deleteBatch = '/cheerShop/cheerShop/deleteBatch',
+  importExcel = '/cheerShop/cheerShop/importExcel',
+  exportXls = '/cheerShop/cheerShop/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/cheerShop/vue3/CheerShop.data.ts

@@ -0,0 +1,145 @@
+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",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
+    title: '是否启用',
+    align:"center",
+    dataIndex: 'isOpen',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '加油站名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '微信',
+    align:"center",
+    dataIndex: 'wx'
+   },
+   {
+    title: '打印次数',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '几号汽油',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '加油折扣',
+    align:"center",
+    dataIndex: 'preferential'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '单价',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '管理员微信',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+   {
+    title: '打印机',
+    align:"center",
+    dataIndex: 'printerId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "加油站名称",
+      field: "name",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "管理员微信",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '是否启用',
+    field: 'isOpen',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '加油站名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '微信',
+    field: 'wx',
+    component: 'Input',
+  },
+  {
+    label: '打印次数',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '几号汽油',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '加油折扣',
+    field: 'preferential',
+    component: 'InputNumber',
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '单价',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '管理员微信',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+  {
+    label: '打印机',
+    field: 'printerId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"cheer_printer,name,id"
+    },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerShop/vue3/CheerShopList.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>
+    <!-- 表单区域 -->
+    <CheerShopModal @register="registerModal" @success="handleSuccess"></CheerShopModal>
+  </div>
+</template>
+
+<script lang="ts" name="cheerShop-cheerShop" 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 CheerShopModal from './components/CheerShopModal.vue'
+  import {columns, searchFormSchema} from './cheerShop.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerShop.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/cheerShop/vue3/components/CheerShopModal.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 '../cheerShop.data';
+    import {saveOrUpdate} from '../cheerShop.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/service/ApiLoginService.java

@@ -1,18 +1,18 @@
-package org.jeecg.modules.service;
-
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.bean.LoginReq;
-
-public interface ApiLoginService {
-
-
-    /**
-     * 公众号授权登录
-     * @param loginReq
-     * @return
-     */
-    Result<?> officialLogin(LoginReq loginReq);
-
-
+package org.jeecg.modules.service;
+
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.bean.LoginReq;
+
+public interface ApiLoginService {
+
+
+    /**
+     * 公众号授权登录
+     * @param loginReq
+     * @return
+     */
+    Result<?> officialLogin(LoginReq loginReq);
+
+
 }

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

@@ -1,163 +1,163 @@
-package org.jeecg.modules.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.xkcoding.http.config.HttpConfig;
-import lombok.Value;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.PasswordUtil;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.bean.ConvertUtils;
-import org.jeecg.modules.bean.HttpConf;
-import org.jeecg.modules.bean.LoginReq;
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
-import org.jeecg.modules.service.ApiLoginService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class ApiLoginServiceImpl implements ApiLoginService {
-
-    //公共用户表
-    @Resource
-    private IHanHaiMemberService hanHaiMemberService;
-
-    //公共缓存类
-    @Resource
-    private RedisUtil redisUtil;
-    @Resource
-    private HttpConf httpConf;
-
-
-
-    /**
-     * 微信公众号-appid
-     */
-
-    private String mpAppId = "wx15be4225a7e41a1e";
-
-    /**
-     * 微信公众号-appSecret
-     */
-
-    private String mpAppSecret = "0fdb77429ffdf206c151af76a663041c";
-
-
-    /**
-     * 公众号授权登录注册
-     * @param loginReq
-     * @return
-     */
-    @Override
-    @Transactional
-    public Result<?> officialLogin(LoginReq loginReq){
-        Map<Object, Object> loginMap = new HashMap<>();
-        if (StringUtils.isBlank(loginReq.getCode())) {
-            throw new JeecgBootException("code为空");
-        }
-        String loginUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" +mpAppId + "&secret=" + mpAppSecret + "&code=" + loginReq.getCode() + "&grant_type=authorization_code";
-        //使用工具类
-        JSONObject json_test = httpConf.getJSONObject(loginUrl);
-        log.info("{} {} -- {}", mpAppId, mpAppSecret, json_test);
-        String wxOpenid = json_test.getString("openid");
-        String wxUnionId = json_test.getString("unionid");
-        String access_token  = json_test.getString("access_token");
-        if (StringUtils.isBlank(wxOpenid)) {
-            throw new JeecgBootException("未获取到openid");
-        }
-        HanHaiMember member = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getOfficialOpenid,wxOpenid).one();
-        if(member!=null){
-//            if (StringUtils.isBlank(member.getVid())){
-//                member.setVid(loginReq.getVid());
-//                member.setVtime(new Date());
-//                hanHaiMemberService.updateById(member);
-//            }
-            //开始获取用户信息
-            String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN";
-            //使用工具类
-            JSONObject json_member = httpConf.getJSONObject(memberUrl);
-            String nickname = json_member.getString("nickname");
-            String headimgurl  = json_member.getString("headimgurl");
-            try {
-                nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-            member.setNickName(nickname);
-            member.setHeadImage(headimgurl);
-            member.setWxUnionid(wxUnionId);
-            String token = JwtUtil.sign(member.getAccount(), member.getAccount());
-            member.setToken(token);
-            member.setUpdateTime(new Date());
-            hanHaiMemberService.updateById(member);
-
-
-            // 生成token返回
-
-            redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-            // 设置超时时间
-            redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
-            loginMap.put("token",token);
-            loginMap.put("userInfo",member);
-
-            return Result.OK("登录成功",loginMap);
-        }
-        //开始获取用户信息
-        String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN";
-        //使用工具类
-        JSONObject json_member = httpConf.getJSONObject(memberUrl);
-        String nickname = json_member.getString("nickname");
-        String headimgurl  = json_member.getString("headimgurl");
-        try {
-            nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        HanHaiMember save = new HanHaiMember();
-        save.setAccount(wxOpenid);
-        save.setVid(loginReq.getVid());
-        save.setVtime(new Date());
-        save.setNickName(nickname);
-        save.setHeadImage(headimgurl);
-        save.setWxUnionid(wxUnionId);
-
-        //销售邀请者标识
-        save.setShareId(loginReq.getShareId());
-
-        save.setOfficialOpenid(wxOpenid);
-        save.setCreateTime(new Date());
-        //密码加密
-        String salt = ConvertUtils.randomGen(8);
-        String encrypt = PasswordUtil.encrypt(wxOpenid,"123456" , salt);
-        save.setPassword(encrypt);
-        save.setPasswordSalt(salt);
-        save.setDeleteFlag("N");
-        save.setRole("0");
-
-
-        // 生成token返回
-        String token = JwtUtil.sign(wxOpenid, wxOpenid);
-        save.setToken(token);
-
-        hanHaiMemberService.save(save);
-        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-        // 设置超时时间
-        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
-        loginMap.put("token",token);
-        loginMap.put("userInfo",save);
-        return Result.OK("登录成功",loginMap);
-    }
-}
+package org.jeecg.modules.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xkcoding.http.config.HttpConfig;
+import lombok.Value;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.PasswordUtil;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.bean.ConvertUtils;
+import org.jeecg.modules.bean.HttpConf;
+import org.jeecg.modules.bean.LoginReq;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.service.ApiLoginService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class ApiLoginServiceImpl implements ApiLoginService {
+
+    //公共用户表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
+    //公共缓存类
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private HttpConf httpConf;
+
+
+
+    /**
+     * 微信公众号-appid
+     */
+
+    private String mpAppId = "wx15be4225a7e41a1e";
+
+    /**
+     * 微信公众号-appSecret
+     */
+
+    private String mpAppSecret = "0fdb77429ffdf206c151af76a663041c";
+
+
+    /**
+     * 公众号授权登录注册
+     * @param loginReq
+     * @return
+     */
+    @Override
+    @Transactional
+    public Result<?> officialLogin(LoginReq loginReq){
+        Map<Object, Object> loginMap = new HashMap<>();
+        if (StringUtils.isBlank(loginReq.getCode())) {
+            throw new JeecgBootException("code为空");
+        }
+        String loginUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" +mpAppId + "&secret=" + mpAppSecret + "&code=" + loginReq.getCode() + "&grant_type=authorization_code";
+        //使用工具类
+        JSONObject json_test = httpConf.getJSONObject(loginUrl);
+        log.info("{} {} -- {}", mpAppId, mpAppSecret, json_test);
+        String wxOpenid = json_test.getString("openid");
+        String wxUnionId = json_test.getString("unionid");
+        String access_token  = json_test.getString("access_token");
+        if (StringUtils.isBlank(wxOpenid)) {
+            throw new JeecgBootException("未获取到openid");
+        }
+        HanHaiMember member = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getOfficialOpenid,wxOpenid).one();
+        if(member!=null){
+//            if (StringUtils.isBlank(member.getVid())){
+//                member.setVid(loginReq.getVid());
+//                member.setVtime(new Date());
+//                hanHaiMemberService.updateById(member);
+//            }
+            //开始获取用户信息
+            String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN";
+            //使用工具类
+            JSONObject json_member = httpConf.getJSONObject(memberUrl);
+            String nickname = json_member.getString("nickname");
+            String headimgurl  = json_member.getString("headimgurl");
+            try {
+                nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            member.setNickName(nickname);
+            member.setHeadImage(headimgurl);
+            member.setWxUnionid(wxUnionId);
+            String token = JwtUtil.sign(member.getAccount(), member.getAccount());
+            member.setToken(token);
+            member.setUpdateTime(new Date());
+            hanHaiMemberService.updateById(member);
+
+
+            // 生成token返回
+
+            redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+            // 设置超时时间
+            redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+            loginMap.put("token",token);
+            loginMap.put("userInfo",member);
+
+            return Result.OK("登录成功",loginMap);
+        }
+        //开始获取用户信息
+        String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN";
+        //使用工具类
+        JSONObject json_member = httpConf.getJSONObject(memberUrl);
+        String nickname = json_member.getString("nickname");
+        String headimgurl  = json_member.getString("headimgurl");
+        try {
+            nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        HanHaiMember save = new HanHaiMember();
+        save.setAccount(wxOpenid);
+        save.setVid(loginReq.getVid());
+        save.setVtime(new Date());
+        save.setNickName(nickname);
+        save.setHeadImage(headimgurl);
+        save.setWxUnionid(wxUnionId);
+
+        //销售邀请者标识
+        save.setShareId(loginReq.getShareId());
+
+        save.setOfficialOpenid(wxOpenid);
+        save.setCreateTime(new Date());
+        //密码加密
+        String salt = ConvertUtils.randomGen(8);
+        String encrypt = PasswordUtil.encrypt(wxOpenid,"123456" , salt);
+        save.setPassword(encrypt);
+        save.setPasswordSalt(salt);
+        save.setDeleteFlag("N");
+        save.setRole("0");
+
+
+        // 生成token返回
+        String token = JwtUtil.sign(wxOpenid, wxOpenid);
+        save.setToken(token);
+
+        hanHaiMemberService.save(save);
+        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+        // 设置超时时间
+        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+        loginMap.put("token",token);
+        loginMap.put("userInfo",save);
+        return Result.OK("登录成功",loginMap);
+    }
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.travelExperience.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.travelExperience.entity.TravelExperience;
+import org.jeecg.modules.travelExperience.service.ITravelExperienceService;
+
+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-10-10
+ * @Version: V1.0
+ */
+@Api(tags="非遗体验表")
+@RestController
+@RequestMapping("/travelExperience/travelExperience")
+@Slf4j
+public class TravelExperienceController extends JeecgController<TravelExperience, ITravelExperienceService> {
+	@Autowired
+	private ITravelExperienceService travelExperienceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param travelExperience
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "非遗体验表-分页列表查询")
+	@ApiOperation(value="非遗体验表-分页列表查询", notes="非遗体验表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TravelExperience>> queryPageList(TravelExperience travelExperience,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TravelExperience> queryWrapper = QueryGenerator.initQueryWrapper(travelExperience, req.getParameterMap());
+		Page<TravelExperience> page = new Page<TravelExperience>(pageNo, pageSize);
+		IPage<TravelExperience> pageList = travelExperienceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param travelExperience
+	 * @return
+	 */
+	@AutoLog(value = "非遗体验表-添加")
+	@ApiOperation(value="非遗体验表-添加", notes="非遗体验表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TravelExperience travelExperience) {
+		travelExperienceService.save(travelExperience);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param travelExperience
+	 * @return
+	 */
+	@AutoLog(value = "非遗体验表-编辑")
+	@ApiOperation(value="非遗体验表-编辑", notes="非遗体验表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TravelExperience travelExperience) {
+		travelExperienceService.updateById(travelExperience);
+		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) {
+		travelExperienceService.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.travelExperienceService.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<TravelExperience> queryById(@RequestParam(name="id",required=true) String id) {
+		TravelExperience travelExperience = travelExperienceService.getById(id);
+		if(travelExperience==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(travelExperience);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param travelExperience
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TravelExperience travelExperience) {
+        return super.exportXls(request, travelExperience, TravelExperience.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, TravelExperience.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.travelExperience.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-10-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_experience")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_experience对象", description="非遗体验表")
+public class TravelExperience implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**非遗体验标题*/
+	@Excel(name = "非遗体验标题", width = 15)
+    @ApiModelProperty(value = "非遗体验标题")
+    private java.lang.String experienceTitle;
+	/**非遗体验封面*/
+	@Excel(name = "非遗体验封面", width = 15)
+    @ApiModelProperty(value = "非遗体验封面")
+    private java.lang.String experienceImage;
+	/**开放时间*/
+	@Excel(name = "开放时间", width = 15)
+    @ApiModelProperty(value = "开放时间")
+    private java.lang.String experienceOpentime;
+	/**非遗体验详情*/
+	@Excel(name = "非遗体验详情", width = 15)
+    @ApiModelProperty(value = "非遗体验详情")
+    private java.lang.String experienceDetail;
+	/**开放时间*/
+	@Excel(name = "开放时间", width = 15)
+    @ApiModelProperty(value = "开放时间")
+    private java.lang.String openTime;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private java.math.BigDecimal experienceLongitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private java.math.BigDecimal experienceLatitude;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal experiencePrice;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelExperience.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelExperience.entity.TravelExperience;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 非遗体验表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface TravelExperienceMapper extends BaseMapper<TravelExperience> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/xml/TravelExperienceMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelExperience.service;
+
+import org.jeecg.modules.travelExperience.entity.TravelExperience;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 非遗体验表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface ITravelExperienceService extends IService<TravelExperience> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelExperience.service.impl;
+
+import org.jeecg.modules.travelExperience.entity.TravelExperience;
+import org.jeecg.modules.travelExperience.mapper.TravelExperienceMapper;
+import org.jeecg.modules.travelExperience.service.ITravelExperienceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 非遗体验表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+@Service
+public class TravelExperienceServiceImpl extends ServiceImpl<TravelExperienceMapper, TravelExperience> implements ITravelExperienceService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue

@@ -0,0 +1,221 @@
+<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-experience-modal ref="modalForm" @ok="modalFormOk"></travel-experience-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelExperienceModal from './modules/TravelExperienceModal'
+
+  export default {
+    name: 'TravelExperienceList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelExperienceModal
+    },
+    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: 'experienceTitle'
+          },
+          {
+            title:'非遗体验封面',
+            align:"center",
+            dataIndex: 'experienceImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'开放时间',
+            align:"center",
+            dataIndex: 'experienceOpentime'
+          },
+          {
+            title:'非遗体验详情',
+            align:"center",
+            dataIndex: 'experienceDetail',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'开放时间',
+            align:"center",
+            dataIndex: 'openTime'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'experienceLongitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'experienceLatitude'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'experiencePrice'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelExperience/travelExperience/list",
+          delete: "/travelExperience/travelExperience/delete",
+          deleteBatch: "/travelExperience/travelExperience/deleteBatch",
+          exportXlsUrl: "/travelExperience/travelExperience/exportXls",
+          importExcelUrl: "travelExperience/travelExperience/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:'experienceTitle',text:'非遗体验标题',dictCode:''})
+        fieldList.push({type:'string',value:'experienceImage',text:'非遗体验封面',dictCode:''})
+        fieldList.push({type:'string',value:'experienceOpentime',text:'开放时间',dictCode:''})
+        fieldList.push({type:'Text',value:'experienceDetail',text:'非遗体验详情',dictCode:''})
+        fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experienceLongitude',text:'经度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experienceLatitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experiencePrice',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/travelExperience/vue/modules/TravelExperienceForm.vue

@@ -0,0 +1,144 @@
+<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="experienceTitle">
+              <a-input v-model="model.experienceTitle" placeholder="请输入非遗体验标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="非遗体验封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceImage">
+              <j-image-upload isMultiple  v-model="model.experienceImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开放时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceOpentime">
+              <a-input v-model="model.experienceOpentime" placeholder="请输入开放时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="非遗体验详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceDetail">
+              <j-editor v-model="model.experienceDetail" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开放时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openTime">
+              <a-input v-model="model.openTime" 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-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceLongitude">
+              <a-input-number v-model="model.experienceLongitude" placeholder="请输入经度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceLatitude">
+              <a-input-number v-model="model.experienceLatitude" placeholder="请输入纬度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experiencePrice">
+              <a-input-number v-model="model.experiencePrice" 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: 'TravelExperienceForm',
+    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: "/travelExperience/travelExperience/add",
+          edit: "/travelExperience/travelExperience/edit",
+          queryById: "/travelExperience/travelExperience/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/travelExperience/vue/modules/TravelExperienceModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <travel-experience-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></travel-experience-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 TravelExperienceForm from './TravelExperienceForm'
+
+  export default {
+    name: 'TravelExperienceModal',
+    components: {
+      TravelExperienceForm
+    },
+    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/travelExperience/vue/modules/TravelExperienceModal.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-experience-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></travel-experience-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TravelExperienceForm from './TravelExperienceForm'
+  export default {
+    name: 'TravelExperienceModal',
+    components: {
+      TravelExperienceForm
+    },
+    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/travelExperience/vue3/TravelExperience.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/travelExperience/travelExperience/list',
+  save='/travelExperience/travelExperience/add',
+  edit='/travelExperience/travelExperience/edit',
+  deleteOne = '/travelExperience/travelExperience/delete',
+  deleteBatch = '/travelExperience/travelExperience/deleteBatch',
+  importExcel = '/travelExperience/travelExperience/importExcel',
+  exportXls = '/travelExperience/travelExperience/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/travelExperience/vue3/TravelExperience.data.ts

@@ -0,0 +1,107 @@
+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: 'experienceTitle'
+   },
+   {
+    title: '非遗体验封面',
+    align:"center",
+    dataIndex: 'experienceImage',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '开放时间',
+    align:"center",
+    dataIndex: 'experienceOpentime'
+   },
+   {
+    title: '非遗体验详情',
+    align:"center",
+    dataIndex: 'experienceDetail',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '开放时间',
+    align:"center",
+    dataIndex: 'openTime'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '经度',
+    align:"center",
+    dataIndex: 'experienceLongitude'
+   },
+   {
+    title: '纬度',
+    align:"center",
+    dataIndex: 'experienceLatitude'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'experiencePrice'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '非遗体验标题',
+    field: 'experienceTitle',
+    component: 'Input',
+  },
+  {
+    label: '非遗体验封面',
+    field: 'experienceImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '开放时间',
+    field: 'experienceOpentime',
+    component: 'Input',
+  },
+  {
+    label: '非遗体验详情',
+    field: 'experienceDetail',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '开放时间',
+    field: 'openTime',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '经度',
+    field: 'experienceLongitude',
+    component: 'InputNumber',
+  },
+  {
+    label: '纬度',
+    field: 'experienceLatitude',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'experiencePrice',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue3/TravelExperienceList.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>
+    <!-- 表单区域 -->
+    <TravelExperienceModal @register="registerModal" @success="handleSuccess"></TravelExperienceModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelExperience-travelExperience" 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 TravelExperienceModal from './components/TravelExperienceModal.vue'
+  import {columns, searchFormSchema} from './travelExperience.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelExperience.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/travelExperience/vue3/components/TravelExperienceModal.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 '../travelExperience.data';
+    import {saveOrUpdate} from '../travelExperience.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>