:white_check_mark: 首页轮播管理

jlsb-vue/src/components/jeecg/JUpload.vue

@@ -130,6 +130,12 @@
         required:false,
         default: 0
       },
+      //返回最新的文件
+      reNewFile:{
+        type:Boolean,
+        required:false,
+        default: false
+      },
       buttonVisible:{
         type:Boolean,
         required:false,
@@ -240,8 +246,14 @@
           }
           // update-end-author:lvdandan date:20200603 for:【TESTA-514】【开源issue】多个文件同时上传时，控制台报错
         }
-        if(arr.length>0){
-          path = arr.join(",")
+        if (!this.reNewFile){
+          if(arr.length>0){
+            path = arr.join(",")
+          }
+        } else {
+          if(arr.length>0){
+            path = arr[arr.length - 1];
+          }
         }
         this.$emit('change', path);
       },
@@ -394,7 +406,7 @@
           this.moveDisplay = 'none';
         });
       }
-    
+
       let picList = document.getElementById(this.containerId)?document.getElementById(this.containerId).getElementsByClassName('ant-upload-list-picture-card'):[];
       if(picList && picList.length>0){
         picList[0].addEventListener('mouseover',(ev)=>{

jlsb-vue/src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   //baseURL: '/jeecg-boot',
   baseURL: apiBaseUrl, // api base_url
   // timeout: 9000 // 请求超时时间
-  timeout: 15000 // 请求超时时间
+  timeout: 30000 // 请求超时时间
 })
 
 const err = (error) => {

jlsb-vue/src/views/aa/AaSlideshowList.vue

@@ -5,17 +5,24 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="腕表介绍图名称">
-              <a-input placeholder="请输入轮播图名称" v-model="queryParam.name"></a-input>
+            <a-form-item label="轮播名称">
+              <a-input placeholder="请输入轮播页名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="10" :lg="11" :md="12" :sm="24">
-            <a-form-item label="创建时间">
-              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
-              <span class="query-group-split-cust"></span>
-              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="所属系列">
+              <j-dict-select-tag placeholder="请选择所属系列" v-model="queryParam.seriesId" dictCode="aa_commodity_fl,name,id"/>
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="创建时间">
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -34,12 +41,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('腕表介绍图管理')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('轮播图管理')">导出</a-button>-->
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -72,6 +79,12 @@
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
+        <template slot="enableSlot" slot-scope="text">
+          <div v-html=""></div>
+          <a-tag :color="text === '已启用'?'blue':'red'">
+            {{text}}
+          </a-tag>
+        </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
           <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
@@ -90,6 +103,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
+          <a @click="handleEnable(record)" :style="{color:record.enable==='0'?'':'red'}">{{record.enable==='0'?'启用':'禁用'}}</a>&nbsp;&nbsp;
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -121,6 +135,9 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AaSlideshowModal from './modules/AaSlideshowModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { getAction, postAction, putAction } from '@/api/manage'
+
 
   export default {
     name: 'AaSlideshowList',
@@ -130,7 +147,7 @@
     },
     data () {
       return {
-        description: '腕表介绍管理管理页面',
+        description: '轮播图管理管理页面',
         // 表头
         columns: [
           {
@@ -144,31 +161,72 @@
             }
           },
           {
-            title:'腕表介绍名称',
+            title:'轮播图名称',
             align:"center",
+            sorter: true,
             dataIndex: 'name'
           },
           {
-            title:'腕表介绍图',
+            title:'轮播资源',
             align:"center",
             dataIndex: 'cover',
-            scopedSlots: {customRender: 'imgSlot'}
+            scopedSlots: {customRender: 'fileSlot'}
           },
           {
-            title:'链接',
+            title:'所属系列',
             align:"center",
-            dataIndex: 'link'
+            sorter: true,
+            dataIndex: 'seriesId_dictText'
           },
           {
-            title:'权重',
+            title:'是否启用',
             align:"center",
-            dataIndex: 'sort'
+            sorter: true,
+            dataIndex: 'enable_dictText',
+            scopedSlots: {customRender: 'enableSlot'}
           },
           {
-            title:'创建时间',
+            title:'排序',
             align:"center",
-            dataIndex: 'createTime'
+            sorter: true,
+            dataIndex: 'sort',
+            width:60,
           },
+          // {
+          //   title:'轮播图名称英语',
+          //   align:"center",
+          //   dataIndex: 'nameEnglish'
+          // },
+          // {
+          //   title:'轮播图名称德语',
+          //   align:"center",
+          //   dataIndex: 'nameGerman'
+          // },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'description'
+          },
+          // {
+          //   title:'描述英语',
+          //   align:"center",
+          //   dataIndex: 'descriptionEnglish'
+          // },
+          // {
+          //   title:'描述德语',
+          //   align:"center",
+          //   dataIndex: 'descriptionGerman'
+          // },
+          // {
+          //   title:'修改时间',
+          //   align:"center",
+          //   dataIndex: 'updateTime'
+          // },
+          // {
+          //   title:'创建时间',
+          //   align:"center",
+          //   dataIndex: 'createTime'
+          // },
           {
             title: '操作',
             dataIndex: 'action',
@@ -181,6 +239,7 @@
         url: {
           list: "/aa/aaSlideshow/list",
           delete: "/aa/aaSlideshow/delete",
+          update: "/aa/aaSlideshow/edit",
           deleteBatch: "/aa/aaSlideshow/deleteBatch",
           exportXlsUrl: "/aa/aaSlideshow/exportXls",
           importExcelUrl: "aa/aaSlideshow/importExcel",
@@ -203,12 +262,32 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'腕表介绍名称',dictCode:''})
-        fieldList.push({type:'string',value:'cover',text:'腕表介绍图',dictCode:''})
-        fieldList.push({type:'string',value:'link',text:'链接',dictCode:''})
-        fieldList.push({type:'int',value:'sort',text:'权重',dictCode:''})
-        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'string',value:'name',text:'轮播图名称',dictCode:''})
+        fieldList.push({type:'string',value:'cover',text:'轮播资源',dictCode:''})
+        fieldList.push({type:'string',value:'seriesId',text:'所属系列',dictCode:"aa_commodity_fl,name,id"})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        fieldList.push({type:'string',value:'nameEnglish',text:'轮播图名称英语',dictCode:''})
+        fieldList.push({type:'string',value:'nameGerman',text:'轮播图名称德语',dictCode:''})
+        fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
+        fieldList.push({type:'string',value:'descriptionEnglish',text:'描述英语',dictCode:''})
+        fieldList.push({type:'string',value:'descriptionGerman',text:'描述德语',dictCode:''})
+        // fieldList.push({type:'datetime',value:'updateTime',text:'修改时间'})
+        // fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
         this.superFieldList = fieldList
+      },
+      handleEnable(record){
+        this.loading = true
+        let param = { id: record['id'], enable: record['enable'] === '0' ? '1' : '0' }
+        postAction(this.url.update, param).then(res => {
+          if (res.success) {
+            this.$message.success(param.enable === '1' ? '启用成功！' : '禁用成功！')
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+          this.searchQuery();
+        })
       }
     }
   }

