diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignDataSourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignDataSourceController.java new file mode 100644 index 0000000..c6aca27 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignDataSourceController.java @@ -0,0 +1,118 @@ +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.SysDesignDataSourceVo; +import org.dromara.system.domain.bo.SysDesignDataSourceBo; +import org.dromara.system.service.ISysDesignDataSourceService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 大屏设计数据源 + * 前端访问路由地址为:/system/designDataSource + * + * @author Yinq + * @date 2025-05-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/designDataSource") +public class SysDesignDataSourceController extends BaseController { + + private final ISysDesignDataSourceService sysDesignDataSourceService; + + /** + * 查询大屏设计数据源列表 + */ + //@SaCheckPermission("system:designDataSource:list") + @GetMapping("/list") + public TableDataInfo list(SysDesignDataSourceBo bo, PageQuery pageQuery) { + return sysDesignDataSourceService.queryPageList(bo, pageQuery); + } + + /** + * 导出大屏设计数据源列表 + */ + //@SaCheckPermission("system:designDataSource:export") + @Log(title = "大屏设计数据源", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysDesignDataSourceBo bo, HttpServletResponse response) { + List list = sysDesignDataSourceService.queryList(bo); + ExcelUtil.exportExcel(list, "大屏设计数据源", SysDesignDataSourceVo.class, response); + } + + /** + * 获取大屏设计数据源详细信息 + * + * @param dataSourceId 主键 + */ + //@SaCheckPermission("system:designDataSource:query") + @GetMapping("/{dataSourceId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long dataSourceId) { + return R.ok(sysDesignDataSourceService.queryById(dataSourceId)); + } + + /** + * 新增大屏设计数据源 + */ + //@SaCheckPermission("system:designDataSource:add") + @Log(title = "大屏设计数据源", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysDesignDataSourceBo bo) { + return toAjax(sysDesignDataSourceService.insertByBo(bo)); + } + + /** + * 修改大屏设计数据源 + */ + //@SaCheckPermission("system:designDataSource:edit") + @Log(title = "大屏设计数据源", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysDesignDataSourceBo bo) { + return toAjax(sysDesignDataSourceService.updateByBo(bo)); + } + + /** + * 删除大屏设计数据源 + * + * @param dataSourceIds 主键串 + */ + //@SaCheckPermission("system:designDataSource:remove") + @Log(title = "大屏设计数据源", businessType = BusinessType.DELETE) + @DeleteMapping("/{dataSourceIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] dataSourceIds) { + return toAjax(sysDesignDataSourceService.deleteWithValidByIds(List.of(dataSourceIds), true)); + } + + + /** + * 下拉框查询大屏设计数据源列表 + */ + @GetMapping("/getSysDesignDataSourceList") + public R> getSysDesignDataSourceList(SysDesignDataSourceBo bo) { + List list = sysDesignDataSourceService.queryList(bo); + return R.ok(list); + } + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignPageConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignPageConfigController.java new file mode 100644 index 0000000..a8b66c7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignPageConfigController.java @@ -0,0 +1,117 @@ +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.SysDesignPageConfigVo; +import org.dromara.system.domain.bo.SysDesignPageConfigBo; +import org.dromara.system.service.ISysDesignPageConfigService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 大屏设计页面配置 + * 前端访问路由地址为:/system/designPageConfig + * + * @author Yinq + * @date 2025-05-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/designPageConfig") +public class SysDesignPageConfigController extends BaseController { + + private final ISysDesignPageConfigService sysDesignPageConfigService; + + /** + * 查询大屏设计页面配置列表 + */ + @SaCheckPermission("system:designPageConfig:list") + @GetMapping("/list") + public TableDataInfo list(SysDesignPageConfigBo bo, PageQuery pageQuery) { + return sysDesignPageConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出大屏设计页面配置列表 + */ + @SaCheckPermission("system:designPageConfig:export") + @Log(title = "大屏设计页面配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysDesignPageConfigBo bo, HttpServletResponse response) { + List list = sysDesignPageConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "大屏设计页面配置", SysDesignPageConfigVo.class, response); + } + + /** + * 获取大屏设计页面配置详细信息 + * + * @param pageConfigId 主键 + */ + @SaCheckPermission("system:designPageConfig:query") + @GetMapping("/{pageConfigId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long pageConfigId) { + return R.ok(sysDesignPageConfigService.queryById(pageConfigId)); + } + + /** + * 新增大屏设计页面配置 + */ + @SaCheckPermission("system:designPageConfig:add") + @Log(title = "大屏设计页面配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysDesignPageConfigBo bo) { + return toAjax(sysDesignPageConfigService.insertByBo(bo)); + } + + /** + * 修改大屏设计页面配置 + */ + @SaCheckPermission("system:designPageConfig:edit") + @Log(title = "大屏设计页面配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysDesignPageConfigBo bo) { + return toAjax(sysDesignPageConfigService.updateByBo(bo)); + } + + /** + * 删除大屏设计页面配置 + * + * @param pageConfigIds 主键串 + */ + @SaCheckPermission("system:designPageConfig:remove") + @Log(title = "大屏设计页面配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{pageConfigIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] pageConfigIds) { + return toAjax(sysDesignPageConfigService.deleteWithValidByIds(List.of(pageConfigIds), true)); + } + + + /** + * 下拉框查询大屏设计页面配置列表 + */ + + @GetMapping("/getSysDesignPageConfigList") + public R> getSysDesignPageConfigList(SysDesignPageConfigBo bo) { + List list = sysDesignPageConfigService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataField.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataField.java new file mode 100644 index 0000000..a258362 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataField.java @@ -0,0 +1,102 @@ +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_design_data_field + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_design_data_field") +public class SysDesignDataField extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 数据字段ID + */ + @TableId(value = "data_field_id", type = IdType.AUTO) + private Long dataFieldId; + + /** + * 数据源ID + */ + private Long dataSourceId; + + /** + * 字段类型(1请求数据 2输出数据) + */ + private String fieldType; + + /** + * 备注说明 + */ + private String remarkName; + + /** + * 请求内容类型 + */ + private String requestContentType; + + /** + * 数据类型(bool short int long float byte ushort uint ulong double string) + */ + private String dataType; + + /** + * 显示排序 + */ + private Long sortOrder; + + /** + * 预留字段一 + */ + private String fieldOne; + + /** + * 预留字段二 + */ + private String fieldTwo; + + /** + * 预留字段三 + */ + private String fieldThree; + + /** + * 预留字段四 + */ + private String fieldFour; + + /** + * 预留字段五 + */ + private String fieldFive; + + /** + * 删除标志(0代表存在 2代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataSource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataSource.java new file mode 100644 index 0000000..317acbc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignDataSource.java @@ -0,0 +1,112 @@ +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_design_data_source + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_design_data_source") +public class SysDesignDataSource extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 数据源ID + */ + @TableId(value = "data_source_id", type = IdType.AUTO) + private Long dataSourceId; + + /** + * 数据源名称 + */ + private String dataSourceName; + + /** + * 请求方法 + */ + private String requestMethod; + + /** + * 请求地址 + */ + private String requestUrl; + + /** + * 数据源分组 + */ + private String dataSourceGroup; + + /** + * 请求内容类型 + */ + private String requestContentType; + + /** + * 响应格式(JSON XML) + */ + private String responseType; + + /** + * 版本号 + */ + private String versionCode; + + /** + * 显示排序 + */ + private Long sortOrder; + + /** + * 预留字段一 + */ + private String fieldOne; + + /** + * 预留字段二 + */ + private String fieldTwo; + + /** + * 预留字段三 + */ + private String fieldThree; + + /** + * 预留字段四 + */ + private String fieldFour; + + /** + * 预留字段五 + */ + private String fieldFive; + + /** + * 删除标志(0代表存在 2代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignPageConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignPageConfig.java new file mode 100644 index 0000000..c48adeb --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignPageConfig.java @@ -0,0 +1,97 @@ +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_design_page_config + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_design_page_config") +public class SysDesignPageConfig extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 页面配置ID + */ + @TableId(value = "page_config_id", type = IdType.AUTO) + private Long pageConfigId; + + /** + * 页面名称 + */ + private String pageConfigName; + + /** + * 页面背景 + */ + private String pageBackground; + + /** + * 页面路由 + */ + private String pageRouting; + + /** + * 自定义内容 + */ + private String customContent; + + /** + * 显示排序 + */ + private Long sortOrder; + + /** + * 预留字段一 + */ + private String fieldOne; + + /** + * 预留字段二 + */ + private String fieldTwo; + + /** + * 预留字段三 + */ + private String fieldThree; + + /** + * 预留字段四 + */ + private String fieldFour; + + /** + * 预留字段五 + */ + private String fieldFive; + + /** + * 删除标志(0代表存在 2代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignDataSourceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignDataSourceBo.java new file mode 100644 index 0000000..b99a7be --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignDataSourceBo.java @@ -0,0 +1,114 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.SysDesignDataField; +import org.dromara.system.domain.SysDesignDataSource; +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.List; + +/** + * 大屏设计数据源业务对象 sys_design_data_source + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDesignDataSource.class, reverseConvertGenerate = false) +public class SysDesignDataSourceBo extends BaseEntity { + + /** + * 数据源ID + */ + private Long dataSourceId; + + /** + * 数据源名称 + */ + @NotBlank(message = "数据源名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String dataSourceName; + + /** + * 请求方法 + */ + @NotBlank(message = "请求方法不能为空", groups = { AddGroup.class, EditGroup.class }) + private String requestMethod; + + /** + * 请求地址 + */ + @NotBlank(message = "请求地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String requestUrl; + + /** + * 数据源分组 + */ + private String dataSourceGroup; + + /** + * 请求内容类型 + */ + private String requestContentType; + + /** + * 响应格式(JSON XML) + */ + private String responseType; + + /** + * 版本号 + */ + private String versionCode; + + /** + * 显示排序 + */ + private Long sortOrder; + + /** + * 预留字段一 + */ + private String fieldOne; + + /** + * 预留字段二 + */ + private String fieldTwo; + + /** + * 预留字段三 + */ + private String fieldThree; + + /** + * 预留字段四 + */ + private String fieldFour; + + /** + * 预留字段五 + */ + private String fieldFive; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 数据字段List + */ + private List designDataFieldList; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignPageConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignPageConfigBo.java new file mode 100644 index 0000000..4a9bb56 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignPageConfigBo.java @@ -0,0 +1,102 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.SysDesignPageConfig; +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_design_page_config + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDesignPageConfig.class, reverseConvertGenerate = false) +public class SysDesignPageConfigBo extends BaseEntity { + + /** + * 页面配置ID + */ + @NotNull(message = "页面配置ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long pageConfigId; + + /** + * 页面名称 + */ + @NotBlank(message = "页面名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pageConfigName; + + /** + * 页面背景 + */ + @NotBlank(message = "页面背景不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pageBackground; + + /** + * 页面路由 + */ + @NotBlank(message = "页面路由不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pageRouting; + + /** + * 自定义内容 + */ + @NotBlank(message = "自定义内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String customContent; + + /** + * 显示排序 + */ + @NotNull(message = "显示排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sortOrder; + + /** + * 预留字段一 + */ + @NotBlank(message = "预留字段一不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldOne; + + /** + * 预留字段二 + */ + @NotBlank(message = "预留字段二不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldTwo; + + /** + * 预留字段三 + */ + @NotBlank(message = "预留字段三不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldThree; + + /** + * 预留字段四 + */ + @NotBlank(message = "预留字段四不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldFour; + + /** + * 预留字段五 + */ + @NotBlank(message = "预留字段五不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldFive; + + /** + * 激活标识(1是 0否) + */ + @NotBlank(message = "激活标识(1是 0否)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignDataSourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignDataSourceVo.java new file mode 100644 index 0000000..bae1c63 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignDataSourceVo.java @@ -0,0 +1,133 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysDesignDataField; +import org.dromara.system.domain.SysDesignDataSource; +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; +import java.util.List; + + +/** + * 大屏设计数据源视图对象 sys_design_data_source + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDesignDataSource.class) +public class SysDesignDataSourceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 数据源ID + */ + @ExcelProperty(value = "数据源ID") + private Long dataSourceId; + + /** + * 数据源名称 + */ + @ExcelProperty(value = "数据源名称") + private String dataSourceName; + + /** + * 请求方法 + */ + @ExcelProperty(value = "请求方法") + private String requestMethod; + + /** + * 请求地址 + */ + @ExcelProperty(value = "请求地址") + private String requestUrl; + + /** + * 数据源分组 + */ + @ExcelProperty(value = "数据源分组") + private String dataSourceGroup; + + /** + * 请求内容类型 + */ + @ExcelProperty(value = "请求内容类型") + private String requestContentType; + + /** + * 响应格式(JSON XML) + */ + @ExcelProperty(value = "响应格式(JSON XML)") + private String responseType; + + /** + * 版本号 + */ + @ExcelProperty(value = "版本号") + private String versionCode; + + /** + * 显示排序 + */ + @ExcelProperty(value = "显示排序") + private Long sortOrder; + + /** + * 预留字段一 + */ + @ExcelProperty(value = "预留字段一") + private String fieldOne; + + /** + * 预留字段二 + */ + @ExcelProperty(value = "预留字段二") + private String fieldTwo; + + /** + * 预留字段三 + */ + @ExcelProperty(value = "预留字段三") + private String fieldThree; + + /** + * 预留字段四 + */ + @ExcelProperty(value = "预留字段四") + private String fieldFour; + + /** + * 预留字段五 + */ + @ExcelProperty(value = "预留字段五") + private String fieldFive; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 数据字段List + */ + private List designDataFieldList; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignPageConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignPageConfigVo.java new file mode 100644 index 0000000..8a0e2e7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignPageConfigVo.java @@ -0,0 +1,111 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysDesignPageConfig; +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; + + + +/** + * 大屏设计页面配置视图对象 sys_design_page_config + * + * @author Yinq + * @date 2025-05-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDesignPageConfig.class) +public class SysDesignPageConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 页面配置ID + */ + @ExcelProperty(value = "页面配置ID") + private Long pageConfigId; + + /** + * 页面名称 + */ + @ExcelProperty(value = "页面名称") + private String pageConfigName; + + /** + * 页面背景 + */ + @ExcelProperty(value = "页面背景") + private String pageBackground; + + /** + * 页面路由 + */ + @ExcelProperty(value = "页面路由") + private String pageRouting; + + /** + * 自定义内容 + */ + @ExcelProperty(value = "自定义内容") + private String customContent; + + /** + * 显示排序 + */ + @ExcelProperty(value = "显示排序") + private Long sortOrder; + + /** + * 预留字段一 + */ + @ExcelProperty(value = "预留字段一") + private String fieldOne; + + /** + * 预留字段二 + */ + @ExcelProperty(value = "预留字段二") + private String fieldTwo; + + /** + * 预留字段三 + */ + @ExcelProperty(value = "预留字段三") + private String fieldThree; + + /** + * 预留字段四 + */ + @ExcelProperty(value = "预留字段四") + private String fieldFour; + + /** + * 预留字段五 + */ + @ExcelProperty(value = "预留字段五") + private String fieldFive; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataFieldMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataFieldMapper.java new file mode 100644 index 0000000..46b934f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataFieldMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysDesignDataField; +import org.dromara.system.domain.vo.SysDesignDataFieldVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏设计数据字段Mapper接口 + * + * @author Yinq + * @date 2025-05-20 + */ +public interface SysDesignDataFieldMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataSourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataSourceMapper.java new file mode 100644 index 0000000..cf5f64f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignDataSourceMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysDesignDataSource; +import org.dromara.system.domain.vo.SysDesignDataSourceVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏设计数据源Mapper接口 + * + * @author Yinq + * @date 2025-05-20 + */ +public interface SysDesignDataSourceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignPageConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignPageConfigMapper.java new file mode 100644 index 0000000..680a4e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignPageConfigMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysDesignPageConfig; +import org.dromara.system.domain.vo.SysDesignPageConfigVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏设计页面配置Mapper接口 + * + * @author Yinq + * @date 2025-05-20 + */ +public interface SysDesignPageConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignDataSourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignDataSourceService.java new file mode 100644 index 0000000..c69ea80 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignDataSourceService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.SysDesignDataSourceVo; +import org.dromara.system.domain.bo.SysDesignDataSourceBo; +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 Yinq + * @date 2025-05-20 + */ +public interface ISysDesignDataSourceService { + + /** + * 查询大屏设计数据源 + * + * @param dataSourceId 主键 + * @return 大屏设计数据源 + */ + SysDesignDataSourceVo queryById(Long dataSourceId); + + /** + * 分页查询大屏设计数据源列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计数据源分页列表 + */ + TableDataInfo queryPageList(SysDesignDataSourceBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的大屏设计数据源列表 + * + * @param bo 查询条件 + * @return 大屏设计数据源列表 + */ + List queryList(SysDesignDataSourceBo bo); + + /** + * 新增大屏设计数据源 + * + * @param bo 大屏设计数据源 + * @return 是否新增成功 + */ + Boolean insertByBo(SysDesignDataSourceBo bo); + + /** + * 修改大屏设计数据源 + * + * @param bo 大屏设计数据源 + * @return 是否修改成功 + */ + Boolean updateByBo(SysDesignDataSourceBo bo); + + /** + * 校验并批量删除大屏设计数据源信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignPageConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignPageConfigService.java new file mode 100644 index 0000000..fa90758 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignPageConfigService.java @@ -0,0 +1,69 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysDesignPageConfig; +import org.dromara.system.domain.vo.SysDesignPageConfigVo; +import org.dromara.system.domain.bo.SysDesignPageConfigBo; +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 Yinq + * @date 2025-05-20 + */ +public interface ISysDesignPageConfigService { + + /** + * 查询大屏设计页面配置 + * + * @param pageConfigId 主键 + * @return 大屏设计页面配置 + */ + SysDesignPageConfigVo queryById(Long pageConfigId); + + /** + * 分页查询大屏设计页面配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计页面配置分页列表 + */ + TableDataInfo queryPageList(SysDesignPageConfigBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的大屏设计页面配置列表 + * + * @param bo 查询条件 + * @return 大屏设计页面配置列表 + */ + List queryList(SysDesignPageConfigBo bo); + + /** + * 新增大屏设计页面配置 + * + * @param bo 大屏设计页面配置 + * @return 是否新增成功 + */ + Boolean insertByBo(SysDesignPageConfigBo bo); + + /** + * 修改大屏设计页面配置 + * + * @param bo 大屏设计页面配置 + * @return 是否修改成功 + */ + Boolean updateByBo(SysDesignPageConfigBo bo); + + /** + * 校验并批量删除大屏设计页面配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignDataSourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignDataSourceServiceImpl.java new file mode 100644 index 0000000..ed5bb63 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignDataSourceServiceImpl.java @@ -0,0 +1,177 @@ +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.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.SysDesignDataField; +import org.dromara.system.mapper.SysDesignDataFieldMapper; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysDesignDataSourceBo; +import org.dromara.system.domain.vo.SysDesignDataSourceVo; +import org.dromara.system.domain.SysDesignDataSource; +import org.dromara.system.mapper.SysDesignDataSourceMapper; +import org.dromara.system.service.ISysDesignDataSourceService; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 大屏设计数据源Service业务层处理 + * + * @author Yinq + * @date 2025-05-20 + */ +@RequiredArgsConstructor +@Service +public class SysDesignDataSourceServiceImpl implements ISysDesignDataSourceService { + + private final SysDesignDataSourceMapper baseMapper; + + private final SysDesignDataFieldMapper designDataFieldMapper; + + /** + * 查询大屏设计数据源 + * + * @param dataSourceId 主键 + * @return 大屏设计数据源 + */ + @Override + public SysDesignDataSourceVo queryById(Long dataSourceId) { + SysDesignDataSourceVo dataSourceVo = baseMapper.selectVoById(dataSourceId); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysDesignDataField.class); + lqw.eq(SysDesignDataField::getDataSourceId, dataSourceId); + List dataFieldList = designDataFieldMapper.selectList(lqw); + dataSourceVo.setDesignDataFieldList(dataFieldList); + return dataSourceVo; + } + + /** + * 分页查询大屏设计数据源列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计数据源分页列表 + */ + @Override + public TableDataInfo queryPageList(SysDesignDataSourceBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的大屏设计数据源列表 + * + * @param bo 查询条件 + * @return 大屏设计数据源列表 + */ + @Override + public List queryList(SysDesignDataSourceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(SysDesignDataSourceBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysDesignDataSource.class) + .selectAll(SysDesignDataSource.class) + .eq(bo.getDataSourceId() != null, SysDesignDataSource::getDataSourceId, bo.getDataSourceId()) + .like(StringUtils.isNotBlank(bo.getDataSourceName()), SysDesignDataSource::getDataSourceName, bo.getDataSourceName()) + .eq(StringUtils.isNotBlank(bo.getRequestMethod()), SysDesignDataSource::getRequestMethod, bo.getRequestMethod()) + .eq(StringUtils.isNotBlank(bo.getRequestUrl()), SysDesignDataSource::getRequestUrl, bo.getRequestUrl()) + .eq(StringUtils.isNotBlank(bo.getDataSourceGroup()), SysDesignDataSource::getDataSourceGroup, bo.getDataSourceGroup()) + .eq(StringUtils.isNotBlank(bo.getRequestContentType()), SysDesignDataSource::getRequestContentType, bo.getRequestContentType()) + .eq(StringUtils.isNotBlank(bo.getResponseType()), SysDesignDataSource::getResponseType, bo.getResponseType()) + .eq(StringUtils.isNotBlank(bo.getVersionCode()), SysDesignDataSource::getVersionCode, bo.getVersionCode()) + .eq(bo.getSortOrder() != null, SysDesignDataSource::getSortOrder, bo.getSortOrder()) + .eq(StringUtils.isNotBlank(bo.getFieldOne()), SysDesignDataSource::getFieldOne, bo.getFieldOne()) + .eq(StringUtils.isNotBlank(bo.getFieldTwo()), SysDesignDataSource::getFieldTwo, bo.getFieldTwo()) + .eq(StringUtils.isNotBlank(bo.getFieldThree()), SysDesignDataSource::getFieldThree, bo.getFieldThree()) + .eq(StringUtils.isNotBlank(bo.getFieldFour()), SysDesignDataSource::getFieldFour, bo.getFieldFour()) + .eq(StringUtils.isNotBlank(bo.getFieldFive()), SysDesignDataSource::getFieldFive, bo.getFieldFive()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysDesignDataSource::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysDesignDataSource::getCreateTime); + return lqw; + } + + /** + * 新增大屏设计数据源 + * + * @param bo 大屏设计数据源 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(SysDesignDataSourceBo bo) { + SysDesignDataSource add = MapstructUtils.convert(bo, SysDesignDataSource.class); + List designDataFieldList = bo.getDesignDataFieldList(); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + assert add != null; + bo.setDataSourceId(add.getDataSourceId()); + if (!designDataFieldList.isEmpty()) { + for (SysDesignDataField designDataField : designDataFieldList) { + designDataField.setDataSourceId(add.getDataSourceId()); + designDataFieldMapper.insert(designDataField); + } + } + } + return flag; + } + + /** + * 修改大屏设计数据源 + * + * @param bo 大屏设计数据源 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(SysDesignDataSourceBo bo) { + SysDesignDataSource update = MapstructUtils.convert(bo, SysDesignDataSource.class); + List designDataFieldList = bo.getDesignDataFieldList(); + validEntityBeforeSave(update); + if (!designDataFieldList.isEmpty()) { +// MPJLambdaWrapper lqw = JoinWrappers.lambda(SysDesignDataField.class); +// lqw.eq(bo.getDataSourceId() != null, SysDesignDataField::getDataSourceId, bo.getDataSourceId()); +// List dataFieldList = designDataFieldMapper.selectList(lqw); +// for (SysDesignDataField field : dataFieldList) { +// designDataFieldMapper.deleteById(field.getDataFieldId()); +// } + for (SysDesignDataField dataField : designDataFieldList) { + designDataFieldMapper.insertOrUpdate(dataField); + } + } + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysDesignDataSource entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除大屏设计数据源信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java new file mode 100644 index 0000000..aa53bf8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java @@ -0,0 +1,142 @@ +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.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysDesignPageConfigBo; +import org.dromara.system.domain.vo.SysDesignPageConfigVo; +import org.dromara.system.domain.SysDesignPageConfig; +import org.dromara.system.mapper.SysDesignPageConfigMapper; +import org.dromara.system.service.ISysDesignPageConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 大屏设计页面配置Service业务层处理 + * + * @author Yinq + * @date 2025-05-20 + */ +@RequiredArgsConstructor +@Service +public class SysDesignPageConfigServiceImpl implements ISysDesignPageConfigService { + + private final SysDesignPageConfigMapper baseMapper; + + /** + * 查询大屏设计页面配置 + * + * @param pageConfigId 主键 + * @return 大屏设计页面配置 + */ + @Override + public SysDesignPageConfigVo queryById(Long pageConfigId){ + return baseMapper.selectVoById(pageConfigId); + } + + /** + * 分页查询大屏设计页面配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计页面配置分页列表 + */ + @Override + public TableDataInfo queryPageList(SysDesignPageConfigBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的大屏设计页面配置列表 + * + * @param bo 查询条件 + * @return 大屏设计页面配置列表 + */ + @Override + public List queryList(SysDesignPageConfigBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(SysDesignPageConfigBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysDesignPageConfig.class) + .selectAll(SysDesignPageConfig.class) + .eq(bo.getPageConfigId() != null, SysDesignPageConfig::getPageConfigId, bo.getPageConfigId()) + .like(StringUtils.isNotBlank(bo.getPageConfigName()), SysDesignPageConfig::getPageConfigName, bo.getPageConfigName()) + .eq(StringUtils.isNotBlank(bo.getPageBackground()), SysDesignPageConfig::getPageBackground, bo.getPageBackground()) + .eq(StringUtils.isNotBlank(bo.getPageRouting()), SysDesignPageConfig::getPageRouting, bo.getPageRouting()) + .eq(StringUtils.isNotBlank(bo.getCustomContent()), SysDesignPageConfig::getCustomContent, bo.getCustomContent()) + .eq(bo.getSortOrder() != null, SysDesignPageConfig::getSortOrder, bo.getSortOrder()) + .eq(StringUtils.isNotBlank(bo.getFieldOne()), SysDesignPageConfig::getFieldOne, bo.getFieldOne()) + .eq(StringUtils.isNotBlank(bo.getFieldTwo()), SysDesignPageConfig::getFieldTwo, bo.getFieldTwo()) + .eq(StringUtils.isNotBlank(bo.getFieldThree()), SysDesignPageConfig::getFieldThree, bo.getFieldThree()) + .eq(StringUtils.isNotBlank(bo.getFieldFour()), SysDesignPageConfig::getFieldFour, bo.getFieldFour()) + .eq(StringUtils.isNotBlank(bo.getFieldFive()), SysDesignPageConfig::getFieldFive, bo.getFieldFive()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysDesignPageConfig::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(SysDesignPageConfig::getCreateTime); + return lqw; + } + + /** + * 新增大屏设计页面配置 + * + * @param bo 大屏设计页面配置 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SysDesignPageConfigBo bo) { + SysDesignPageConfig add = MapstructUtils.convert(bo, SysDesignPageConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPageConfigId(add.getPageConfigId()); + } + return flag; + } + + /** + * 修改大屏设计页面配置 + * + * @param bo 大屏设计页面配置 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SysDesignPageConfigBo bo) { + SysDesignPageConfig update = MapstructUtils.convert(bo, SysDesignPageConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysDesignPageConfig entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除大屏设计页面配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataFieldMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataFieldMapper.xml new file mode 100644 index 0000000..deb378b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataFieldMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataSourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataSourceMapper.xml new file mode 100644 index 0000000..d0cfa2d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignDataSourceMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignPageConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignPageConfigMapper.xml new file mode 100644 index 0000000..3b0c3ed --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignPageConfigMapper.xml @@ -0,0 +1,7 @@ + + + + +