1、添加新闻模块

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/controller/TravelNewCategoryController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/entity/TravelNewCategory.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.travelNewCategory.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:   2025-02-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_new_category")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_new_category对象", description="新闻分类表")
+public class TravelNewCategory 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)
+    private transient java.lang.String imageString;
+
+    private byte[] image;
+
+    public byte[] getImage(){
+        if(imageString==null){
+            return null;
+        }
+        try {
+            return imageString.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getImageString(){
+        if(image==null || image.length==0){
+            return "";
+        }
+        try {
+            return new String(image,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+	/**排序字段*/
+	@Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private java.lang.Integer orderId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/mapper/TravelNewCategoryMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelNewCategory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelNewCategory.entity.TravelNewCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 新闻分类表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface TravelNewCategoryMapper extends BaseMapper<TravelNewCategory> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/mapper/xml/TravelNewCategoryMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/service/ITravelNewCategoryService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelNewCategory.service;
+
+import org.jeecg.modules.travelNewCategory.entity.TravelNewCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 新闻分类表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface ITravelNewCategoryService extends IService<TravelNewCategory> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelNewCategory.service.impl;
+
+import org.jeecg.modules.travelNewCategory.entity.TravelNewCategory;
+import org.jeecg.modules.travelNewCategory.mapper.TravelNewCategoryMapper;
+import org.jeecg.modules.travelNewCategory.service.ITravelNewCategoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 新闻分类表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+@Service
+public class TravelNewCategoryServiceImpl extends ServiceImpl<TravelNewCategoryMapper, TravelNewCategory> implements ITravelNewCategoryService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/vue/TravelNewCategoryList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('新闻分类表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-new-category-modal ref="modalForm" @ok="modalFormOk"></travel-new-category-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelNewCategoryModal from './modules/TravelNewCategoryModal'
+
+  export default {
+    name: 'TravelNewCategoryList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelNewCategoryModal
+    },
+    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: 'name'
+          },
+          {
+            title:'新闻分类图片',
+            align:"center",
+            dataIndex: 'imageString'
+          },
+          {
+            title:'排序字段',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelNewCategory/travelNewCategory/list",
+          delete: "/travelNewCategory/travelNewCategory/delete",
+          deleteBatch: "/travelNewCategory/travelNewCategory/deleteBatch",
+          exportXlsUrl: "/travelNewCategory/travelNewCategory/exportXls",
+          importExcelUrl: "travelNewCategory/travelNewCategory/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:'name',text:'新闻分类名称',dictCode:''})
+        fieldList.push({type:'Blob',value:'image',text:'新闻分类图片',dictCode:''})
+        fieldList.push({type:'int',value:'orderId',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/travelNewCategory/vue/modules/TravelNewCategoryForm.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="新闻分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="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="imageString">
+              <a-input v-model="model.imageString" placeholder="请输入新闻分类图片" ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input-number v-model="model.orderId" 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: 'TravelNewCategoryForm',
+    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: "/travelNewCategory/travelNewCategory/add",
+          edit: "/travelNewCategory/travelNewCategory/edit",
+          queryById: "/travelNewCategory/travelNewCategory/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/travelNewCategory/vue/modules/TravelNewCategoryModal.Style#Drawer.vue

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

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

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

@@ -0,0 +1,43 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '新闻分类名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '新闻分类图片',
+    align:"center",
+    dataIndex: 'imageString'
+   },
+   {
+    title: '排序字段',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '新闻分类名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '新闻分类图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '排序字段',
+    field: 'orderId',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNewCategory/vue3/TravelNewCategoryList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelNewCategoryModal @register="registerModal" @success="handleSuccess"></TravelNewCategoryModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelNewCategory-travelNewCategory" 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 TravelNewCategoryModal from './components/TravelNewCategoryModal.vue'
+  import {columns, searchFormSchema} from './travelNewCategory.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelNewCategory.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/travelNewCategory/vue3/components/TravelNewCategoryModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../travelNewCategory.data';
+    import {saveOrUpdate} from '../travelNewCategory.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/travelNews/controller/TravelNewsController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/entity/TravelNews.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.travelNews.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:   2025-02-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("travel_news")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="travel_news对象", description="申遗新闻表")
+public class TravelNews 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 newsTitle;
+	/**新闻封面*/
+	@Excel(name = "新闻封面", width = 15)
+    @ApiModelProperty(value = "新闻封面")
+    private java.lang.String newsImage;
+	/**新闻内容*/
+	@Excel(name = "新闻内容", width = 15)
+    @ApiModelProperty(value = "新闻内容")
+    private java.lang.String newsContent;
+	/**新闻所属分类*/
+	@Excel(name = "新闻所属分类", width = 15)
+    @ApiModelProperty(value = "新闻所属分类")
+    private java.lang.String categoryId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/mapper/TravelNewsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.travelNews.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.travelNews.entity.TravelNews;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 申遗新闻表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface TravelNewsMapper extends BaseMapper<TravelNews> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/mapper/xml/TravelNewsMapper.xml

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/service/ITravelNewsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.travelNews.service;
+
+import org.jeecg.modules.travelNews.entity.TravelNews;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 申遗新闻表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface ITravelNewsService extends IService<TravelNews> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.travelNews.service.impl;
+
+import org.jeecg.modules.travelNews.entity.TravelNews;
+import org.jeecg.modules.travelNews.mapper.TravelNewsMapper;
+import org.jeecg.modules.travelNews.service.ITravelNewsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 申遗新闻表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+@Service
+public class TravelNewsServiceImpl extends ServiceImpl<TravelNewsMapper, TravelNews> implements ITravelNewsService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/vue/TravelNewsList.vue

@@ -0,0 +1,189 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('申遗新闻表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <travel-news-modal ref="modalForm" @ok="modalFormOk"></travel-news-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TravelNewsModal from './modules/TravelNewsModal'
+
+  export default {
+    name: 'TravelNewsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TravelNewsModal
+    },
+    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: 'newsTitle'
+          },
+          {
+            title:'新闻封面',
+            align:"center",
+            dataIndex: 'newsImage'
+          },
+          {
+            title:'新闻内容',
+            align:"center",
+            dataIndex: 'newsContent'
+          },
+          {
+            title:'新闻所属分类',
+            align:"center",
+            dataIndex: 'categoryId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/travelNews/travelNews/list",
+          delete: "/travelNews/travelNews/delete",
+          deleteBatch: "/travelNews/travelNews/deleteBatch",
+          exportXlsUrl: "/travelNews/travelNews/exportXls",
+          importExcelUrl: "travelNews/travelNews/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:'newsTitle',text:'新闻标题',dictCode:''})
+        fieldList.push({type:'Text',value:'newsImage',text:'新闻封面',dictCode:''})
+        fieldList.push({type:'Text',value:'newsContent',text:'新闻内容',dictCode:''})
+        fieldList.push({type:'string',value:'categoryId',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/travelNews/vue/modules/TravelNewsForm.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="新闻标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newsTitle">
+              <a-input v-model="model.newsTitle" placeholder="请输入新闻标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新闻封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newsImage">
+              <a-input v-model="model.newsImage" placeholder="请输入新闻封面"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新闻内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newsContent">
+              <a-input v-model="model.newsContent" placeholder="请输入新闻内容"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新闻所属分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <a-input v-model="model.categoryId" 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: 'TravelNewsForm',
+    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: "/travelNews/travelNews/add",
+          edit: "/travelNews/travelNews/edit",
+          queryById: "/travelNews/travelNews/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/travelNews/vue/modules/TravelNewsModal.Style#Drawer.vue

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

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

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

@@ -0,0 +1,53 @@
+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: 'newsTitle'
+   },
+   {
+    title: '新闻封面',
+    align:"center",
+    dataIndex: 'newsImage'
+   },
+   {
+    title: '新闻内容',
+    align:"center",
+    dataIndex: 'newsContent'
+   },
+   {
+    title: '新闻所属分类',
+    align:"center",
+    dataIndex: 'categoryId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '新闻标题',
+    field: 'newsTitle',
+    component: 'Input',
+  },
+  {
+    label: '新闻封面',
+    field: 'newsImage',
+    component: 'Input',
+  },
+  {
+    label: '新闻内容',
+    field: 'newsContent',
+    component: 'Input',
+  },
+  {
+    label: '新闻所属分类',
+    field: 'categoryId',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelNews/vue3/TravelNewsList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TravelNewsModal @register="registerModal" @success="handleSuccess"></TravelNewsModal>
+  </div>
+</template>
+
+<script lang="ts" name="travelNews-travelNews" 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 TravelNewsModal from './components/TravelNewsModal.vue'
+  import {columns, searchFormSchema} from './travelNews.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './travelNews.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/travelNews/vue3/components/TravelNewsModal.vue

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

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

@@ -61,6 +61,27 @@ public class IndexApiController {
         return indexApiService.addThumpup(token, videoId);
     }
 
+    /**************申遗新闻*********************/
+    //获取新闻分类列表
+    @ApiOperation(value="申遗新闻-获取新闻分类列表", notes="申遗新闻-获取新闻分类列表")
+    @RequestMapping(value = "/queryNewsTypeList", method = {RequestMethod.GET})
+    public Result<?> queryNewsTypeList(PageBean pageBean){
+        return indexApiService.queryNewsTypeList(pageBean);
+    }
+
+    //根据分类获取新闻列表
+    @ApiOperation(value="申遗新闻-根据分类获取新闻列表", notes="申遗新闻-根据分类获取新闻列表")
+    @RequestMapping(value = "/queryNewsByType", method = {RequestMethod.GET})
+    public Result<?> queryNewsByType(String categoryId, PageBean pageBean){
+        return indexApiService.queryNewsListByType(categoryId, pageBean);
+    }
+
+    //根据id获取新闻详情
+    @ApiOperation(value="申遗新闻-根据id获取新闻详情", notes="申遗新闻-根据id获取新闻详情")
+    @RequestMapping(value = "/queryNewsById", method = {RequestMethod.GET})
+    public Result<?> queryNewsById(String newsId){
+        return indexApiService.queryNewsById(newsId);
+    }
 
     /**************申遗历程*********************/
     //根据分类获取文章列表

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

@@ -27,6 +27,15 @@ public interface IndexApiService {
     //获取文章列表-申遗历程/非遗体验
     public Result<?> queryArticleList(PageBean pageBean);
 
+    //获取新闻分类列表
+    public Result<?> queryNewsTypeList(PageBean pageBean);
+
+    //根据分类获取新闻列表
+    public Result<?> queryNewsListByType(String categoryId, PageBean pageBean);
+
+    //根据id获取文章详情
+    public Result<?> queryNewsById(String newsId);
+
     //根据分类获取文章列表
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean);
 

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
@@ -27,6 +28,10 @@ import org.jeecg.modules.travelExperience.entity.TravelExperience;
 import org.jeecg.modules.travelExperience.service.ITravelExperienceService;
 import org.jeecg.modules.travelImage.entity.TravelImage;
 import org.jeecg.modules.travelImage.service.ITravelImageService;
+import org.jeecg.modules.travelNewCategory.entity.TravelNewCategory;
+import org.jeecg.modules.travelNewCategory.service.ITravelNewCategoryService;
+import org.jeecg.modules.travelNews.entity.TravelNews;
+import org.jeecg.modules.travelNews.service.ITravelNewsService;
 import org.jeecg.modules.travelOrder.entity.TravelOrder;
 import org.jeecg.modules.travelOrder.service.ITravelOrderService;
 import org.jeecg.modules.travelRole.service.ITravelRoleService;
@@ -89,6 +94,12 @@ public class IndexApiServiceImpl implements IndexApiService {
     //文章表
     @Resource
     private ITravelArticleService travelArticleService;
+    //新闻分类表
+    @Resource
+    private ITravelNewCategoryService travelNewCategoryService;
+    //新闻表
+    @Resource
+    private ITravelNewsService travelNewsService;
     //视频表
     @Resource
     private ITravelVideoService travelVideoService;
@@ -300,6 +311,64 @@ public class IndexApiServiceImpl implements IndexApiService {
         return video;
     }
 
+    /***************************申遗新闻**************************/
+    //获取新闻分类列表带分页
+    @Override
+    public Result<?> queryNewsTypeList(PageBean pageBean) {
+        Page<TravelNewCategory> page = new Page<TravelNewCategory>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelNewCategory> pageList = travelNewCategoryService
+                .lambdaQuery()
+                .orderByDesc(TravelNewCategory::getOrderId)
+                .page(page);
+
+        return Result.OK("新闻分类列表", pageList);
+    }
+
+    //根据新闻类型获取新闻列表带分页
+    @Override
+    public Result<?> queryNewsListByType(String categoryId, PageBean pageBean) {
+        //返回信息
+        String message = "获取新闻列表失败!";
+        //新闻列表
+        Page<TravelNews> pageList = null;
+        //分页信息
+        Page<TravelNews> page = null;
+
+        try{
+            //分页
+            page = new Page<TravelNews>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<TravelNews> query = travelNewsService.lambdaQuery();
+
+            //组装查询条件
+            if(null != categoryId){
+                //新闻类型
+                query.eq(TravelNews::getCategoryId, categoryId);
+            }
+            //按时间倒序
+            query.orderByDesc(TravelNews::getCreateTime);
+
+
+            //获取新闻列表
+            pageList = query.page(page);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("新闻列表获取失败", pageList);
+        }
+
+        return Result.OK("新闻列表", pageList);
+    }
+
+    //根据文章id获取文章详情
+    @Override
+    public Result<?> queryNewsById(String newsId) {
+        TravelNews one = travelNewsService
+                .lambdaQuery()
+                .eq(TravelNews::getId, newsId)
+                .one();
+
+        return Result.OK("新闻详情", one);
+    }
+
     /***************************申遗历程**************************/
     //获取文章列表带分页
     @Override