jlsb-vue/src/views/aa/modules/AaSlideshowForm.vue

@@ -4,48 +4,66 @@
       <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="name">
+            <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="name">
-              <a-input v-model="model.nameEnglish" placeholder="请输入轮播图名称"  ></a-input>
+            <a-form-model-item label="轮播资源" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cover">
+              <j-upload v-model="model.cover" :reNewFile="true" :multiple="false" :beforeUpload="this.beforeUploadHandler" ></j-upload>
+              <template slot="extra">
+                <span>推荐比例16:9</span>
+              </template>
             </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.nameGerman" placeholder="请输入轮播图名称"  ></a-input>
+            <a-form-model-item label="所属系列" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="seriesId">
+              <j-dict-select-tag type="list" v-model="model.seriesId" dictCode="aa_commodity_fl,name,id" placeholder="请选择所属系列" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="腕表介绍描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <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-col>
+          <a-col :span="24">
+            <a-form-model-item label="轮播图名称英语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nameEnglish">
+              <a-input v-model="model.nameEnglish" placeholder="请输入轮播图名称英语"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="轮播图名称德语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nameGerman">
+              <a-input v-model="model.nameGerman" placeholder="请输入轮播图名称德语"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
               <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="腕表介绍描述英语" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="描述英语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descriptionEnglish">
               <a-input v-model="model.descriptionEnglish" placeholder="请输入描述英语"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="腕表介绍描述德语" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="描述德语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descriptionGerman">
               <a-input v-model="model.descriptionGerman" placeholder="请输入描述德语"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="腕表介绍图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cover">
-              <j-image-upload isMultiple  v-model="model.cover" ></j-image-upload>
+<!--          <a-col :span="24">
+            <a-form-model-item label="修改时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
+              <j-date placeholder="请选择修改时间"  v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="链接" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="link">
-              <a-input v-model="model.link" placeholder="请输入链接"  ></a-input>
+            <a-form-model-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择创建时间"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
-          </a-col>
+          </a-col>-->
           <a-col :span="24">
