修复接口整理

admin-hanhai-vue/.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=壹通告后台管理系统
+VUE_APP_PLATFORM_NAME=帧视界后台管理系统
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

admin-hanhai-vue/public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>壹通告后台管理系统</title>
+  <title>帧视界后台管理系统</title>
 <!--  <link rel="icon" href="<%= BASE_URL %>logo.png">-->
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 壹通告后台管理系统,请耐心等待
+    <div class="load_title">正在加载 帧视界后台管理系统,请耐心等待
 
     </div>
   </div>

admin-hanhai-vue/src/components/layouts/UserLayout.vue

@@ -5,7 +5,7 @@
         <div class="header">
           <a href="/">
 
-            <span class="title">壹通告后台管理系统</span>
+            <span class="title">帧视界后台管理系统</span>
           </a>
         </div>
 <!--        <div class="desc">-->

admin-hanhai-vue/src/components/page/GlobalHeader.vue

@@ -17,8 +17,8 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 壹通告后台管理系统</span>
-      <span v-else>壹通告后台管理系统</span>
+      <span v-if="device === 'desktop'">欢迎进入 帧视界后台管理系统</span>
+      <span v-else>帧视界后台管理系统</span>
 
       <user-menu :theme="theme"/>
     </div>

admin-hanhai-vue/src/components/tools/Logo.vue

@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '壹通告',
+        default: '帧视界',
         required: false
       },
       showTitle: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java

@@ -1,62 +0,0 @@
-package org.jeecg.modules.cheerConf.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-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_conf")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_conf对象", description="配置表")
-public class CheerConf implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**键*/
-	@Excel(name = "键", width = 15)
-    @ApiModelProperty(value = "键")
-    private java.lang.String keyValue;
-	/**说明*/
-	@Excel(name = "说明", width = 15)
-    @ApiModelProperty(value = "说明")
-    private java.lang.String keyTitle;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
-    @ApiModelProperty(value = "内容")
-    private java.lang.String keyCentent;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerConf.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerConfMapper extends BaseMapper<CheerConf> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml

@@ -1,5 +0,0 @@
-<?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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerConf.service;
-
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerConfService extends IService<CheerConf> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerConf.service.impl;
-
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import org.jeecg.modules.cheerConf.mapper.CheerConfMapper;
-import org.jeecg.modules.cheerConf.service.ICheerConfService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerConfServiceImpl extends ServiceImpl<CheerConfMapper, CheerConf> implements ICheerConfService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/CheerConfList.vue

