Merge branch 'zl'

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductBase.java

@@ -117,6 +117,7 @@ public class ProductBase extends TenantEntity {
     /**
      * 数据来源
      */
+    @TableField(exist = false)
     private String dataSource;
 
     /**

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductRecommendBo.java

@@ -53,7 +53,7 @@ public class ProductRecommendBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductRecommendLinkBo.java

@@ -40,7 +40,7 @@ public class ProductRecommendLinkBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAdContentController.java

@@ -0,0 +1,107 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysAdContentBo;
+import org.dromara.system.domain.vo.SysAdContentVo;
+import org.dromara.system.service.ISysAdContentService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 广告内容(多类型统一存)
+ * 前端访问路由地址为:/system/adContent
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/adContent")
+public class SysAdContentController extends BaseController {
+
+    private final ISysAdContentService sysAdContentService;
+
+    /**
+     * 查询广告内容(多类型统一存)列表
+     */
+    @SaCheckPermission("system:adContent:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysAdContentVo> list(SysAdContentBo bo, PageQuery pageQuery) {
+        return sysAdContentService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出广告内容(多类型统一存)列表
+     */
+    @SaCheckPermission("system:adContent:export")
+    @Log(title = "广告内容(多类型统一存)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysAdContentBo bo, HttpServletResponse response) {
+        List<SysAdContentVo> list = sysAdContentService.queryList(bo);
+        ExcelUtil.exportExcel(list, "广告内容(多类型统一存)", SysAdContentVo.class, response);
+    }
+
+    /**
+     * 获取广告内容(多类型统一存)详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:adContent:query")
+    @GetMapping("/{id}")
+    public R<SysAdContentVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(sysAdContentService.queryById(id));
+    }
+
+    /**
+     * 新增广告内容(多类型统一存)
+     */
+    @SaCheckPermission("system:adContent:add")
+    @Log(title = "广告内容(多类型统一存)", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysAdContentBo bo) {
+        return toAjax(sysAdContentService.insertByBo(bo));
+    }
+
+    /**
+     * 修改广告内容(多类型统一存)
+     */
+    @SaCheckPermission("system:adContent:edit")
+    @Log(title = "广告内容(多类型统一存)", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysAdContentBo bo) {
+        return toAjax(sysAdContentService.updateByBo(bo));
+    }
+
+    /**
+     * 删除广告内容(多类型统一存)
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:adContent:remove")
+    @Log(title = "广告内容(多类型统一存)", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(sysAdContentService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAdPlacementController.java

@@ -0,0 +1,107 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysAdPlacementBo;
+import org.dromara.system.domain.vo.SysAdPlacementVo;
+import org.dromara.system.service.ISysAdPlacementService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 广告挂载(页面/位置/终端配置)
+ * 前端访问路由地址为:/system/adPlacement
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/adPlacement")
+public class SysAdPlacementController extends BaseController {
+
+    private final ISysAdPlacementService sysAdPlacementService;
+
+    /**
+     * 查询广告挂载(页面/位置/终端配置)列表
+     */
+    @SaCheckPermission("system:adPlacement:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysAdPlacementVo> list(SysAdPlacementBo bo, PageQuery pageQuery) {
+        return sysAdPlacementService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出广告挂载(页面/位置/终端配置)列表
+     */
+    @SaCheckPermission("system:adPlacement:export")
+    @Log(title = "广告挂载(页面/位置/终端配置)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysAdPlacementBo bo, HttpServletResponse response) {
+        List<SysAdPlacementVo> list = sysAdPlacementService.queryList(bo);
+        ExcelUtil.exportExcel(list, "广告挂载(页面/位置/终端配置)", SysAdPlacementVo.class, response);
+    }
+
+    /**
+     * 获取广告挂载(页面/位置/终端配置)详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:adPlacement:query")
+    @GetMapping("/{id}")
+    public R<SysAdPlacementVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(sysAdPlacementService.queryById(id));
+    }
+
+    /**
+     * 新增广告挂载(页面/位置/终端配置)
+     */
+    @SaCheckPermission("system:adPlacement:add")
+    @Log(title = "广告挂载(页面/位置/终端配置)", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysAdPlacementBo bo) {
+        return toAjax(sysAdPlacementService.insertByBo(bo));
+    }
+
+    /**
+     * 修改广告挂载(页面/位置/终端配置)
+     */
+    @SaCheckPermission("system:adPlacement:edit")
+    @Log(title = "广告挂载(页面/位置/终端配置)", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysAdPlacementBo bo) {
+        return toAjax(sysAdPlacementService.updateByBo(bo));
+    }
+
+    /**
+     * 删除广告挂载(页面/位置/终端配置)
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:adPlacement:remove")
+    @Log(title = "广告挂载(页面/位置/终端配置)", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(sysAdPlacementService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDecorationSectionController.java

@@ -0,0 +1,106 @@
+package org.dromara.system.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.SysDecorationSectionVo;
+import org.dromara.system.domain.bo.SysDecorationSectionBo;
+import org.dromara.system.service.ISysDecorationSectionService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 装修模块标题配置
+ * 前端访问路由地址为:/system/decorationSection
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/decorationSection")
+public class SysDecorationSectionController extends BaseController {
+
+    private final ISysDecorationSectionService sysDecorationSectionService;
+
+    /**
+     * 查询装修模块标题配置列表
+     */
+    @SaCheckPermission("system:decorationSection:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDecorationSectionVo> list(SysDecorationSectionBo bo, PageQuery pageQuery) {
+        return sysDecorationSectionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出装修模块标题配置列表
+     */
+    @SaCheckPermission("system:decorationSection:export")
+    @Log(title = "装修模块标题配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysDecorationSectionBo bo, HttpServletResponse response) {
+        List<SysDecorationSectionVo> list = sysDecorationSectionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "装修模块标题配置", SysDecorationSectionVo.class, response);
+    }
+
+    /**
+     * 获取装修模块标题配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:decorationSection:query")
+    @GetMapping("/{id}")
+    public R<SysDecorationSectionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(sysDecorationSectionService.queryById(id));
+    }
+
+    /**
+     * 新增装修模块标题配置
+     */
+    @SaCheckPermission("system:decorationSection:add")
+    @Log(title = "装修模块标题配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysDecorationSectionBo bo) {
+        return toAjax(sysDecorationSectionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改装修模块标题配置
+     */
+    @SaCheckPermission("system:decorationSection:edit")
+    @Log(title = "装修模块标题配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysDecorationSectionBo bo) {
+        return toAjax(sysDecorationSectionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除装修模块标题配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:decorationSection:remove")
+    @Log(title = "装修模块标题配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(sysDecorationSectionService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysAdContent.java

@@ -0,0 +1,94 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 广告内容(多类型统一存)对象 sys_ad_content
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_ad_content")
+public class SysAdContent extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 广告类型: banner/title/icon/popup 等
+     */
+    private String adType;
+
+    /**
+     * 标题/名称
+     */
+    private String title;
+
+    /**
+     * 图片/图标URL(可为空，标题类可不填)
+     */
+    private String imageUrl;
+
+    /**
+     * 跳转链接
+     */
+    private String link;
+
+    /**
+     * 状态 1=显示/上线 0=隐藏/下线
+     */
+    private Long status;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 颜色/背景色
+     */
+    private String color;
+
+    /**
+     * 备注/描述
+     */
+    private String remark;
+
+    /**
+     * 开始时间(仅需定时上下线时使用)
+     */
+    private Date startTime;
+
+    /**
+     * 到期时间(仅需定时上下线时使用)
+     */
+    private Date endTime;
+
+    /**
+     * 扩展字段(JSON，放个性化配置)
+     */
+    private String extJson;
+
+    /**
+     * 删除标记 0=存在 1=删除
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysAdPlacement.java

@@ -0,0 +1,79 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 广告挂载(页面/位置/终端配置)对象 sys_ad_placement
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_ad_placement")
+public class SysAdPlacement extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 广告位编码: 如 home.banner / gift.title / gift.icon
+     */
+    private String slotCode;
+
+    /**
+     * 关联广告内容ID
+     */
+    private Long adContentId;
+
+    /**
+     * 状态 1=启用 0=停用
+     */
+    private String status;
+
+    /**
+     * 同一广告位内的排序
+     */
+    private Long sort;
+
+    /**
+     * 生效开始时间(可选)
+     */
+    private Date startTime;
+
+    /**
+     * 生效结束时间(可选)
+     */
+    private Date endTime;
+
+    /**
+     * 终端/渠道: pc/h5/app/mini 等
+     */
+    private String terminal;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标记 0=存在 1=删除
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDecorationSection.java

@@ -0,0 +1,87 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 装修模块标题配置对象 sys_decoration_section
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_decoration_section")
+public class SysDecorationSection extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模块类型(solution-热门方案/fresh-新鲜好物/flash_sale-品牌闪购)
+     */
+    private String sectionType;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subtitle;
+
+    /**
+     * 链接文字
+     */
+    private String linkText;
+
+    /**
+     * 链接地址
+     */
+    private String linkUrl;
+
+    /**
+     * 背景色
+     */
+    private String bgColor;
+
+    /**
+     * 字体颜色
+     */
+    private String textColor;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0存在 1删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysAdContentBo.java

@@ -0,0 +1,86 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.SysAdContent;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 广告内容(多类型统一存)业务对象 sys_ad_content
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysAdContent.class, reverseConvertGenerate = false)
+public class SysAdContentBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 广告类型: banner/title/icon/popup 等
+     */
+    private String adType;
+
+    /**
+     * 标题/名称
+     */
+    private String title;
+
+    /**
+     * 图片/图标URL(可为空，标题类可不填)
+     */
+    private String imageUrl;
+
+    /**
+     * 跳转链接
+     */
+    private String link;
+
+    /**
+     * 状态 1=显示/上线 0=隐藏/下线
+     */
+    private Long status;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 颜色/背景色
+     */
+    private String color;
+
+    /**
+     * 备注/描述
+     */
+    private String remark;
+
+    /**
+     * 开始时间(仅需定时上下线时使用)
+     */
+    private Date startTime;
+
+    /**
+     * 到期时间(仅需定时上下线时使用)
+     */
+    private Date endTime;
+
+    /**
+     * 扩展字段(JSON，放个性化配置)
+     */
+    private String extJson;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysAdPlacementBo.java

@@ -0,0 +1,75 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.SysAdPlacement;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 广告挂载(页面/位置/终端配置)业务对象 sys_ad_placement
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysAdPlacement.class, reverseConvertGenerate = false)
+public class SysAdPlacementBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 广告位编码: 如 home.banner / gift.title / gift.icon
+     */
+    private String slotCode;
+
+    /**
+     * 关联广告内容ID
+     */
+    private Long adContentId;
+
+    /**
+     * 状态 1=启用 0=停用
+     */
+    private String status;
+
+    /**
+     * 同一广告位内的排序
+     */
+    private Long sort;
+
+    /**
+     * 生效开始时间(可选)
+     */
+    @NotNull(message = "生效开始时间(可选)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 生效结束时间(可选)
+     */
+    @NotNull(message = "生效结束时间(可选)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+    /**
+     * 终端/渠道: pc/h5/app/mini 等
+     */
+    @NotBlank(message = "终端/渠道: pc/h5/app/mini 等不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String terminal;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDecorationSectionBo.java

@@ -0,0 +1,80 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.SysDecorationSection;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 装修模块标题配置业务对象 sys_decoration_section
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDecorationSection.class, reverseConvertGenerate = false)
+public class SysDecorationSectionBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 模块类型(solution-热门方案/fresh-新鲜好物/flash_sale-品牌闪购)
+     */
+    @NotBlank(message = "模块类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sectionType;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subtitle;
+
+    /**
+     * 链接文字
+     */
+    private String linkText;
+
+    /**
+     * 链接地址
+     */
+    private String linkUrl;
+
+    /**
+     * 背景色
+     */
+    private String bgColor;
+
+    /**
+     * 字体颜色
+     */
+    private String textColor;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysAdContentVo.java

@@ -0,0 +1,106 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.SysAdContent;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 广告内容(多类型统一存)视图对象 sys_ad_content
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysAdContent.class)
+public class SysAdContentVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 广告类型: banner/title/icon/popup 等
+     */
+    @ExcelProperty(value = "广告类型: banner/title/icon/popup 等")
+    private String adType;
+
+    /**
+     * 标题/名称
+     */
+    @ExcelProperty(value = "标题/名称")
+    private String title;
+
+    /**
+     * 图片/图标URL(可为空，标题类可不填)
+     */
+    @ExcelProperty(value = "图片/图标URL(可为空，标题类可不填)")
+    private String imageUrl;
+
+    /**
+     * 跳转链接
+     */
+    @ExcelProperty(value = "跳转链接")
+    private String link;
+
+    /**
+     * 状态 1=显示/上线 0=隐藏/下线
+     */
+    @ExcelProperty(value = "状态 1=显示/上线 0=隐藏/下线")
+    private Long status;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sort;
+
+    /**
+     * 颜色/背景色
+     */
+    @ExcelProperty(value = "颜色/背景色")
+    private String color;
+
+    /**
+     * 备注/描述
+     */
+    @ExcelProperty(value = "备注/描述")
+    private String remark;
+
+    /**
+     * 开始时间(仅需定时上下线时使用)
+     */
+    @ExcelProperty(value = "开始时间(仅需定时上下线时使用)")
+    private Date startTime;
+
+    /**
+     * 到期时间(仅需定时上下线时使用)
+     */
+    @ExcelProperty(value = "到期时间(仅需定时上下线时使用)")
+    private Date endTime;
+
+    /**
+     * 扩展字段(JSON，放个性化配置)
+     */
+    @ExcelProperty(value = "扩展字段(JSON，放个性化配置)")
+    private String extJson;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysAdPlacementVo.java

@@ -0,0 +1,88 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.SysAdPlacement;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 广告挂载(页面/位置/终端配置)视图对象 sys_ad_placement
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysAdPlacement.class)
+public class SysAdPlacementVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 广告位编码: 如 home.banner / gift.title / gift.icon
+     */
+    @ExcelProperty(value = "广告位编码: 如 home.banner / gift.title / gift.icon")
+    private String slotCode;
+
+    /**
+     * 关联广告内容ID
+     */
+    @ExcelProperty(value = "关联广告内容ID")
+    private Long adContentId;
+
+    /**
+     * 状态 1=启用 0=停用
+     */
+    @ExcelProperty(value = "状态 1=启用 0=停用")
+    private String status;
+
+    /**
+     * 同一广告位内的排序
+     */
+    @ExcelProperty(value = "同一广告位内的排序")
+    private Long sort;
+
+    /**
+     * 生效开始时间(可选)
+     */
+    @ExcelProperty(value = "生效开始时间(可选)")
+    private Date startTime;
+
+    /**
+     * 生效结束时间(可选)
+     */
+    @ExcelProperty(value = "生效结束时间(可选)")
+    private Date endTime;
+
+    /**
+     * 终端/渠道: pc/h5/app/mini 等
+     */
+    @ExcelProperty(value = "终端/渠道: pc/h5/app/mini 等")
+    private String terminal;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDecorationSectionVo.java

@@ -0,0 +1,99 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.SysDecorationSection;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 装修模块标题配置视图对象 sys_decoration_section
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysDecorationSection.class)
+public class SysDecorationSectionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 模块类型(solution-热门方案/fresh-新鲜好物/flash_sale-品牌闪购)
+     */
+    @ExcelProperty(value = "模块类型(solution-热门方案/fresh-新鲜好物/flash_sale-品牌闪购)")
+    private String sectionType;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @ExcelProperty(value = "副标题")
+    private String subtitle;
+
+    /**
+     * 链接文字
+     */
+    @ExcelProperty(value = "链接文字")
+    private String linkText;
+
+    /**
+     * 链接地址
+     */
+    @ExcelProperty(value = "链接地址")
+    private String linkUrl;
+
+    /**
+     * 背景色
+     */
+    @ExcelProperty(value = "背景色")
+    private String bgColor;
+
+    /**
+     * 字体颜色
+     */
+    @ExcelProperty(value = "字体颜色")
+    private String textColor;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysAdContentMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.SysAdContent;
+import org.dromara.system.domain.vo.SysAdContentVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 广告内容(多类型统一存)Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+public interface SysAdContentMapper extends BaseMapperPlus<SysAdContent, SysAdContentVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysAdPlacementMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.SysAdPlacement;
+import org.dromara.system.domain.vo.SysAdPlacementVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 广告挂载(页面/位置/终端配置)Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+public interface SysAdPlacementMapper extends BaseMapperPlus<SysAdPlacement, SysAdPlacementVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDecorationSectionMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.SysDecorationSection;
+import org.dromara.system.domain.vo.SysDecorationSectionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 装修模块标题配置Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+public interface SysDecorationSectionMapper extends BaseMapperPlus<SysDecorationSection, SysDecorationSectionVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysAdContentService.java

@@ -0,0 +1,70 @@
+package org.dromara.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.system.domain.SysAdContent;
+import org.dromara.system.domain.vo.SysAdContentVo;
+import org.dromara.system.domain.bo.SysAdContentBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 广告内容(多类型统一存)Service接口
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+public interface ISysAdContentService extends IService<SysAdContent>{
+
+    /**
+     * 查询广告内容(多类型统一存)
+     *
+     * @param id 主键
+     * @return 广告内容(多类型统一存)
+     */
+    SysAdContentVo queryById(Long id);
+
+    /**
+     * 分页查询广告内容(多类型统一存)列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 广告内容(多类型统一存)分页列表
+     */
+    TableDataInfo<SysAdContentVo> queryPageList(SysAdContentBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的广告内容(多类型统一存)列表
+     *
+     * @param bo 查询条件
+     * @return 广告内容(多类型统一存)列表
+     */
+    List<SysAdContentVo> queryList(SysAdContentBo bo);
+
+    /**
+     * 新增广告内容(多类型统一存)
+     *
+     * @param bo 广告内容(多类型统一存)
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysAdContentBo bo);
+
+    /**
+     * 修改广告内容(多类型统一存)
+     *
+     * @param bo 广告内容(多类型统一存)
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysAdContentBo bo);
+
+    /**
+     * 校验并批量删除广告内容(多类型统一存)信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysAdPlacementService.java

@@ -0,0 +1,70 @@
+package org.dromara.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.system.domain.SysAdPlacement;
+import org.dromara.system.domain.vo.SysAdPlacementVo;
+import org.dromara.system.domain.bo.SysAdPlacementBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 广告挂载(页面/位置/终端配置)Service接口
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+public interface ISysAdPlacementService extends IService<SysAdPlacement>{
+
+    /**
+     * 查询广告挂载(页面/位置/终端配置)
+     *
+     * @param id 主键
+     * @return 广告挂载(页面/位置/终端配置)
+     */
+    SysAdPlacementVo queryById(Long id);
+
+    /**
+     * 分页查询广告挂载(页面/位置/终端配置)列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 广告挂载(页面/位置/终端配置)分页列表
+     */
+    TableDataInfo<SysAdPlacementVo> queryPageList(SysAdPlacementBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的广告挂载(页面/位置/终端配置)列表
+     *
+     * @param bo 查询条件
+     * @return 广告挂载(页面/位置/终端配置)列表
+     */
+    List<SysAdPlacementVo> queryList(SysAdPlacementBo bo);
+
+    /**
+     * 新增广告挂载(页面/位置/终端配置)
+     *
+     * @param bo 广告挂载(页面/位置/终端配置)
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysAdPlacementBo bo);
+
+    /**
+     * 修改广告挂载(页面/位置/终端配置)
+     *
+     * @param bo 广告挂载(页面/位置/终端配置)
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysAdPlacementBo bo);
+
+    /**
+     * 校验并批量删除广告挂载(页面/位置/终端配置)信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDecorationSectionService.java

@@ -0,0 +1,70 @@
+package org.dromara.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.system.domain.SysDecorationSection;
+import org.dromara.system.domain.vo.SysDecorationSectionVo;
+import org.dromara.system.domain.bo.SysDecorationSectionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 装修模块标题配置Service接口
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+public interface ISysDecorationSectionService extends IService<SysDecorationSection>{
+
+    /**
+     * 查询装修模块标题配置
+     *
+     * @param id 主键
+     * @return 装修模块标题配置
+     */
+    SysDecorationSectionVo queryById(Long id);
+
+    /**
+     * 分页查询装修模块标题配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 装修模块标题配置分页列表
+     */
+    TableDataInfo<SysDecorationSectionVo> queryPageList(SysDecorationSectionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的装修模块标题配置列表
+     *
+     * @param bo 查询条件
+     * @return 装修模块标题配置列表
+     */
+    List<SysDecorationSectionVo> queryList(SysDecorationSectionBo bo);
+
+    /**
+     * 新增装修模块标题配置
+     *
+     * @param bo 装修模块标题配置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysDecorationSectionBo bo);
+
+    /**
+     * 修改装修模块标题配置
+     *
+     * @param bo 装修模块标题配置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysDecorationSectionBo bo);
+
+    /**
+     * 校验并批量删除装修模块标题配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysAdContentServiceImpl.java

@@ -0,0 +1,143 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.SysAdContentBo;
+import org.dromara.system.domain.vo.SysAdContentVo;
+import org.dromara.system.domain.SysAdContent;
+import org.dromara.system.mapper.SysAdContentMapper;
+import org.dromara.system.service.ISysAdContentService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 广告内容(多类型统一存)Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysAdContentServiceImpl  extends ServiceImpl<SysAdContentMapper, SysAdContent> implements ISysAdContentService {
+
+    private final SysAdContentMapper baseMapper;
+
+    /**
+     * 查询广告内容(多类型统一存)
+     *
+     * @param id 主键
+     * @return 广告内容(多类型统一存)
+     */
+    @Override
+    public SysAdContentVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询广告内容(多类型统一存)列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 广告内容(多类型统一存)分页列表
+     */
+    @Override
+    public TableDataInfo<SysAdContentVo> queryPageList(SysAdContentBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysAdContent> lqw = buildQueryWrapper(bo);
+        Page<SysAdContentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的广告内容(多类型统一存)列表
+     *
+     * @param bo 查询条件
+     * @return 广告内容(多类型统一存)列表
+     */
+    @Override
+    public List<SysAdContentVo> queryList(SysAdContentBo bo) {
+        LambdaQueryWrapper<SysAdContent> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysAdContent> buildQueryWrapper(SysAdContentBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysAdContent> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(SysAdContent::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), SysAdContent::getPlatformCode, bo.getPlatformCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getAdType()), SysAdContent::getAdType, bo.getAdType());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), SysAdContent::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getImageUrl()), SysAdContent::getImageUrl, bo.getImageUrl());
+        lqw.eq(StringUtils.isNotBlank(bo.getLink()), SysAdContent::getLink, bo.getLink());
+        lqw.eq(bo.getStatus() != null, SysAdContent::getStatus, bo.getStatus());
+        lqw.eq(bo.getSort() != null, SysAdContent::getSort, bo.getSort());
+        lqw.eq(StringUtils.isNotBlank(bo.getColor()), SysAdContent::getColor, bo.getColor());
+        lqw.eq(bo.getStartTime() != null, SysAdContent::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, SysAdContent::getEndTime, bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getExtJson()), SysAdContent::getExtJson, bo.getExtJson());
+        return lqw;
+    }
+
+    /**
+     * 新增广告内容(多类型统一存)
+     *
+     * @param bo 广告内容(多类型统一存)
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysAdContentBo bo) {
+        SysAdContent add = MapstructUtils.convert(bo, SysAdContent.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改广告内容(多类型统一存)
+     *
+     * @param bo 广告内容(多类型统一存)
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysAdContentBo bo) {
+        SysAdContent update = MapstructUtils.convert(bo, SysAdContent.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysAdContent entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除广告内容(多类型统一存)信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysAdPlacementServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.SysAdPlacementBo;
+import org.dromara.system.domain.vo.SysAdPlacementVo;
+import org.dromara.system.domain.SysAdPlacement;
+import org.dromara.system.mapper.SysAdPlacementMapper;
+import org.dromara.system.service.ISysAdPlacementService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 广告挂载(页面/位置/终端配置)Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-12-15
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysAdPlacementServiceImpl  extends ServiceImpl<SysAdPlacementMapper, SysAdPlacement> implements ISysAdPlacementService {
+
+    private final SysAdPlacementMapper baseMapper;
+
+    /**
+     * 查询广告挂载(页面/位置/终端配置)
+     *
+     * @param id 主键
+     * @return 广告挂载(页面/位置/终端配置)
+     */
+    @Override
+    public SysAdPlacementVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询广告挂载(页面/位置/终端配置)列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 广告挂载(页面/位置/终端配置)分页列表
+     */
+    @Override
+    public TableDataInfo<SysAdPlacementVo> queryPageList(SysAdPlacementBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysAdPlacement> lqw = buildQueryWrapper(bo);
+        Page<SysAdPlacementVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的广告挂载(页面/位置/终端配置)列表
+     *
+     * @param bo 查询条件
+     * @return 广告挂载(页面/位置/终端配置)列表
+     */
+    @Override
+    public List<SysAdPlacementVo> queryList(SysAdPlacementBo bo) {
+        LambdaQueryWrapper<SysAdPlacement> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysAdPlacement> buildQueryWrapper(SysAdPlacementBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysAdPlacement> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(SysAdPlacement::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), SysAdPlacement::getPlatformCode, bo.getPlatformCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSlotCode()), SysAdPlacement::getSlotCode, bo.getSlotCode());
+        lqw.eq(bo.getAdContentId() != null, SysAdPlacement::getAdContentId, bo.getAdContentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysAdPlacement::getStatus, bo.getStatus());
+        lqw.eq(bo.getSort() != null, SysAdPlacement::getSort, bo.getSort());
+        lqw.eq(bo.getStartTime() != null, SysAdPlacement::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, SysAdPlacement::getEndTime, bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getTerminal()), SysAdPlacement::getTerminal, bo.getTerminal());
+        return lqw;
+    }
+
+    /**
+     * 新增广告挂载(页面/位置/终端配置)
+     *
+     * @param bo 广告挂载(页面/位置/终端配置)
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysAdPlacementBo bo) {
+        SysAdPlacement add = MapstructUtils.convert(bo, SysAdPlacement.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改广告挂载(页面/位置/终端配置)
+     *
+     * @param bo 广告挂载(页面/位置/终端配置)
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysAdPlacementBo bo) {
+        SysAdPlacement update = MapstructUtils.convert(bo, SysAdPlacement.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysAdPlacement entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除广告挂载(页面/位置/终端配置)信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDecorationSectionServiceImpl.java

@@ -0,0 +1,142 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.SysDecorationSectionBo;
+import org.dromara.system.domain.vo.SysDecorationSectionVo;
+import org.dromara.system.domain.SysDecorationSection;
+import org.dromara.system.mapper.SysDecorationSectionMapper;
+import org.dromara.system.service.ISysDecorationSectionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 装修模块标题配置Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-12-17
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysDecorationSectionServiceImpl  extends ServiceImpl<SysDecorationSectionMapper, SysDecorationSection> implements ISysDecorationSectionService {
+
+    private final SysDecorationSectionMapper baseMapper;
+
+    /**
+     * 查询装修模块标题配置
+     *
+     * @param id 主键
+     * @return 装修模块标题配置
+     */
+    @Override
+    public SysDecorationSectionVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询装修模块标题配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 装修模块标题配置分页列表
+     */
+    @Override
+    public TableDataInfo<SysDecorationSectionVo> queryPageList(SysDecorationSectionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysDecorationSection> lqw = buildQueryWrapper(bo);
+        Page<SysDecorationSectionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的装修模块标题配置列表
+     *
+     * @param bo 查询条件
+     * @return 装修模块标题配置列表
+     */
+    @Override
+    public List<SysDecorationSectionVo> queryList(SysDecorationSectionBo bo) {
+        LambdaQueryWrapper<SysDecorationSection> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysDecorationSection> buildQueryWrapper(SysDecorationSectionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysDecorationSection> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(SysDecorationSection::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), SysDecorationSection::getPlatformCode, bo.getPlatformCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSectionType()), SysDecorationSection::getSectionType, bo.getSectionType());
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), SysDecorationSection::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubtitle()), SysDecorationSection::getSubtitle, bo.getSubtitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getLinkText()), SysDecorationSection::getLinkText, bo.getLinkText());
+        lqw.eq(StringUtils.isNotBlank(bo.getLinkUrl()), SysDecorationSection::getLinkUrl, bo.getLinkUrl());
+        lqw.eq(StringUtils.isNotBlank(bo.getBgColor()), SysDecorationSection::getBgColor, bo.getBgColor());
+        lqw.eq(StringUtils.isNotBlank(bo.getTextColor()), SysDecorationSection::getTextColor, bo.getTextColor());
+        lqw.eq(bo.getSort() != null, SysDecorationSection::getSort, bo.getSort());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDecorationSection::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增装修模块标题配置
+     *
+     * @param bo 装修模块标题配置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysDecorationSectionBo bo) {
+        SysDecorationSection add = MapstructUtils.convert(bo, SysDecorationSection.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改装修模块标题配置
+     *
+     * @param bo 装修模块标题配置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysDecorationSectionBo bo) {
+        SysDecorationSection update = MapstructUtils.convert(bo, SysDecorationSection.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysDecorationSection entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除装修模块标题配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysAdContentMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.system.mapper.SysAdContentMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysAdPlacementMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.system.mapper.SysAdPlacementMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDecorationSectionMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.system.mapper.SysDecorationSectionMapper">
+
+</mapper>