-            <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 label="是否使用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enable">
+              <a-switch checked-children="是" un-checked-children="否" @change="this.enableChange" v-model:checked="model.enable==='1'" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -56,8 +74,7 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
+  import { httpAction } from '@/api/manage'
 
   export default {
     name: 'AaSlideshowForm',
@@ -89,7 +106,10 @@
               { required: true, message: '请输入轮播图名称!'},
            ],
            cover: [
-              { required: true, message: '请输入轮播图!'},
+              { required: true, message: '请输入轮播资源!'},
+           ],
+           seriesId: [
+              { required: true, message: '请输入所属系列!'},
            ],
         },
         url: {
@@ -145,6 +165,21 @@
 
         })
       },
+      beforeUploadHandler(file) {
+        let fileType = file.type;
+        if(fileType.indexOf('image')<0 && fileType.indexOf('video')<0){
+          this.$message.warning('请上传图片或视频');
+          return false;
+        }
+        return true;
+      },
+      enableChange(checked, event){
+        if(checked) {
+          this.model.enable = '1';
+        } else {
+          this.model.enable = '0';
+        }
+      }
     }
   }
 </script>

jlsb-vue/vue.config.js

@@ -86,7 +86,7 @@ module.exports = {
   },
 
   devServer: {
-    port: 3000,
+    port: 3100,
     // hot: true,
     // disableHostCheck: true,
     // overlay: {

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/controller/AaSlideshowController.java

@@ -9,6 +9,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.base.Strings;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -37,19 +41,19 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 轮播图管理
+ * @Description: 轮播管理
  * @Author: jeecg-boot
- * @Date:   2022-10-11
+ * @Date:   2023-12-04
  * @Version: V1.0
  */
-@Api(tags="轮播图管理")
+@Api(tags="首页轮播管理")
 @RestController
 @RequestMapping("/aa/aaSlideshow")
 @Slf4j
 public class AaSlideshowController extends JeecgController<AaSlideshow, IAaSlideshowService> {
 	@Autowired
 	private IAaSlideshowService aaSlideshowService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -59,83 +63,95 @@ public class AaSlideshowController extends JeecgController<AaSlideshow, IAaSlide
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "轮播图管理-分页列表查询")
-	@ApiOperation(value="轮播图管理-分页列表查询", notes="轮播图管理-分页列表查询")
+	//@AutoLog(value = "轮播管理-分页列表查询")
+	@ApiOperation(value="轮播管理-分页列表查询", notes="轮播管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<AaSlideshow>> queryPageList(AaSlideshow aaSlideshow,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		if (!Strings.isNullOrEmpty(aaSlideshow.getName())) {
+			aaSlideshow.setName("*"+aaSlideshow.getName()+"*");
+		}
 		QueryWrapper<AaSlideshow> queryWrapper = QueryGenerator.initQueryWrapper(aaSlideshow, req.getParameterMap());
 		Page<AaSlideshow> page = new Page<AaSlideshow>(pageNo, pageSize);
 		IPage<AaSlideshow> pageList = aaSlideshowService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
+	 @ApiOperation(value="轮播管理-查询要展示的轮播内容", notes="轮播管理-查询要展示的轮播内容")
+	 @GetMapping(value = "/enableList")
+	 public Result<List<AaSlideshow>> getEnableList() {
+		 LambdaQueryWrapper<AaSlideshow> queryWrapper = new LambdaQueryWrapper<>();
+		 queryWrapper.eq(AaSlideshow::getEnable,"1");
+		 List<AaSlideshow> list = aaSlideshowService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
 	/**
 	 *   添加
 	 *
 	 * @param aaSlideshow
 	 * @return
 	 */
-	@AutoLog(value = "轮播图管理-添加")
-	@ApiOperation(value="轮播图管理-添加", notes="轮播图管理-添加")
+	@AutoLog(value = "轮播管理-添加")
+	@ApiOperation(value="轮播管理-添加", notes="轮播管理-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AaSlideshow aaSlideshow) {
 		aaSlideshowService.save(aaSlideshow);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
 	 * @param aaSlideshow
 	 * @return
 	 */
-	@AutoLog(value = "轮播图管理-编辑")
-	@ApiOperation(value="轮播图管理-编辑", notes="轮播图管理-编辑")
+	@AutoLog(value = "轮播管理-编辑")
+	@ApiOperation(value="轮播管理-编辑", notes="轮播管理-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AaSlideshow aaSlideshow) {
 		aaSlideshowService.updateById(aaSlideshow);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "轮播图管理-通过id删除")
-	@ApiOperation(value="轮播图管理-通过id删除", notes="轮播图管理-通过id删除")
+	@AutoLog(value = "轮播管理-通过id删除")
+	@ApiOperation(value="轮播管理-通过id删除", notes="轮播管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		aaSlideshowService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "轮播图管理-批量删除")
-	@ApiOperation(value="轮播图管理-批量删除", notes="轮播图管理-批量删除")
+	@AutoLog(value = "轮播管理-批量删除")
+	@ApiOperation(value="轮播管理-批量删除", notes="轮播管理-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.aaSlideshowService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "轮播图管理-通过id查询")
-	@ApiOperation(value="轮播图管理-通过id查询", notes="轮播图管理-通过id查询")
+	//@AutoLog(value = "轮播管理-通过id查询")
+	@ApiOperation(value="轮播管理-通过id查询", notes="轮播管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<AaSlideshow> queryById(@RequestParam(name="id",required=true) String id) {
 		AaSlideshow aaSlideshow = aaSlideshowService.getById(id);
@@ -153,7 +169,7 @@ public class AaSlideshowController extends JeecgController<AaSlideshow, IAaSlide
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AaSlideshow aaSlideshow) {
-        return super.exportXls(request, aaSlideshow, AaSlideshow.class, "轮播图管理");
+        return super.exportXls(request, aaSlideshow, AaSlideshow.class, "轮播管理");
     }
 
     /**

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/entity/AaSlideshow.java

@@ -18,59 +18,69 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 腕表介绍管理
+ * @Description: 轮播管理
  * @Author: jeecg-boot
- * @Date:   2022-10-11
+ * @Date:   2023-12-04
  * @Version: V1.0
  */
 @Data
 @TableName("aa_slideshow")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="aa_slideshow对象", description="腕表介绍管理")
+@ApiModel(value="aa_slideshow对象", description="轮播管理")
 public class AaSlideshow implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-    private String id;
+    private java.lang.String id;
 	/**轮播图名称*/
 	@Excel(name = "轮播图名称", width = 15)
     @ApiModelProperty(value = "轮播图名称")
-    private String name;
-    @Excel(name = "轮播图名称英语", width = 15)
+    private java.lang.String name;
+	/**轮播资源*/
+	@Excel(name = "轮播资源", width = 15)
+    @ApiModelProperty(value = "轮播资源")
+    private java.lang.String cover;
+	/**所属系列*/
+	@Excel(name = "所属系列", width = 15, dictTable = "aa_commodity_fl", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "aa_commodity_fl", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "所属系列")
+    private java.lang.String seriesId;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private java.lang.Integer sort;
+	/**轮播图名称英语*/
+	@Excel(name = "轮播图名称英语", width = 15)
     @ApiModelProperty(value = "轮播图名称英语")
-    private String nameEnglish;
-    @Excel(name = "轮播图名称德语", width = 15)
+    private java.lang.String nameEnglish;
+	/**轮播图名称德语*/
+	@Excel(name = "轮播图名称德语", width = 15)
     @ApiModelProperty(value = "轮播图名称德语")
-    private String nameGerman;
-
-    //描述
-    @Excel(name = "描述", width = 15)
+    private java.lang.String nameGerman;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
-    private String description;
-    @Excel(name = "描述英语", width = 15)
+    private java.lang.String description;
+	/**描述英语*/
+	@Excel(name = "描述英语", width = 15)
     @ApiModelProperty(value = "描述英语")
-    private String descriptionEnglish;
-    @Excel(name = "描述德语", width = 15)
+    private java.lang.String descriptionEnglish;
+	/**描述德语*/
+	@Excel(name = "描述德语", width = 15)
     @ApiModelProperty(value = "描述德语")
-    private String descriptionGerman;
-
-
-	/**轮播图*/
-	@Excel(name = "轮播图", width = 15)
-    @ApiModelProperty(value = "轮播图")
-    private String cover;
-	/**链接*/
-	@Excel(name = "链接", width = 15)
-    @ApiModelProperty(value = "链接")
-    private String link;
-	/**权重*/
-	@Excel(name = "权重", width = 15)
-    @ApiModelProperty(value = "权重")
-    private Integer sort;
+    private java.lang.String descriptionGerman;
+	/**修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
 	/**创建时间*/
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    private java.util.Date createTime;
+    /**是否使用*/
+    @ApiModelProperty(value = "是否使用 1：是 0：否")
+    @Excel(name = "是否使用", width = 15, dicCode = "aa_slideshow_enable")
+    @Dict(dicCode = "aa_slideshow_enable")
+    private java.lang.String enable;
 }

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/mapper/xml/AaSlideshowMapper.xml

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