@@ -1,183 +0,0 @@
-<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-conf-modal ref="modalForm" @ok="modalFormOk"></cheer-conf-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerConfModal from './modules/CheerConfModal'
-
-  export default {
-    name: 'CheerConfList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerConfModal
-    },
-    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: 'keyValue'
-          },
-          {
-            title:'说明',
-            align:"center",
-            dataIndex: 'keyTitle'
-          },
-          {
-            title:'内容',
-            align:"center",
-            dataIndex: 'keyCentent'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerConf/cheerConf/list",
-          delete: "/cheerConf/cheerConf/delete",
-          deleteBatch: "/cheerConf/cheerConf/deleteBatch",
-          exportXlsUrl: "/cheerConf/cheerConf/exportXls",
-          importExcelUrl: "cheerConf/cheerConf/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:'keyValue',text:'键',dictCode:''})
-        fieldList.push({type:'string',value:'keyTitle',text:'说明',dictCode:''})
-        fieldList.push({type:'string',value:'keyCentent',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/cheerConf/vue/modules/CheerConfForm.vue

@@ -1,114 +0,0 @@
-<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="keyValue">
-              <a-input v-model="model.keyValue" placeholder="请输入键"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyTitle">
-              <a-input v-model="model.keyTitle" placeholder="请输入说明"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyCentent">
-              <a-input v-model="model.keyCentent" 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: 'CheerConfForm',
-    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: "/cheerConf/cheerConf/add",
-          edit: "/cheerConf/cheerConf/edit",
-          queryById: "/cheerConf/cheerConf/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/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-conf-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 CheerConfForm from './CheerConfForm'
-
-  export default {
-    name: 'CheerConfModal',
-    components: {
-      CheerConfForm
-    },
-    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/cheerConf/vue/modules/CheerConfModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-conf-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerConfForm from './CheerConfForm'
-  export default {
-    name: 'CheerConfModal',
-    components: {
-      CheerConfForm
-    },
-    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/cheerConf/vue3/CheerConf.api.ts

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

@@ -1,43 +0,0 @@
-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: 'keyValue'
-   },
-   {
-    title: '说明',
-    align:"center",
-    dataIndex: 'keyTitle'
-   },
-   {
-    title: '内容',
-    align:"center",
-    dataIndex: 'keyCentent'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '键',
-    field: 'keyValue',
-    component: 'Input',
-  },
-  {
-    label: '说明',
-    field: 'keyTitle',
-    component: 'Input',
-  },
-  {
-    label: '内容',
-    field: 'keyCentent',
-    component: 'Input',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue

@@ -1,162 +0,0 @@
-<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>
-    <!-- 表单区域 -->
-    <CheerConfModal @register="registerModal" @success="handleSuccess"></CheerConfModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerConf-cheerConf" 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 CheerConfModal from './components/CheerConfModal.vue'
-  import {columns, searchFormSchema} from './cheerConf.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerConf.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/cheerConf/vue3/components/CheerConfModal.vue

@@ -1,58 +0,0 @@
-<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 '../cheerConf.data';
-    import {saveOrUpdate} from '../cheerConf.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/cheerRecharge/controller/CheerRechargeController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java

@@ -1,54 +0,0 @@
-package org.jeecg.modules.cheerRecharge.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-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_recharge")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_recharge对象", description="充值套餐")
-public class CheerRecharge implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**金融*/
-	@Excel(name = "金融", width = 15)
-    @ApiModelProperty(value = "金融")
-    private java.math.BigDecimal price;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerRecharge.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerRechargeMapper extends BaseMapper<CheerRecharge> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml

@@ -1,5 +0,0 @@
-<?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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerRecharge.service;
-
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerRechargeService extends IService<CheerRecharge> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerRecharge.service.impl;
-
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import org.jeecg.modules.cheerRecharge.mapper.CheerRechargeMapper;
-import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerRechargeServiceImpl extends ServiceImpl<CheerRechargeMapper, CheerRecharge> implements ICheerRechargeService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue

@@ -1,171 +0,0 @@
-<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-recharge-modal ref="modalForm" @ok="modalFormOk"></cheer-recharge-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerRechargeModal from './modules/CheerRechargeModal'
-
-  export default {
-    name: 'CheerRechargeList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerRechargeModal
-    },
-    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: 'price'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerRecharge/cheerRecharge/list",
-          delete: "/cheerRecharge/cheerRecharge/delete",
-          deleteBatch: "/cheerRecharge/cheerRecharge/deleteBatch",
-          exportXlsUrl: "/cheerRecharge/cheerRecharge/exportXls",
-          importExcelUrl: "cheerRecharge/cheerRecharge/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'BigDecimal',value:'price',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/cheerRecharge/vue/modules/CheerRechargeForm.vue

@@ -1,104 +0,0 @@
-<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="price">
-              <a-input-number v-model="model.price" 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: 'CheerRechargeForm',
-    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: "/cheerRecharge/cheerRecharge/add",
-          edit: "/cheerRecharge/cheerRecharge/edit",
-          queryById: "/cheerRecharge/cheerRecharge/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/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-recharge-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-recharge-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 CheerRechargeForm from './CheerRechargeForm'
-
-  export default {
-    name: 'CheerRechargeModal',
-    components: {
-      CheerRechargeForm
-    },
-    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/cheerRecharge/vue/modules/CheerRechargeModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-recharge-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-recharge-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerRechargeForm from './CheerRechargeForm'
-  export default {
-    name: 'CheerRechargeModal',
-    components: {
-      CheerRechargeForm
-    },
-    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/cheerRecharge/vue3/CheerRecharge.api.ts

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

@@ -1,23 +0,0 @@
-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: 'price'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '金融',
-    field: 'price',
-    component: 'InputNumber',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue

@@ -1,162 +0,0 @@
-<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>
-    <!-- 表单区域 -->
-    <CheerRechargeModal @register="registerModal" @success="handleSuccess"></CheerRechargeModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerRecharge-cheerRecharge" 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 CheerRechargeModal from './components/CheerRechargeModal.vue'
-  import {columns, searchFormSchema} from './cheerRecharge.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerRecharge.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/cheerRecharge/vue3/components/CheerRechargeModal.vue

@@ -1,58 +0,0 @@
-<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 '../cheerRecharge.data';
-    import {saveOrUpdate} from '../cheerRecharge.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/cheerWater/controller/CheerWaterController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java

@@ -1,71 +0,0 @@
-package org.jeecg.modules.cheerWater.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-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_water")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_water对象", description="加油流水表")
-public class CheerWater implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**原价*/
-	@Excel(name = "原价", width = 15)
-    @ApiModelProperty(value = "原价")
-    private java.math.BigDecimal oldPrice;
-	/**支付价*/
-	@Excel(name = "支付价", width = 15)
-    @ApiModelProperty(value = "支付价")
-    private java.math.BigDecimal price;
-	/**订单名称*/
-	@Excel(name = "订单名称", width = 15)
-    @ApiModelProperty(value = "订单名称")
-    private java.lang.String name;
-	/**用户标识*/
-	@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)
-    @ApiModelProperty(value = "支付状态")
-    private java.lang.String state;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerWater.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerWaterMapper extends BaseMapper<CheerWater> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml

@@ -1,5 +0,0 @@
-<?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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerWater.service;
-
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerWaterService extends IService<CheerWater> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerWater.service.impl;
-
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import org.jeecg.modules.cheerWater.mapper.CheerWaterMapper;
-import org.jeecg.modules.cheerWater.service.ICheerWaterService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerWaterServiceImpl extends ServiceImpl<CheerWaterMapper, CheerWater> implements ICheerWaterService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue

@@ -1,203 +0,0 @@
-<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-water-modal ref="modalForm" @ok="modalFormOk"></cheer-water-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerWaterModal from './modules/CheerWaterModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'CheerWaterList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerWaterModal
-    },
-    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: 'oldPrice'
-          },
-          {
-            title:'支付价',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'订单名称',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'用户标识',
-            align:"center",
-            dataIndex: 'userId_dictText'
-          },
-          {
-            title:'支付状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerWater/cheerWater/list",
-          delete: "/cheerWater/cheerWater/delete",
-          deleteBatch: "/cheerWater/cheerWater/deleteBatch",
-          exportXlsUrl: "/cheerWater/cheerWater/exportXls",
-          importExcelUrl: "cheerWater/cheerWater/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    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:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'支付价',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'订单名称',dictCode:''})
-        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'string',value:'state',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/cheerWater/vue/modules/CheerWaterForm.vue

@@ -1,124 +0,0 @@
-<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="oldPrice">
-              <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
-            </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="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="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="state">
-              <a-input v-model="model.state" 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: 'CheerWaterForm',
-    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: "/cheerWater/cheerWater/add",
-          edit: "/cheerWater/cheerWater/edit",
-          queryById: "/cheerWater/cheerWater/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/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-water-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 CheerWaterForm from './CheerWaterForm'
-
-  export default {
-    name: 'CheerWaterModal',
-    components: {
-      CheerWaterForm
-    },
-    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/cheerWater/vue/modules/CheerWaterModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-water-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerWaterForm from './CheerWaterForm'
-  export default {
-    name: 'CheerWaterModal',
-    components: {
-      CheerWaterForm
-    },
-    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/cheerWater/vue3/CheerWater.api.ts

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

@@ -1,72 +0,0 @@
-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: 'oldPrice'
-   },
-   {
-    title: '支付价',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '订单名称',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '用户标识',
-    align:"center",
-    dataIndex: 'userId_dictText'
-   },
-   {
-    title: '支付状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '原价',
-    field: 'oldPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '支付价',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '订单名称',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '用户标识',
-    field: 'userId',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"han_hai_member,nick_name,id"
-    },
-  },
-  {
-    label: '支付状态',
-    field: 'state',
-    component: 'Input',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue

@@ -1,162 +0,0 @@
-<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>
-    <!-- 表单区域 -->
-    <CheerWaterModal @register="registerModal" @success="handleSuccess"></CheerWaterModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerWater-cheerWater" 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 CheerWaterModal from './components/CheerWaterModal.vue'
-  import {columns, searchFormSchema} from './cheerWater.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerWater.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/cheerWater/vue3/components/CheerWaterModal.vue

@@ -1,58 +0,0 @@
-<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 '../cheerWater.data';
-    import {saveOrUpdate} from '../cheerWater.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/payOrder/controller/PayOrderController.java

@@ -1,171 +0,0 @@
-package org.jeecg.modules.payOrder.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.payOrder.entity.PayOrder;
-import org.jeecg.modules.payOrder.service.IPayOrderService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="知识付费订单表")
-@RestController
-@RequestMapping("/payOrder/payOrder")
-@Slf4j
-public class PayOrderController extends JeecgController<PayOrder, IPayOrderService> {
-	@Autowired
-	private IPayOrderService payOrderService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param payOrder
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "知识付费订单表-分页列表查询")
-	@ApiOperation(value="知识付费订单表-分页列表查询", notes="知识付费订单表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<PayOrder>> queryPageList(PayOrder payOrder,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<PayOrder> queryWrapper = QueryGenerator.initQueryWrapper(payOrder, req.getParameterMap());
-		Page<PayOrder> page = new Page<PayOrder>(pageNo, pageSize);
-		IPage<PayOrder> pageList = payOrderService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payOrder
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-添加")
-	@ApiOperation(value="知识付费订单表-添加", notes="知识付费订单表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody PayOrder payOrder) {
-		payOrderService.save(payOrder);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param payOrder
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-编辑")
-	@ApiOperation(value="知识付费订单表-编辑", notes="知识付费订单表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody PayOrder payOrder) {
-		payOrderService.updateById(payOrder);
-		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) {
-		payOrderService.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.payOrderService.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<PayOrder> queryById(@RequestParam(name="id",required=true) String id) {
-		PayOrder payOrder = payOrderService.getById(id);
-		if(payOrder==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payOrder);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param payOrder
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PayOrder payOrder) {
-        return super.exportXls(request, payOrder, PayOrder.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, PayOrder.class);
-    }
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java

@@ -1,74 +0,0 @@
-package org.jeecg.modules.payOrder.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("pay_order")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_order对象", description="知识付费订单表")
-public class PayOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**商品标识*/
-	@Excel(name = "商品标识", width = 15)
-    @ApiModelProperty(value = "商品标识")
-    private java.lang.String shopId;
-	/**订单名称*/
-	@Excel(name = "订单名称", width = 15)
-    @ApiModelProperty(value = "订单名称")
-    private java.lang.String title;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
-    @ApiModelProperty(value = "价格")
-    private java.math.BigDecimal price;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
-    @ApiModelProperty(value = "数量")
-    private java.lang.Integer num;
-	/**用户*/
-	@Excel(name = "用户", width = 15)
-    @ApiModelProperty(value = "用户")
-    private java.lang.String userId;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private java.lang.Integer state;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.payOrder.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface PayOrderMapper extends BaseMapper<PayOrder> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml

@@ -1,5 +0,0 @@
-<?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.payOrder.mapper.PayOrderMapper">
-
-</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.payOrder.service;
-
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IPayOrderService extends IService<PayOrder> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.payOrder.service.impl;
-
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import org.jeecg.modules.payOrder.mapper.PayOrderMapper;
-import org.jeecg.modules.payOrder.service.IPayOrderService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class PayOrderServiceImpl extends ServiceImpl<PayOrderMapper, PayOrder> implements IPayOrderService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue

@@ -1,201 +0,0 @@
-<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>
-
-    <pay-order-modal ref="modalForm" @ok="modalFormOk"></pay-order-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayOrderModal from './modules/PayOrderModal'
-
-  export default {
-    name: 'PayOrderList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayOrderModal
-    },
-    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'
-          },
-          {
-            title:'订单名称',
-            align:"center",
-            dataIndex: 'title'
-          },
-          {
-            title:'价格',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'num'
-          },
-          {
-            title:'用户',
-            align:"center",
-            dataIndex: 'userId'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/payOrder/payOrder/list",
-          delete: "/payOrder/payOrder/delete",
-          deleteBatch: "/payOrder/payOrder/deleteBatch",
-          exportXlsUrl: "/payOrder/payOrder/exportXls",
-          importExcelUrl: "payOrder/payOrder/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:'shopId',text:'商品标识',dictCode:''})
-        fieldList.push({type:'string',value:'title',text:'订单名称',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
-        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'int',value:'state',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/payOrder/vue/modules/PayOrderForm.vue

@@ -1,129 +0,0 @@
-<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">
-              <a-input v-model="model.shopId" placeholder="请输入商品标识"  ></a-input>
-            </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="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="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="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" 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: 'PayOrderForm',
-    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: "/payOrder/payOrder/add",
-          edit: "/payOrder/payOrder/edit",
-          queryById: "/payOrder/payOrder/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/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-order-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 PayOrderForm from './PayOrderForm'
-
-  export default {
-    name: 'PayOrderModal',
-    components: {
-      PayOrderForm
-    },
-    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/payOrder/vue/modules/PayOrderModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-order-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayOrderForm from './PayOrderForm'
-  export default {
-    name: 'PayOrderModal',
-    components: {
-      PayOrderForm
-    },
-    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/payOrder/vue3/PayOrder.api.ts

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

@@ -1,73 +0,0 @@
-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'
-   },
-   {
-    title: '订单名称',
-    align:"center",
-    dataIndex: 'title'
-   },
-   {
-    title: '价格',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '数量',
-    align:"center",
-    dataIndex: 'num'
-   },
-   {
-    title: '用户',
-    align:"center",
-    dataIndex: 'userId'
-   },
-   {
-    title: '状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '商品标识',
-    field: 'shopId',
-    component: 'Input',
-  },
-  {
-    label: '订单名称',
-    field: 'title',
-    component: 'Input',
-  },
-  {
-    label: '价格',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '数量',
-    field: 'num',
-    component: 'InputNumber',
-  },
-  {
-    label: '用户',
-    field: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '状态',
-    field: 'state',
-    component: 'InputNumber',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue

@@ -1,162 +0,0 @@
-<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>
-    <!-- 表单区域 -->
-    <PayOrderModal @register="registerModal" @success="handleSuccess"></PayOrderModal>
-  </div>
-</template>
-
-<script lang="ts" name="payOrder-payOrder" 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 PayOrderModal from './components/PayOrderModal.vue'
-  import {columns, searchFormSchema} from './payOrder.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './payOrder.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/payOrder/vue3/components/PayOrderModal.vue

@@ -1,58 +0,0 @@
-<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 '../payOrder.data';
-    import {saveOrUpdate} from '../payOrder.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/payShop/controller/PayShopController.java

@@ -1,171 +0,0 @@
-package org.jeecg.modules.payShop.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.payShop.entity.PayShop;
-import org.jeecg.modules.payShop.service.IPayShopService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="付费商品修改表")
-@RestController
-@RequestMapping("/payShop/payShop")
-@Slf4j
-public class PayShopController extends JeecgController<PayShop, IPayShopService> {
-	@Autowired
-	private IPayShopService payShopService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param payShop
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "付费商品修改表-分页列表查询")
-	@ApiOperation(value="付费商品修改表-分页列表查询", notes="付费商品修改表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<PayShop>> queryPageList(PayShop payShop,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<PayShop> queryWrapper = QueryGenerator.initQueryWrapper(payShop, req.getParameterMap());
-		Page<PayShop> page = new Page<PayShop>(pageNo, pageSize);
-		IPage<PayShop> pageList = payShopService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payShop
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-添加")
-	@ApiOperation(value="付费商品修改表-添加", notes="付费商品修改表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody PayShop payShop) {
-		payShopService.save(payShop);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param payShop
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-编辑")
-	@ApiOperation(value="付费商品修改表-编辑", notes="付费商品修改表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody PayShop payShop) {
-		payShopService.updateById(payShop);
-		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) {
-		payShopService.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.payShopService.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<PayShop> queryById(@RequestParam(name="id",required=true) String id) {
-		PayShop payShop = payShopService.getById(id);
-		if(payShop==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payShop);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param payShop
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PayShop payShop) {
-        return super.exportXls(request, payShop, PayShop.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, PayShop.class);
-    }
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java

@@ -1,86 +0,0 @@
-package org.jeecg.modules.payShop.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("pay_shop")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_shop对象", description="付费商品修改表")
-public class PayShop implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**图片*/
-	@Excel(name = "图片", width = 15)
-    @ApiModelProperty(value = "图片")
-    private java.lang.String image;
-	/**标题*/
-	@Excel(name = "标题", width = 15)
-    @ApiModelProperty(value = "标题")
-    private java.lang.String title;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
-    @ApiModelProperty(value = "内容")
-    private java.lang.String titleText;
-	/**级别*/
-	@Excel(name = "级别", width = 15)
-    @ApiModelProperty(value = "级别")
-    private java.lang.String classValue;
-	/**购买人数*/
-	@Excel(name = "购买人数", width = 15)
-    @ApiModelProperty(value = "购买人数")
-    private java.lang.String num;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
-    @ApiModelProperty(value = "价格")
-    private java.math.BigDecimal price;
-	/**原价*/
-	@Excel(name = "原价", width = 15)
-    @ApiModelProperty(value = "原价")
-    private java.math.BigDecimal oldPrice;
-	/**资源介绍*/
-	@Excel(name = "资源介绍", width = 15)
-    @ApiModelProperty(value = "资源介绍")
-    private java.lang.String content;
-	/**资源实际内容*/
-	@Excel(name = "资源实际内容", width = 15)
-    @ApiModelProperty(value = "资源实际内容")
-    private java.lang.String conValue;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.payShop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.payShop.entity.PayShop;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface PayShopMapper extends BaseMapper<PayShop> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml

@@ -1,5 +0,0 @@
-<?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.payShop.mapper.PayShopMapper">
-
-</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.payShop.service;
-
-import org.jeecg.modules.payShop.entity.PayShop;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IPayShopService extends IService<PayShop> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.payShop.service.impl;
-
-import org.jeecg.modules.payShop.entity.PayShop;
-import org.jeecg.modules.payShop.mapper.PayShopMapper;
-import org.jeecg.modules.payShop.service.IPayShopService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class PayShopServiceImpl extends ServiceImpl<PayShopMapper, PayShop> implements IPayShopService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue

@@ -1,215 +0,0 @@
-<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>
-
-    <pay-shop-modal ref="modalForm" @ok="modalFormOk"></pay-shop-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayShopModal from './modules/PayShopModal'
-
-  export default {
-    name: 'PayShopList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayShopModal
-    },
-    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: 'image',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'标题',
-            align:"center",
-            dataIndex: 'title'
-          },
-          {
-            title:'内容',
-            align:"center",
-            dataIndex: 'titleText'
-          },
-          {
-            title:'级别',
-            align:"center",
-            dataIndex: 'classValue'
-          },
-          {
-            title:'购买人数',
-            align:"center",
-            dataIndex: 'num'
-          },
-          {
-            title:'价格',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'原价',
-            align:"center",
-            dataIndex: 'oldPrice'
-          },
-          {
-            title:'资源实际内容',
-            align:"center",
-            dataIndex: 'conValue'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/payShop/payShop/list",
-          delete: "/payShop/payShop/delete",
-          deleteBatch: "/payShop/payShop/deleteBatch",
-          exportXlsUrl: "/payShop/payShop/exportXls",
-          importExcelUrl: "payShop/payShop/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:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'titleText',text:'内容',dictCode:''})
-        fieldList.push({type:'string',value:'classValue',text:'级别',dictCode:''})
-        fieldList.push({type:'string',value:'num',text:'购买人数',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
-        fieldList.push({type:'Text',value:'content',text:'资源介绍',dictCode:''})
-        fieldList.push({type:'Text',value:'conValue',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/payShop/vue/modules/PayShopForm.vue

@@ -1,144 +0,0 @@
-<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="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="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="titleText">
-              <a-input v-model="model.titleText" placeholder="请输入内容"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="级别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classValue">
-              <a-input v-model="model.classValue" 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 v-model="model.num" 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="oldPrice">
-              <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="资源介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
-              <j-editor v-model="model.content" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="资源实际内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conValue">
-              <a-input v-model="model.conValue" 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: 'PayShopForm',
-    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: "/payShop/payShop/add",
-          edit: "/payShop/payShop/edit",
-          queryById: "/payShop/payShop/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/payShop/vue/modules/PayShopModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-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 PayShopForm from './PayShopForm'
-
-  export default {
-    name: 'PayShopModal',
-    components: {
-      PayShopForm
-    },
-    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/payShop/vue/modules/PayShopModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-shop-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayShopForm from './PayShopForm'
-  export default {
-    name: 'PayShopModal',
-    components: {
-      PayShopForm
-    },
-    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/payShop/vue3/PayShop.api.ts

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

@@ -1,101 +0,0 @@
-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: 'image',
-    customRender:render.renderAvatar,
-   },
-   {
-    title: '标题',
-    align:"center",
-    dataIndex: 'title'
-   },
-   {
-    title: '内容',
-    align:"center",
-    dataIndex: 'titleText'
-   },
-   {
-    title: '级别',
-    align:"center",
-    dataIndex: 'classValue'
-   },
-   {
-    title: '购买人数',
-    align:"center",
-    dataIndex: 'num'
-   },
-   {
-    title: '价格',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '原价',
-    align:"center",
-    dataIndex: 'oldPrice'
-   },
-   {
-    title: '资源实际内容',
-    align:"center",
-    dataIndex: 'conValue'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '图片',
-    field: 'image',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '标题',
-    field: 'title',
-    component: 'Input',
-  },
-  {
-    label: '内容',
-    field: 'titleText',
-    component: 'Input',
-  },
-  {
-    label: '级别',
-    field: 'classValue',
-    component: 'Input',
-  },
-  {
-    label: '购买人数',
-    field: 'num',
-    component: 'Input',
-  },
-  {
-    label: '价格',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '原价',
-    field: 'oldPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '资源介绍',
-    field: 'content',
-    component: 'JCodeEditor', //TODO String后缀暂未添加
-  },
-  {
-    label: '资源实际内容',
-    field: 'conValue',
-    component: 'Input',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue

@@ -1,162 +0,0 @@
-<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>
-    <!-- 表单区域 -->
-    <PayShopModal @register="registerModal" @success="handleSuccess"></PayShopModal>
-  </div>
-</template>
-
-<script lang="ts" name="payShop-payShop" 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 PayShopModal from './components/PayShopModal.vue'
-  import {columns, searchFormSchema} from './payShop.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './payShop.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/payShop/vue3/components/PayShopModal.vue

@@ -1,58 +0,0 @@
-<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 '../payShop.data';
-    import {saveOrUpdate} from '../payShop.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/shcoolFloor/controller/ShcoolFloorController.java

@@ -1,229 +0,0 @@
-package org.jeecg.modules.shcoolFloor.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.shcoolFloor.entity.ShcoolFloor;
-import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="楼栋表")
-@RestController
-@RequestMapping("/shcoolFloor/shcoolFloor")
-@Slf4j
-public class ShcoolFloorController extends JeecgController<ShcoolFloor, IShcoolFloorService>{
-	@Autowired
-	private IShcoolFloorService shcoolFloorService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param shcoolFloor
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "楼栋表-分页列表查询")
-	@ApiOperation(value="楼栋表-分页列表查询", notes="楼栋表-分页列表查询")
-	@GetMapping(value = "/rootList")
-	public Result<IPage<ShcoolFloor>> queryPageList(ShcoolFloor shcoolFloor,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		String hasQuery = req.getParameter("hasQuery");
-        if(hasQuery != null && "true".equals(hasQuery)){
-            QueryWrapper<ShcoolFloor> queryWrapper =  QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-            List<ShcoolFloor> list = shcoolFloorService.queryTreeListNoPage(queryWrapper);
-            IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-            pageList.setRecords(list);
-            return Result.OK(pageList);
-        }else{
-            String parentId = shcoolFloor.getPid();
-            if (oConvertUtils.isEmpty(parentId)) {
-                parentId = "0";
-            }
-            shcoolFloor.setPid(null);
-            QueryWrapper<ShcoolFloor> queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-            // 使用 eq 防止模糊查询
-            queryWrapper.eq("pid", parentId);
-            Page<ShcoolFloor> page = new Page<ShcoolFloor>(pageNo, pageSize);
-            IPage<ShcoolFloor> pageList = shcoolFloorService.page(page, queryWrapper);
-            return Result.OK(pageList);
-        }
-	}
-
-	 /**
-      * 获取子数据
-      * @param shcoolFloor
-      * @param req
-      * @return
-      */
-	//@AutoLog(value = "楼栋表-获取子数据")
-	@ApiOperation(value="楼栋表-获取子数据", notes="楼栋表-获取子数据")
-	@GetMapping(value = "/childList")
-	public Result<IPage<ShcoolFloor>> queryPageList(ShcoolFloor shcoolFloor,HttpServletRequest req) {
-		QueryWrapper<ShcoolFloor> queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-		List<ShcoolFloor> list = shcoolFloorService.list(queryWrapper);
-		IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-        pageList.setRecords(list);
-		return Result.OK(pageList);
-	}
-
-    /**
-      * 批量查询子节点
-      * @param parentIds 父ID（多个采用半角逗号分割）
-      * @return 返回 IPage
-      * @param parentIds
-      * @return
-      */
-	//@AutoLog(value = "楼栋表-批量获取子数据")
-    @ApiOperation(value="楼栋表-批量获取子数据", notes="楼栋表-批量获取子数据")
-    @GetMapping("/getChildListBatch")
-    public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
-        try {
-            QueryWrapper<ShcoolFloor> queryWrapper = new QueryWrapper<>();
-            List<String> parentIdList = Arrays.asList(parentIds.split(","));
-            queryWrapper.in("pid", parentIdList);
-            List<ShcoolFloor> list = shcoolFloorService.list(queryWrapper);
-            IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-            pageList.setRecords(list);
-            return Result.OK(pageList);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return Result.error("批量查询子节点失败：" + e.getMessage());
-        }
-    }
-	
-	/**
-	 *   添加
-	 *
-	 * @param shcoolFloor
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-添加")
-	@ApiOperation(value="楼栋表-添加", notes="楼栋表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ShcoolFloor shcoolFloor) {
-		shcoolFloorService.addShcoolFloor(shcoolFloor);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param shcoolFloor
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-编辑")
-	@ApiOperation(value="楼栋表-编辑", notes="楼栋表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ShcoolFloor shcoolFloor) {
-		shcoolFloorService.updateShcoolFloor(shcoolFloor);
-		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) {
-		shcoolFloorService.deleteShcoolFloor(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.shcoolFloorService.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<ShcoolFloor> queryById(@RequestParam(name="id",required=true) String id) {
-		ShcoolFloor shcoolFloor = shcoolFloorService.getById(id);
-		if(shcoolFloor==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(shcoolFloor);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param shcoolFloor
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ShcoolFloor shcoolFloor) {
-		return super.exportXls(request, shcoolFloor, ShcoolFloor.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, ShcoolFloor.class);
-    }
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java

@@ -1,63 +0,0 @@
-package org.jeecg.modules.shcoolFloor.entity;
-
-import java.io.Serializable;
-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 java.io.UnsupportedEncodingException;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("shcool_floor")
-@ApiModel(value="shcool_floor对象", description="楼栋表")
-public class ShcoolFloor implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**名称*/
-	@Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "名称")
-    private java.lang.String name;
-	/**排序*/
-	@Excel(name = "排序", width = 15)
-    @ApiModelProperty(value = "排序")
-    private java.lang.Integer sort;
-	/**父级节点*/
-	@Excel(name = "父级节点", width = 15)
-    @ApiModelProperty(value = "父级节点")
-    private java.lang.String pid;
-	/**是否有子节点*/
-	@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
-	@Dict(dicCode = "yn")
-    @ApiModelProperty(value = "是否有子节点")
-    private java.lang.String hasChild;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java

@@ -1,22 +0,0 @@
-package org.jeecg.modules.shcoolFloor.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface ShcoolFloorMapper extends BaseMapper<ShcoolFloor> {
-
-	/**
-	 * 编辑节点状态
-	 * @param id
-	 * @param status
-	 */
-	void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status);
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml

@@ -1,9 +0,0 @@
-<?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.shcoolFloor.mapper.ShcoolFloorMapper">
-
-	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update shcool_floor set has_child = #{status} where id = #{id}
-	</update>
-
-</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java

@@ -1,38 +0,0 @@
-package org.jeecg.modules.shcoolFloor.service;
-
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.exception.JeecgBootException;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.List;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IShcoolFloorService extends IService<ShcoolFloor> {
-
-	/**根节点父ID的值*/
-	public static final String ROOT_PID_VALUE = "0";
-	
-	/**树节点有子节点状态值*/
-	public static final String HASCHILD = "1";
-	
-	/**树节点无子节点状态值*/
-	public static final String NOCHILD = "0";
-
-	/**新增节点*/
-	void addShcoolFloor(ShcoolFloor shcoolFloor);
-	
-	/**修改节点*/
-	void updateShcoolFloor(ShcoolFloor shcoolFloor) throws JeecgBootException;
-	
-	/**删除节点*/
-	void deleteShcoolFloor(String id) throws JeecgBootException;
-
-	/**查询所有数据，无分页*/
-    List<ShcoolFloor> queryTreeListNoPage(QueryWrapper<ShcoolFloor> queryWrapper);
-
-}

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

@@ -1,191 +0,0 @@
-package org.jeecg.modules.shcoolFloor.service.impl;
-
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import org.jeecg.modules.shcoolFloor.mapper.ShcoolFloorMapper;
-import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class ShcoolFloorServiceImpl extends ServiceImpl<ShcoolFloorMapper, ShcoolFloor> implements IShcoolFloorService {
-
-	@Override
-	public void addShcoolFloor(ShcoolFloor shcoolFloor) {
-	   //新增时设置hasChild为0
-	    shcoolFloor.setHasChild(IShcoolFloorService.NOCHILD);
-		if(oConvertUtils.isEmpty(shcoolFloor.getPid())){
-			shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE);
-		}else{
-			//如果当前节点父ID不为空 则设置父节点的hasChildren 为1
-			ShcoolFloor parent = baseMapper.selectById(shcoolFloor.getPid());
-			if(parent!=null && !"1".equals(parent.getHasChild())){
-				parent.setHasChild("1");
-				baseMapper.updateById(parent);
-			}
-		}
-		baseMapper.insert(shcoolFloor);
-	}
-
-	@Override
-	public void updateShcoolFloor(ShcoolFloor shcoolFloor) {
-//		ShcoolFloor entity = this.getById(shcoolFloor.getId());
-//		if(entity==null) {
-//			throw new JeecgBootException("未找到对应实体");
-//		}
-//		String old_pid = entity.getPid();
-//		String new_pid = shcoolFloor.getPid();
-//		if(!old_pid.equals(new_pid)) {
-//			updateOldParentNode(old_pid);
-//			if(oConvertUtils.isEmpty(new_pid)){
-//				shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE);
-//			}
-//			if(!IShcoolFloorService.ROOT_PID_VALUE.equals(shcoolFloor.getPid())) {
-//				baseMapper.updateTreeNodeStatus(shcoolFloor.getPid(), IShcoolFloorService.HASCHILD);
-//			}
-//		}
-//		baseMapper.updateById(shcoolFloor);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void deleteShcoolFloor(String id) throws JeecgBootException {
-//		//查询选中节点下所有子节点一并删除
-//        id = this.queryTreeChildIds(id);
-//        if(id.indexOf(",")>0) {
-//            StringBuffer sb = new StringBuffer();
-//            String[] idArr = id.split(",");
-//            for (String idVal : idArr) {
-//                if(idVal != null){
-//                    ShcoolFloor shcoolFloor = this.getById(idVal);
-//                    String pidVal = shcoolFloor.getPid();
-//                    //查询此节点上一级是否还有其他子节点
-//                    List<ShcoolFloor> dataList = baseMapper.selectList(new QueryWrapper<ShcoolFloor>().eq("pid", pidVal).notIn("id",Arrays.asList(idArr)));
-//                    if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal)
-//                            && !sb.toString().contains(pidVal)){
-//                        //如果当前节点原本有子节点 现在木有了，更新状态
-//                        sb.append(pidVal).append(",");
-//                    }
-//                }
-//            }
-//            //批量删除节点
-//            baseMapper.deleteBatchIds(Arrays.asList(idArr));
-//            //修改已无子节点的标识
-//            String[] pidArr = sb.toString().split(",");
-//            for(String pid : pidArr){
-//                this.updateOldParentNode(pid);
-//            }
-//        }else{
-//            ShcoolFloor shcoolFloor = this.getById(id);
-//            if(shcoolFloor==null) {
-//                throw new JeecgBootException("未找到对应实体");
-//            }
-//            updateOldParentNode(shcoolFloor.getPid());
-//            baseMapper.deleteById(id);
-//        }
-	}
-
-	@Override
-    public List<ShcoolFloor> queryTreeListNoPage(QueryWrapper<ShcoolFloor> queryWrapper) {
-        List<ShcoolFloor> dataList = baseMapper.selectList(queryWrapper);
-        List<ShcoolFloor> mapList = new ArrayList<>();
-        for(ShcoolFloor data : dataList){
-            String pidVal = data.getPid();
-            //递归查询子节点的根节点
-            if(pidVal != null && !"0".equals(pidVal)){
-                ShcoolFloor rootVal = this.getTreeRoot(pidVal);
-                if(rootVal != null && !mapList.contains(rootVal)){
-                    mapList.add(rootVal);
-                }
-            }else{
-                if(!mapList.contains(data)){
-                    mapList.add(data);
-                }
-            }
-        }
-        return mapList;
-    }
-
-//	/**
-//	 * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
-//	 * @param pid
-//	 */
-//	private void updateOldParentNode(String pid) {
-//		if(!IShcoolFloorService.ROOT_PID_VALUE.equals(pid)) {
-//			Integer count = baseMapper.selectCount(new QueryWrapper<ShcoolFloor>().eq("pid", pid));
-//			if(count==null || count<=1) {
-//				baseMapper.updateTreeNodeStatus(pid, IShcoolFloorService.NOCHILD);
-//			}
-//		}
-//	}
-
-	/**
-     * 递归查询节点的根节点
-     * @param pidVal
-     * @return
-     */
-    private ShcoolFloor getTreeRoot(String pidVal){
-        ShcoolFloor data =  baseMapper.selectById(pidVal);
-        if(data != null && !"0".equals(data.getPid())){
-            return this.getTreeRoot(data.getPid());
-        }else{
-            return data;
-        }
-    }
-
-    /**
-     * 根据id查询所有子节点id
-     * @param ids
-     * @return
-     */
-    private String queryTreeChildIds(String ids) {
-        //获取id数组
-        String[] idArr = ids.split(",");
-        StringBuffer sb = new StringBuffer();
-        for (String pidVal : idArr) {
-            if(pidVal != null){
-                if(!sb.toString().contains(pidVal)){
-                    if(sb.toString().length() > 0){
-                        sb.append(",");
-                    }
-                    sb.append(pidVal);
-                    this.getTreeChildIds(pidVal,sb);
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 递归查询所有子节点
-     * @param pidVal
-     * @param sb
-     * @return
-     */
-    private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
-        List<ShcoolFloor> dataList = baseMapper.selectList(new QueryWrapper<ShcoolFloor>().eq("pid", pidVal));
-        if(dataList != null && dataList.size()>0){
-            for(ShcoolFloor tree : dataList) {
-                if(!sb.toString().contains(tree.getId())){
-                    sb.append(",").append(tree.getId());
-                }
-                this.getTreeChildIds(tree.getId(),sb);
-            }
-        }
-        return sb;
-    }
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue

@@ -1,353 +0,0 @@
-<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"
-        rowKey="id"
-        class="j-table-force-nowrap"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        @change="handleTableChange"
-        @expand="handleExpand"
-        v-bind="tableProps">
-
-        <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="handleAddChild(record)">添加下级</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <shcoolFloor-modal ref="modalForm" @ok="modalFormOk"></shcoolFloor-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import { getAction, deleteAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ShcoolFloorModal from './modules/ShcoolFloorModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import { filterObj } from '@/utils/util';
-
-  export default {
-    name: "ShcoolFloorList",
-    mixins:[JeecgListMixin],
-    components: {
-      ShcoolFloorModal
-    },
-    data () {
-      return {
-        description: '楼栋表管理页面',
-        // 表头
-        columns: [
-          {
-            title:'名称',
-            align:"left",
-            dataIndex: 'name'
-          },
-          {
-            title:'排序',
-            align:"left",
-            dataIndex: 'sort'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: "/shcoolFloor/shcoolFloor/rootList",
-          childList: "/shcoolFloor/shcoolFloor/childList",
-          getChildListBatch: "/shcoolFloor/shcoolFloor/getChildListBatch",
-          delete: "/shcoolFloor/shcoolFloor/delete",
-          deleteBatch: "/shcoolFloor/shcoolFloor/deleteBatch",
-          exportXlsUrl: "/shcoolFloor/shcoolFloor/exportXls",
-          importExcelUrl: "shcoolFloor/shcoolFloor/importExcel",
-        },
-        expandedRowKeys:[],
-        hasChildrenField:"hasChild",
-        pidField:"pid",
-        dictOptions: {},
-        loadParent: false,
-        superFieldList:[],
-      }
-    },
-    created() {
-      this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-      tableProps() {
-        let _this = this
-        return {
-          // 列表项是否可选择
-          rowSelection: {
-            selectedRowKeys: _this.selectedRowKeys,
-            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
-          }
-        }
-      }
-    },
-    methods: {
-      loadData(arg){
-        if(arg==1){
-          this.ipagination.current=1
-        }
-        this.loading = true
-        let params = this.getQueryParams()
-        params.hasQuery = 'true'
-        getAction(this.url.list,params).then(res=>{
-          if(res.success){
-            let result = res.result
-            if(Number(result.total)>0){
-              this.ipagination.total = Number(result.total)
-              this.dataSource = this.getDataByResult(res.result.records)
-              return this.loadDataByExpandedRows(this.dataSource)
-            }else{
-              this.ipagination.total=0
-              this.dataSource=[]
-            }
-          }else{
-            this.$message.warning(res.message)
-          }
-        }).finally(()=>{
-          this.loading = false
-        })
-      },
-      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-      loadDataByExpandedRows(dataList) {
-        if (this.expandedRowKeys.length > 0) {
-          return getAction(this.url.getChildListBatch,{ parentIds: this.expandedRowKeys.join(',') }).then(res=>{
-            if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                let pid = item[this.pidField];
-                if (this.expandedRowKeys.join(',').includes(pid)) {
-                 let mapList = listMap.get(pid);
-                  if (mapList == null) {
-                    mapList = [];
-                  }
-                  mapList.push(item);
-                  listMap.set(pid, mapList);
-                }
-              }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                if(list) {
-                  list.forEach(data => {
-                    if (this.expandedRowKeys.includes(data.id)) {
-                      data.children = this.getDataByResult(childrenMap.get(data.id))
-                      fn(data.children)
-                    }
-                  })
-                }
-              }
-              fn(dataList)
-            }
-          })
-        } else {
-          return Promise.resolve()
-        }
-      },
-      getQueryParams(arg) {
-        //获取查询条件
-        let sqp = {}
-        let param = {}
-        if(this.superQueryParams){
-          sqp['superQueryParams']=encodeURI(this.superQueryParams)
-          sqp['superQueryMatchType'] = this.superQueryMatchType
-        }
-        if(arg){
-          param = Object.assign(sqp, this.isorter ,this.filters);
-        }else{
-          param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
-        }
-        if(JSON.stringify(this.queryParam) === "{}" || arg){
-          param.hasQuery = 'false'
-        }else{
-          param.hasQuery = 'true'
-        }
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      searchReset() {
-        //重置
-        this.expandedRowKeys = []
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      getDataByResult(result){
-        if(result){
-          return result.map(item=>{
-            //判断是否标记了带有子节点
-            if(item[this.hasChildrenField]=='1'){
-              let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-              item.children = [loadChild]
-            }
-            return item
-          })
-        }
-      },
-      handleExpand(expanded, record){
-        // 判断是否是展开状态
-        if (expanded) {
-          this.expandedRowKeys.push(record.id)
-          if (record.children.length>0 && record.children[0].isLoading === true) {
-            let params = this.getQueryParams(1);//查询条件
-            params[this.pidField] = record.id
-            params.hasQuery = 'false'
-            params.superQueryParams=""
-            getAction(this.url.childList,params).then((res)=>{
-              if(res.success){
-                if(res.result.records){
-                  record.children = this.getDataByResult(res.result.records)
-                  this.dataSource = [...this.dataSource]
-                }else{
-                  record.children=''
-                  record.hasChildrenField='0'
-                }
-              }else{
-                this.$message.warning(res.message)
-              }
-            })
-          }
-        }else{
-          let keyIndex = this.expandedRowKeys.indexOf(record.id)
-          if(keyIndex>=0){
-            this.expandedRowKeys.splice(keyIndex, 1);
-          }
-        }
-      },
-      handleAddChild(record){
-        this.loadParent = true
-        let obj = {}
-        obj[this.pidField] = record['id']
-        this.$refs.modalForm.add(obj);
-      },
-      handleDeleteNode(id) {
-        if(!this.url.delete){
-          this.$message.error("请设置url.delete属性!")
-          return
-        }
-        var that = this;
-        deleteAction(that.url.delete, {id: id}).then((res) => {
-          if (res.success) {
-             that.loadData(1)
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      batchDel(){
-        if(this.selectedRowKeys.length<=0){
-          this.$message.warning('请选择一条记录！');
-          return false;
-        }else{
-          let ids = "";
-          let that = this;
-          that.selectedRowKeys.forEach(function(val) {
-            ids+=val+",";
-          });
-          that.$confirm({
-            title:"确认删除",
-            content:"是否删除选中数据?",
-            onOk: function(){
-              that.handleDeleteNode(ids)
-              that.onClearSelected();
-            }
-          });
-        }
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
-        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
-        fieldList.push({type:'string',value:'pid',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/shcoolFloor/vue/modules/ShcoolFloorModal.vue

@@ -1,156 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    switchFullscreen
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form-model ref="form" :model="model" :rules="validatorRules">
-        <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-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
-          <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
-        </a-form-model-item>
-        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
-          <j-tree-select
-            ref="treeSelect"
-            placeholder="请选择父级节点"
-            v-model="model.pid"
-            dict="shcool_floor,name,id"
-            pidField="pid"
-            pidValue="0"
-            hasChildField="has_child"
-            >
-          </j-tree-select>
-        </a-form-model-item>
-        
-      </a-form-model>
-    </a-spin>
-  </j-modal>
-</template>
-
-<script>
-
-  import { httpAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-  export default {
-    name: "ShcoolFloorModal",
-    components: { 
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/shcoolFloor/shcoolFloor/add",
-          edit: "/shcoolFloor/shcoolFloor/edit",
-        },
-        expandedRowKeys:[],
-        pidField:"pid"
-     
-      }
-    },
-    created () {
-       //备份model原始值
-       this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add (obj) {
-        this.modelDefault.pid=''
-        this.edit(Object.assign(this.modelDefault , obj));
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.$refs.form.clearValidate()
-      },
-      handleOk () {
-        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';
-            }
-             if(this.model.id && this.model.id === this.model[this.pidField]){
-              that.$message.warning("父级节点不能选择自己");
-              that.confirmLoading = false;
-              return;
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                this.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }else{
-             return false
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      submitSuccess(formData,flag){
-        if(!formData.id){
-          let treeData = this.$refs.treeSelect.getCurrTreeData()
-          this.expandedRowKeys=[]
-          this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
-          this.$emit('ok',formData,this.expandedRowKeys.reverse());
-        }else{
-          this.$emit('ok',formData,flag);
-        }
-      },
-      getExpandKeysByPid(pid,arr,all){
-        if(pid && arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].key==pid){
-              this.expandedRowKeys.push(arr[i].key)
-              this.getExpandKeysByPid(arr[i]['parentId'],all,all)
-            }else{
-              this.getExpandKeysByPid(pid,arr[i].children,all)
-            }
-          }
-        }
-      }
-      
-      
-    }
-  }
-</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts

@@ -1,82 +0,0 @@
-import {defHttp} from "/@/utils/http/axios";
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/shcoolFloor/shcoolFloor/rootList',
-  save='/shcoolFloor/shcoolFloor/add',
-  edit='/shcoolFloor/shcoolFloor/edit',
-  deleteShcoolFloor = '/sys/shcoolFloor/delete',
-  deleteBatch = '/shcoolFloor/shcoolFloor/deleteBatch',
-  importExcel = '/shcoolFloor/shcoolFloor/importExcel',
-  exportXls = '/shcoolFloor/shcoolFloor/exportXls',
-  loadTreeData = '/shcoolFloor/shcoolFloor/loadTreeRoot',
-  getChildList = '/shcoolFloor/shcoolFloor/childList',
-  getChildListBatch = '/shcoolFloor/shcoolFloor/getChildListBatch',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- * @param params
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-/**
- * 删除
- */
-export const deleteShcoolFloor = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteShcoolFloor, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDeleteShcoolFloor = (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 saveOrUpdateDict = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
-/**
- * 查询全部树形节点数据
- * @param params
- */
-export const loadTreeData = (params) =>
-  defHttp.get({url: Api.loadTreeData,params});
-/**
- * 查询子节点数据
- * @param params
- */
-export const getChildList = (params) =>
-  defHttp.get({url: Api.getChildList, params});
-/**
- * 批量查询子节点数据
- * @param params
- */
-export const getChildListBatch = (params) =>
-  defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false});

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts

@@ -1,38 +0,0 @@
-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: 'name'
-   },
-   {
-    title: '排序',
-    align:"center",
-    dataIndex: 'sort'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '名称',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '排序',
-    field: 'sort',
-    component: 'InputNumber',
-  },
-  {
-    label: '父级节点',
-    field: 'pid',
-    component: 'Input',
-  },
-];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue

@@ -1,272 +0,0 @@
-<template>
-  <div class="p-4">
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleCreate" 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="selectedRowKeys.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="ant-design:down-outlined"></Icon>
-          </a-button>
-        </a-dropdown>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-    </BasicTable>
-    <!--字典弹窗-->
-    <ShcoolFloorModal @register="registerModal" @success="handleSuccess"/>
-  </div>
-</template>
-
-<script lang="ts" name="shcoolFloor-shcoolFloor" setup>
-  //ts语法
-  import {ref, computed, unref, toRaw, nextTick} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/src/components/Table';
-  import {useModal} from '/src/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import ShcoolFloorModal from './components/ShcoolFloorModal.vue';
-  import {columns} from './ShcoolFloor.data';
-  import {list, deleteShcoolFloor, batchDeleteShcoolFloor, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './ShcoolFloor.api';
-
-  const expandedRowKeys = ref([]);
-  //字典model
-  const [registerModal, {openModal}] = useModal();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-    tableProps:{
-         title: '楼栋表',
-         columns,
-         canResize:false,
-         actionColumn: {
-             width: 120,
-          },
-    },
-     exportConfig: {
-          name:"楼栋表",
-          url: getExportUrl,
-        },
-        importConfig: {
-          url: getImportUrl,
-          success: importSuccess
-        },
-    })
-
-  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
-
-  /**
-   * 新增事件
-   */
-  function handleCreate() {
-    openModal(true, {
-      isUpdate: false,
-    });
-  }
-
-  /**
-   * 编辑事件
-   */
-  async function handleEdit(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-    });
-  }
-
-  /**
-   * 详情
-   */
-  async function handleDetail(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      hideFooter: true,
-    });
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteShcoolFloor({id: record.id}, importSuccess);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    const ids = selectedRowKeys.value.filter(item => !item.includes('loading'))
-    await batchDeleteShcoolFloor({ids: ids}, importSuccess);
-  }
-  /**
-   * 导入
-   */
-   function importSuccess() {
-    reload() && (expandedRowKeys.value = []);
-  }
-  /**
-   * 添加下级
-   */
-  function handleAddSub(record) {
-    openModal(true, {
-      record,
-      isUpdate: false,
-    });
-  }
-  /**
-   * 成功回调
-   */
-  async function handleSuccess({isUpdate, values, expandedArr}) {
-    if (isUpdate) {
-      //编辑回调
-      updateTableDataRecord(values.id, values);
-    } else {
-        if(!values['pid']){
-            //新增根节点
-            reload();
-        }else{
-            //新增子集
-            expandedRowKeys.value = [];
-            for (let key of unref(expandedArr)) {
-                await expandTreeNode(key)
-            }
-        }
-    }
-  }
-
-  /**
-   * 接口请求成功后回调
-   */
-  function onFetchSuccess(result) {
-      getDataByResult(result.items)&&loadDataByExpandedRows();
-  }
-  /**
-   * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-   */
-  async function loadDataByExpandedRows() {
-      if (unref(expandedRowKeys).length > 0) {
-          const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')});
-          if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                  let pid = item['pid'];
-                  if (unref(expandedRowKeys).includes(pid)) {
-                      let mapList = listMap.get(pid);
-                      if (mapList == null) {
-                          mapList = [];
-                      }
-                      mapList.push(item);
-                      listMap.set(pid, mapList);
-                  }
-              }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                  if(list) {
-                      list.forEach(data => {
-                          if (unref(expandedRowKeys).includes(data.id)) {
-                              data.children = getDataByResult(childrenMap.get(data.id))
-                              fn(data.children)
-                          }
-                      })
-                  }
-              };
-              fn(getDataSource())
-          }
-      }
-  }
-  /**
-   * 处理数据集
-   */
-  function getDataByResult(result){
-      if(result && result.length>0){
-          return result.map(item=>{
-              //判断是否标记了带有子节点
-              if(item["hasChild"]=='1'){
-                  let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-                  item.children = [loadChild]
-              }
-              return item
-          })
-      }
-  }
-  /**
-   *树节点展开合并
-   * */
-  async function handleExpand(expanded, record) {
-    // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据
-    if (expanded) {
-       expandedRowKeys.value.push(record.id)
-      if (record.children.length > 0 && !!record.children[0].isLoading) {
-        let result = await getChildList({pid: record.id});
-        result=result.records?result.records:result;
-        if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-        } else {
-          record.children = null
-          record.hasChild = '0'
-        }
-      }
-    } else {
-      let keyIndex = expandedRowKeys.value.indexOf(record.id)
-      if (keyIndex >= 0) {
-        expandedRowKeys.value.splice(keyIndex, 1);
-      }
-    }
-  }
-  /**
-   *操作表格后处理树节点展开合并
-   * */
-  async function expandTreeNode(key) {
-    let record = findTableDataRecord(key)
-    expandedRowKeys.value.push(key);
-      let result = await getChildList({pid: key});
-      if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-      } else {
-          record.children = null
-          record.hasChild = '0'
-      }
-      updateTableDataRecord(key, record);
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '确定删除吗?',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-      {
-        label: '添加下级',
-        onClick: handleAddSub.bind(null, {pid: record.id}),
-      }
-    ]
-  }
-</script>
-
-<style scoped>
-
-</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue

@@ -1,87 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
-    <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicModal, useModalInner} from '/src/components/Modal';
-  import {BasicForm, useForm} from '/src/components/Form';
-  import {formSchema} from '../shcoolFloor.data';
-  import {loadTreeData, saveOrUpdateDict} from '../shcoolFloor.api';
-  // 获取emit
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  const expandedRowKeys = ref([]);
-  const treeData = ref([]);
-  //表单配置
-  const [registerForm, {resetFields, setFieldsValue, validate, updateSchema}] = useForm({
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    labelCol: {
-      xs: { span: 24 },
-      sm: { span: 4 },
-    },
-    wrapperCol: {
-      xs: { span: 24 },
-      sm: { span: 18 },
-    },
-  });
-  //表单赋值
-  const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    expandedRowKeys.value = [];
-    setModalProps({confirmLoading: false, minHeight: 80});
-    isUpdate.value = !!data?.isUpdate;
-    if (data?.record) {
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-    //父级节点树信息
-    treeData.value = await loadTreeData({'async': false,'pcode':''});
-    updateSchema({
-      field: 'pid',
-      componentProps: {treeData},
-    });
-  });
-  //设置标题
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增字典' : '编辑字典'));
-
-  /**
-   * 根据pid获取展开的节点
-   * @param pid
-   * @param arr
-   */
-  function getExpandKeysByPid(pid,arr){
-    if(pid && arr && arr.length>0){
-      for(let i=0;i<arr.length;i++){
-        if(arr[i].key==pid && unref(expandedRowKeys).indexOf(pid)<0){
-          expandedRowKeys.value.push(arr[i].key);
-          getExpandKeysByPid(arr[i]['parentId'],unref(treeData))
-        }else{
-          getExpandKeysByPid(pid,arr[i].children)
-        }
-      }
-    }
-  }
-  //表单提交事件
-  async function handleSubmit() {
-    try {
-      let values = await validate();
-      setModalProps({confirmLoading: true});
-      //提交表单
-      await saveOrUpdateDict(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //展开的节点信息
-      await getExpandKeysByPid(values['pid'],unref(treeData))
-      //刷新列表(isUpdate:是否编辑;values:表单信息;expandedArr:展开的节点信息)
-      emit('success', {isUpdate: unref(isUpdate), values:{...values},expandedArr: unref(expandedRowKeys).reverse()});
-    } finally {
-      setModalProps({confirmLoading: false});
-    }
-  }
-</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java

@@ -1,110 +0,0 @@
-package org.jeecg.modules.shcoolSub.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-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("shcool_sub")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="shcool_sub对象", description="报修表")
-public class ShcoolSub implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**楼栋*/
-	@Excel(name = "楼栋", width = 15)
-    @ApiModelProperty(value = "楼栋")
-    private java.lang.String building;
-	/**室号*/
-	@Excel(name = "室号", width = 15)
-    @ApiModelProperty(value = "室号")
-    private java.lang.String room;
-	/**项目*/
-	@Excel(name = "项目", width = 15)
-    @ApiModelProperty(value = "项目")
-    private java.lang.String project;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
-    private java.lang.String name;
-	/**简介*/
-	@Excel(name = "简介", width = 15)
-    @ApiModelProperty(value = "简介")
-    private java.lang.String context;
-	/**电话*/
-	@Excel(name = "电话", width = 15)
-    @ApiModelProperty(value = "电话")
-    private java.lang.String phone;
-	/**照片*/
-	@Excel(name = "照片", width = 15)
-    @ApiModelProperty(value = "照片")
-    private java.lang.String image;
-	/**用户标识*/
-	@Excel(name = "用户标识", width = 15)
-    @ApiModelProperty(value = "用户标识")
-    private java.lang.String userId;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private java.lang.String state;
-	/**结单/驳回*/
-	@Excel(name = "结单/驳回", width = 15)
-    @ApiModelProperty(value = "结单/驳回")
-    private java.lang.String cleckState;
-	/**驳回原因*/
-	@Excel(name = "驳回原因", width = 15)
-    @ApiModelProperty(value = "驳回原因")
-    private java.lang.String returnValue;
-	/**结单结果*/
-	@Excel(name = "结单结果", width = 15)
-    @ApiModelProperty(value = "结单结果")
-    private java.lang.String successTitle;
-	/**结单金额*/
-	@Excel(name = "结单金额", width = 15)
-    @ApiModelProperty(value = "结单金额")
-    private java.math.BigDecimal successPrice;
-	/**处理说明*/
-	@Excel(name = "处理说明", width = 15)
-    @ApiModelProperty(value = "处理说明")
-    private java.lang.String sucessText;
-	/**照片*/
-	@Excel(name = "照片", width = 15)
-    @ApiModelProperty(value = "照片")
-    private java.lang.String successImage;
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.shcoolSub.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ShcoolSubMapper extends BaseMapper<ShcoolSub> {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml

@@ -1,5 +0,0 @@
-<?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.shcoolSub.mapper.ShcoolSubMapper">
-
-</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.shcoolSub.service;
-
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface IShcoolSubService extends IService<ShcoolSub> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.shcoolSub.service.impl;
-
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper;
-import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class ShcoolSubServiceImpl extends ServiceImpl<ShcoolSubMapper, ShcoolSub> implements IShcoolSubService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue

@@ -1,256 +0,0 @@
-<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>
-
-    <shcool-sub-modal ref="modalForm" @ok="modalFormOk"></shcool-sub-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ShcoolSubModal from './modules/ShcoolSubModal'
-
-  export default {
-    name: 'ShcoolSubList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ShcoolSubModal
-    },
-    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: 'building'
-          },
-          {
-            title:'室号',
-            align:"center",
-            dataIndex: 'room'
-          },
-          {
-            title:'项目',
-            align:"center",
-            dataIndex: 'project'
-          },
-          {
-            title:'姓名',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'简介',
-            align:"center",
-            dataIndex: 'context'
-          },
-          {
-            title:'电话',
-            align:"center",
-            dataIndex: 'phone'
-          },
-          {
-            title:'照片',
-            align:"center",
-            dataIndex: 'image',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'用户标识',
-            align:"center",
-            dataIndex: 'userId'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title:'结单/驳回',
-            align:"center",
-            dataIndex: 'cleckState'
-          },
-          {
-            title:'驳回原因',
-            align:"center",
-            dataIndex: 'returnValue'
-          },
-          {
-            title:'结单结果',
-            align:"center",
-            dataIndex: 'successTitle'
-          },
-          {
-            title:'结单金额',
-            align:"center",
-            dataIndex: 'successPrice'
-          },
-          {
-            title:'处理说明',
-            align:"center",
-            dataIndex: 'sucessText'
-          },
-          {
-            title:'照片',
-            align:"center",
-            dataIndex: 'successImage'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/shcoolSub/shcoolSub/list",
-          delete: "/shcoolSub/shcoolSub/delete",
-          deleteBatch: "/shcoolSub/shcoolSub/deleteBatch",
-          exportXlsUrl: "/shcoolSub/shcoolSub/exportXls",
-          importExcelUrl: "shcoolSub/shcoolSub/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:'building',text:'楼栋',dictCode:''})
-        fieldList.push({type:'string',value:'room',text:'室号',dictCode:''})
-        fieldList.push({type:'string',value:'project',text:'项目',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'context',text:'简介',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'string',value:'image',text:'照片',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
-        fieldList.push({type:'string',value:'state',text:'状态',dictCode:''})
-        fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:''})
-        fieldList.push({type:'string',value:'returnValue',text:'驳回原因',dictCode:''})
-        fieldList.push({type:'string',value:'successTitle',text:'结单结果',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'successPrice',text:'结单金额',dictCode:''})
-        fieldList.push({type:'string',value:'sucessText',text:'处理说明',dictCode:''})
-        fieldList.push({type:'string',value:'successImage',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/shcoolSub/vue/modules/ShcoolSubForm.vue

@@ -1,174 +0,0 @@
-<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="building">
-              <a-input v-model="model.building" placeholder="请输入楼栋"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="室号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="room">
-              <a-input v-model="model.room" placeholder="请输入室号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="project">
-              <a-input v-model="model.project" 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-col :span="24">
-            <a-form-model-item label="简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="context">
-              <a-textarea v-model="model.context" rows="4" placeholder="请输入简介" />
-            </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="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户标识"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input v-model="model.state" placeholder="请输入状态"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单/驳回" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cleckState">
-              <a-input v-model="model.cleckState" placeholder="请输入结单/驳回"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="驳回原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnValue">
-              <a-input v-model="model.returnValue" placeholder="请输入驳回原因"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successTitle">
-              <a-input v-model="model.successTitle" placeholder="请输入结单结果"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successPrice">
-              <a-input-number v-model="model.successPrice" placeholder="请输入结单金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="处理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sucessText">
-              <a-input v-model="model.sucessText" placeholder="请输入处理说明"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successImage">
-              <a-input v-model="model.successImage" 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: 'ShcoolSubForm',
-    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: "/shcoolSub/shcoolSub/add",
-          edit: "/shcoolSub/shcoolSub/edit",
-          queryById: "/shcoolSub/shcoolSub/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/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></shcool-sub-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 ShcoolSubForm from './ShcoolSubForm'
-
-  export default {
-    name: 'ShcoolSubModal',
-    components: {
-      ShcoolSubForm
-    },
-    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/shcoolSub/vue/modules/ShcoolSubModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></shcool-sub-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import ShcoolSubForm from './ShcoolSubForm'
-  export default {
-    name: 'ShcoolSubModal',
-    components: {
-      ShcoolSubForm
-    },
-    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/shcoolSub/vue3/ShcoolSub.api.ts

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