`fix`

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

@@ -0,0 +1,105 @@
+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.TblArticleVo;
+import org.dromara.system.domain.bo.TblArticleBo;
+import org.dromara.system.service.ITblArticleService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 文章
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/Article")
+public class TblArticleController extends BaseController {
+
+    private final ITblArticleService tblArticleService;
+
+    /**
+     * 查询文章列表
+     */
+    @SaCheckPermission("system:Article:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblArticleVo> list(TblArticleBo bo, PageQuery pageQuery) {
+        return tblArticleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出文章列表
+     */
+    @SaCheckPermission("system:Article:export")
+    @Log(title = "文章", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblArticleBo bo, HttpServletResponse response) {
+        List<TblArticleVo> list = tblArticleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文章", TblArticleVo.class, response);
+    }
+
+    /**
+     * 获取文章详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:Article:query")
+    @GetMapping("/{id}")
+    public R<TblArticleVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblArticleService.queryById(id));
+    }
+
+    /**
+     * 新增文章
+     */
+    @SaCheckPermission("system:Article:add")
+    @Log(title = "文章", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void>Add(@Validated(AddGroup.class) @RequestBody TblArticleBo bo) {
+        return toAjax(tblArticleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文章
+     */
+    @SaCheckPermission("system:Article:edit")
+    @Log(title = "文章", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblArticleBo bo) {
+        return toAjax(tblArticleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文章
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:Article:remove")
+    @Log(title = "文章", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblArticleService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,105 @@
+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.TblMiniprogramVo;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+import org.dromara.system.service.ITblMiniprogramService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 小程序信息
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/miniprogram")
+public class TblMiniprogramController extends BaseController {
+
+    private final ITblMiniprogramService tblMiniprogramService;
+
+    /**
+     * 查询小程序信息列表
+     */
+    @SaCheckPermission("system:miniprogram:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblMiniprogramVo> list(TblMiniprogramBo bo, PageQuery pageQuery) {
+        return tblMiniprogramService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出小程序信息列表
+     */
+    @SaCheckPermission("system:miniprogram:export")
+    @Log(title = "小程序信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblMiniprogramBo bo, HttpServletResponse response) {
+        List<TblMiniprogramVo> list = tblMiniprogramService.queryList(bo);
+        ExcelUtil.exportExcel(list, "小程序信息", TblMiniprogramVo.class, response);
+    }
+
+    /**
+     * 获取小程序信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:miniprogram:query")
+    @GetMapping("/{id}")
+    public R<TblMiniprogramVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblMiniprogramService.queryById(id));
+    }
+
+    /**
+     * 新增小程序信息
+     */
+    @SaCheckPermission("system:miniprogram:add")
+    @Log(title = "小程序信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblMiniprogramBo bo) {
+        return toAjax(tblMiniprogramService.insertByBo(bo));
+    }
+
+    /**
+     * 修改小程序信息
+     */
+    @SaCheckPermission("system:miniprogram:edit")
+    @Log(title = "小程序信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblMiniprogramBo bo) {
+        return toAjax(tblMiniprogramService.updateByBo(bo));
+    }
+
+    /**
+     * 删除小程序信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:miniprogram:remove")
+    @Log(title = "小程序信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblMiniprogramService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,61 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 文章对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_ article")
+public class TblArticle extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,66 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 小程序信息对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_miniprogram")
+public class TblMiniprogram extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    private String logo;
+
+    /**
+     * 链接
+     */
+    private String url;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,67 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblArticle;
+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 org.dromara.system.domain.TblArticle;
+
+/**
+ * 文章业务对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblArticle.class, reverseConvertGenerate = false)
+public class TblArticleBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @NotBlank(message = "副标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+    @NotBlank(message = "内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String content;
+
+    /**
+     * 状态
+     */
+    @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,72 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblMiniprogram;
+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.*;
+
+/**
+ * 小程序信息业务对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblMiniprogram.class, reverseConvertGenerate = false)
+public class TblMiniprogramBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    @NotBlank(message = "图标地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String logo;
+
+    /**
+     * 链接
+     */
+    @NotBlank(message = "链接不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String url;
+
+    /**
+     * 状态
+     */
+    @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+    /**
+     * 描述
+     */
+    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String desc;
+
+    /**
+     * 扩展1
+     */
+    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,71 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.TblArticle;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.TblArticle;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 文章视图对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblArticle.class)
+public class TblArticleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @ExcelProperty(value = "副标题")
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,80 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.TblMiniprogram;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.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;
+
+
+
+/**
+ * 小程序信息视图对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblMiniprogram.class)
+public class TblMiniprogramVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    @ExcelProperty(value = "图标地址")
+    private String logo;
+
+    /**
+     * 链接
+     */
+    @ExcelProperty(value = "链接")
+    private String url;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String desc;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.domain.vo.TblArticleVo;
+
+/**
+ * 文章Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface TblArticleMapper extends BaseMapperPlus<TblArticle, TblArticleVo> {
+
+}

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

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 小程序信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface TblMiniprogramMapper extends BaseMapperPlus<TblMiniprogram, TblMiniprogramVo> {
+
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.domain.vo.TblArticleVo;
+import org.dromara.system.domain.bo.TblArticleBo;
+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 Lion Li
+ * @date 2024-07-18
+ */
+public interface ITblArticleService {
+
+    /**
+     * 查询文章
+     */
+    TblArticleVo queryById(Long id);
+
+    /**
+     * 查询文章列表
+     */
+    TableDataInfo<TblArticleVo> queryPageList(TblArticleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询文章列表
+     */
+    List<TblArticleVo> queryList(TblArticleBo bo);
+
+    /**
+     * 新增文章
+     */
+    Boolean insertByBo(TblArticleBo bo);
+
+    /**
+     * 修改文章
+     */
+    Boolean updateByBo(TblArticleBo bo);
+
+    /**
+     * 校验并批量删除文章信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+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 Lion Li
+ * @date 2024-07-18
+ */
+public interface ITblMiniprogramService {
+
+    /**
+     * 查询小程序信息
+     */
+    TblMiniprogramVo queryById(Long id);
+
+    /**
+     * 查询小程序信息列表
+     */
+    TableDataInfo<TblMiniprogramVo> queryPageList(TblMiniprogramBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询小程序信息列表
+     */
+    List<TblMiniprogramVo> queryList(TblMiniprogramBo bo);
+
+    /**
+     * 新增小程序信息
+     */
+    Boolean insertByBo(TblMiniprogramBo bo);
+
+    /**
+     * 修改小程序信息
+     */
+    Boolean updateByBo(TblMiniprogramBo bo);
+
+    /**
+     * 校验并批量删除小程序信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,114 @@
+package org.dromara.system.service.impl;
+
+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 org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblArticleBo;
+import org.dromara.system.domain.vo.TblArticleVo;
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.mapper.TblArticleMapper;
+import org.dromara.system.service.ITblArticleService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 文章Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@RequiredArgsConstructor
+@Service
+public class TblArticleServiceImpl implements ITblArticleService {
+
+    private final TblArticleMapper baseMapper;
+
+    /**
+     * 查询文章
+     */
+    @Override
+    public TblArticleVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询文章列表
+     */
+    @Override
+    public TableDataInfo<TblArticleVo> queryPageList(TblArticleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblArticle> lqw = buildQueryWrapper(bo);
+        Page<TblArticleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询文章列表
+     */
+    @Override
+    public List<TblArticleVo> queryList(TblArticleBo bo) {
+        LambdaQueryWrapper<TblArticle> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblArticle> buildQueryWrapper(TblArticleBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblArticle> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TblArticle::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubTitle()), TblArticle::getSubTitle, bo.getSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), TblArticle::getContent, bo.getContent());
+        lqw.eq(bo.getStatus() != null, TblArticle::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblArticle::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblArticle::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增文章
+     */
+    @Override
+    public Boolean insertByBo(TblArticleBo bo) {
+        TblArticle add = MapstructUtils.convert(bo, TblArticle.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改文章
+     */
+    @Override
+    public Boolean updateByBo(TblArticleBo bo) {
+        TblArticle update = MapstructUtils.convert(bo, TblArticle.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblArticle entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除文章
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,115 @@
+package org.dromara.system.service.impl;
+
+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 org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.mapper.TblMiniprogramMapper;
+import org.dromara.system.service.ITblMiniprogramService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 小程序信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@RequiredArgsConstructor
+@Service
+public class TblMiniprogramServiceImpl implements ITblMiniprogramService {
+
+    private final TblMiniprogramMapper baseMapper;
+
+    /**
+     * 查询小程序信息
+     */
+    @Override
+    public TblMiniprogramVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询小程序信息列表
+     */
+    @Override
+    public TableDataInfo<TblMiniprogramVo> queryPageList(TblMiniprogramBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblMiniprogram> lqw = buildQueryWrapper(bo);
+        Page<TblMiniprogramVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询小程序信息列表
+     */
+    @Override
+    public List<TblMiniprogramVo> queryList(TblMiniprogramBo bo) {
+        LambdaQueryWrapper<TblMiniprogram> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblMiniprogram> buildQueryWrapper(TblMiniprogramBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblMiniprogram> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), TblMiniprogram::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getLogo()), TblMiniprogram::getLogo, bo.getLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), TblMiniprogram::getUrl, bo.getUrl());
+        lqw.eq(bo.getStatus() != null, TblMiniprogram::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getDesc()), TblMiniprogram::getDesc, bo.getDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblMiniprogram::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblMiniprogram::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增小程序信息
+     */
+    @Override
+    public Boolean insertByBo(TblMiniprogramBo bo) {
+        TblMiniprogram add = MapstructUtils.convert(bo, TblMiniprogram.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改小程序信息
+     */
+    @Override
+    public Boolean updateByBo(TblMiniprogramBo bo) {
+        TblMiniprogram update = MapstructUtils.convert(bo, TblMiniprogram.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblMiniprogram entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除小程序信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblArticleMapper.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.TblArticleMapper">
+
+</mapper>

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblMiniprogramMapper.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.TblMiniprogramMapper">
+
+</mapper>