diff --git a/pom.xml b/pom.xml index e9b0e53..b415946 100644 --- a/pom.xml +++ b/pom.xml @@ -71,10 +71,10 @@ - devw + dev - devw + dev 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignFieldMappingController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignFieldMappingController.java new file mode 100644 index 0000000..39dc5b8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysDesignFieldMappingController.java @@ -0,0 +1,130 @@ +package org.dromara.system.controller; + +import java.util.HashMap; +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.SysDesignFieldMappingVo; +import org.dromara.system.domain.bo.SysDesignFieldMappingBo; +import org.dromara.system.service.ISysDesignFieldMappingService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 大屏设计字段映射 + * 前端访问路由地址为:/system/designFieldMapping + * + * @author Yinq + * @date 2025-05-23 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/designFieldMapping") +public class SysDesignFieldMappingController extends BaseController { + + private final ISysDesignFieldMappingService sysDesignFieldMappingService; + + /** + * 查询大屏设计字段映射列表 + */ + @SaCheckPermission("system:designFieldMapping:list") + @GetMapping("/list") + public TableDataInfo list(SysDesignFieldMappingBo bo, PageQuery pageQuery) { + return sysDesignFieldMappingService.queryPageList(bo, pageQuery); + } + + /** + * 导出大屏设计字段映射列表 + */ + @SaCheckPermission("system:designFieldMapping:export") + @Log(title = "大屏设计字段映射", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysDesignFieldMappingBo bo, HttpServletResponse response) { + List list = sysDesignFieldMappingService.queryList(bo); + ExcelUtil.exportExcel(list, "大屏设计字段映射", SysDesignFieldMappingVo.class, response); + } + + /** + * 获取大屏设计字段映射详细信息 + * + * @param fieldMappingId 主键 + */ + @SaCheckPermission("system:designFieldMapping:query") + @GetMapping("/{fieldMappingId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long fieldMappingId) { + return R.ok(sysDesignFieldMappingService.queryById(fieldMappingId)); + } + + /** + * 新增大屏设计字段映射 + */ + @SaCheckPermission("system:designFieldMapping:add") + @Log(title = "大屏设计字段映射", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysDesignFieldMappingBo bo) { + return toAjax(sysDesignFieldMappingService.insertByBo(bo)); + } + + /** + * 修改大屏设计字段映射 + */ + @SaCheckPermission("system:designFieldMapping:edit") + @Log(title = "大屏设计字段映射", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysDesignFieldMappingBo bo) { + return toAjax(sysDesignFieldMappingService.updateByBo(bo)); + } + + /** + * 删除大屏设计字段映射 + * + * @param fieldMappingIds 主键串 + */ + @SaCheckPermission("system:designFieldMapping:remove") + @Log(title = "大屏设计字段映射", businessType = BusinessType.DELETE) + @DeleteMapping("/{fieldMappingIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] fieldMappingIds) { + return toAjax(sysDesignFieldMappingService.deleteWithValidByIds(List.of(fieldMappingIds), true)); + } + + + /** + * 下拉框查询大屏设计字段映射列表 + */ + @GetMapping("/getSysDesignFieldMappingList") + public R> getSysDesignFieldMappingList(SysDesignFieldMappingBo bo) { + List list = sysDesignFieldMappingService.queryList(bo); + return R.ok(list); + } + + /** + * 大屏设计输出字段参考字段映射接口 + * + * @param fieldMappingCodeList + * @return + */ + @PostMapping("/getDataSourceFieldMappingList") + public R>> getDataSourceFieldMappingList(@RequestBody List fieldMappingCodeList) { + List> result = sysDesignFieldMappingService.getDataSourceFieldMappingList(fieldMappingCodeList); + return R.ok(result); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 2ca0cd3..8328149 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -181,4 +181,18 @@ public class SysMenuController extends BaseController { return toAjax(menuService.deleteMenuById(menuId)); } + /** + * 复制菜单 + */ + @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:menu:add") + @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @PostMapping("/copy/{menuId}") + public R copy(@PathVariable("menuId") Long menuId, @RequestBody SysMenuBo menu) { + if (!menuService.checkMenuNameUnique(menu)) { + return R.fail("复制菜单失败,菜单名称已存在"); + } + return toAjax(menuService.copyMenu(menuId, menu)); + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignFieldMapping.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignFieldMapping.java new file mode 100644 index 0000000..d186e64 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDesignFieldMapping.java @@ -0,0 +1,91 @@ +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_field_mapping + * + * @author Yinq + * @date 2025-05-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_design_field_mapping") +public class SysDesignFieldMapping extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字段映射ID + */ + @TableId(value = "field_mapping_id", type = IdType.AUTO) + private Long fieldMappingId; + + /** + * 字段映射编码 + */ + private String fieldMappingCode; + + /** + * 字段映射名称 + */ + private String fieldMappingName; + + /** + * 字段映射组 + */ + private String fieldMappingGroup; + + /** + * 大小写敏感标识(1是 0否) + */ + private String caseSensitiveFlag; + + /** + * 显示排序 + */ + 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; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignFieldMappingBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignFieldMappingBo.java new file mode 100644 index 0000000..e4271a1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDesignFieldMappingBo.java @@ -0,0 +1,91 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.SysDesignFieldMapping; +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_field_mapping + * + * @author Yinq + * @date 2025-05-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDesignFieldMapping.class, reverseConvertGenerate = false) +public class SysDesignFieldMappingBo extends BaseEntity { + + /** + * 字段映射ID + */ + private Long fieldMappingId; + + /** + * 字段映射编码 + */ + @NotBlank(message = "字段映射编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldMappingCode; + + /** + * 字段映射名称 + */ + @NotBlank(message = "字段映射名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fieldMappingName; + + /** + * 字段映射组 + */ + private String fieldMappingGroup; + + /** + * 大小写敏感标识(1是 0否) + */ + private String caseSensitiveFlag; + + /** + * 显示排序 + */ + 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; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignFieldMappingVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignFieldMappingVo.java new file mode 100644 index 0000000..74197b8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDesignFieldMappingVo.java @@ -0,0 +1,112 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysDesignFieldMapping; +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_field_mapping + * + * @author Yinq + * @date 2025-05-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDesignFieldMapping.class) +public class SysDesignFieldMappingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字段映射ID + */ + @ExcelProperty(value = "字段映射ID") + private Long fieldMappingId; + + /** + * 字段映射编码 + */ + @ExcelProperty(value = "字段映射编码") + private String fieldMappingCode; + + /** + * 字段映射名称 + */ + @ExcelProperty(value = "字段映射名称") + private String fieldMappingName; + + /** + * 字段映射组 + */ + @ExcelProperty(value = "字段映射组") + private String fieldMappingGroup; + + /** + * 大小写敏感标识(1是 0否) + */ + @ExcelProperty(value = "大小写敏感标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String caseSensitiveFlag; + + /** + * 显示排序 + */ + @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/SysDesignFieldMappingMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignFieldMappingMapper.java new file mode 100644 index 0000000..59b485d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDesignFieldMappingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysDesignFieldMapping; +import org.dromara.system.domain.vo.SysDesignFieldMappingVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏设计字段映射Mapper接口 + * + * @author Yinq + * @date 2025-05-23 + */ +public interface SysDesignFieldMappingMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignFieldMappingService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignFieldMappingService.java new file mode 100644 index 0000000..0dd6a26 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDesignFieldMappingService.java @@ -0,0 +1,78 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysDesignFieldMapping; +import org.dromara.system.domain.vo.SysDesignFieldMappingVo; +import org.dromara.system.domain.bo.SysDesignFieldMappingBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; + +/** + * 大屏设计字段映射Service接口 + * + * @author Yinq + * @date 2025-05-23 + */ +public interface ISysDesignFieldMappingService { + + /** + * 查询大屏设计字段映射 + * + * @param fieldMappingId 主键 + * @return 大屏设计字段映射 + */ + SysDesignFieldMappingVo queryById(Long fieldMappingId); + + /** + * 分页查询大屏设计字段映射列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计字段映射分页列表 + */ + TableDataInfo queryPageList(SysDesignFieldMappingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的大屏设计字段映射列表 + * + * @param bo 查询条件 + * @return 大屏设计字段映射列表 + */ + List queryList(SysDesignFieldMappingBo bo); + + /** + * 新增大屏设计字段映射 + * + * @param bo 大屏设计字段映射 + * @return 是否新增成功 + */ + Boolean insertByBo(SysDesignFieldMappingBo bo); + + /** + * 修改大屏设计字段映射 + * + * @param bo 大屏设计字段映射 + * @return 是否修改成功 + */ + Boolean updateByBo(SysDesignFieldMappingBo bo); + + /** + * 校验并批量删除大屏设计字段映射信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 大屏设计输出字段参考字段映射接口 + * + * @param fieldMappingCodeList + * @return + */ + List> getDataSourceFieldMappingList(List fieldMappingCodeList); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java index a1bdbb5..9ae57ec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java @@ -145,4 +145,13 @@ public interface ISysMenuService { * @return 结果 */ boolean checkMenuNameUnique(SysMenuBo menu); + + /** + * 复制菜单 + * + * @param menuId 源菜单ID + * @param menu 新菜单信息 + * @return 结果 + */ + int copyMenu(Long menuId, SysMenuBo menu); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignFieldMappingServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignFieldMappingServiceImpl.java new file mode 100644 index 0000000..b7c49e3 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignFieldMappingServiceImpl.java @@ -0,0 +1,170 @@ +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 com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysDesignFieldMappingBo; +import org.dromara.system.domain.vo.SysDesignFieldMappingVo; +import org.dromara.system.domain.SysDesignFieldMapping; +import org.dromara.system.mapper.SysDesignFieldMappingMapper; +import org.dromara.system.service.ISysDesignFieldMappingService; + +import java.util.*; + +/** + * 大屏设计字段映射Service业务层处理 + * + * @author Yinq + * @date 2025-05-23 + */ +@RequiredArgsConstructor +@Service +public class SysDesignFieldMappingServiceImpl implements ISysDesignFieldMappingService { + + private final SysDesignFieldMappingMapper baseMapper; + + /** + * 查询大屏设计字段映射 + * + * @param fieldMappingId 主键 + * @return 大屏设计字段映射 + */ + @Override + public SysDesignFieldMappingVo queryById(Long fieldMappingId){ + return baseMapper.selectVoById(fieldMappingId); + } + + /** + * 分页查询大屏设计字段映射列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏设计字段映射分页列表 + */ + @Override + public TableDataInfo queryPageList(SysDesignFieldMappingBo 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(SysDesignFieldMappingBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(SysDesignFieldMappingBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysDesignFieldMapping.class) + .selectAll(SysDesignFieldMapping.class) + .eq(bo.getFieldMappingId() != null, SysDesignFieldMapping::getFieldMappingId, bo.getFieldMappingId()) + .eq(StringUtils.isNotBlank(bo.getFieldMappingCode()), SysDesignFieldMapping::getFieldMappingCode, bo.getFieldMappingCode()) + .like(StringUtils.isNotBlank(bo.getFieldMappingName()), SysDesignFieldMapping::getFieldMappingName, bo.getFieldMappingName()) + .eq(StringUtils.isNotBlank(bo.getFieldMappingGroup()), SysDesignFieldMapping::getFieldMappingGroup, bo.getFieldMappingGroup()) + .eq(StringUtils.isNotBlank(bo.getCaseSensitiveFlag()), SysDesignFieldMapping::getCaseSensitiveFlag, bo.getCaseSensitiveFlag()) + .eq(bo.getSortOrder() != null, SysDesignFieldMapping::getSortOrder, bo.getSortOrder()) + .eq(StringUtils.isNotBlank(bo.getFieldOne()), SysDesignFieldMapping::getFieldOne, bo.getFieldOne()) + .eq(StringUtils.isNotBlank(bo.getFieldTwo()), SysDesignFieldMapping::getFieldTwo, bo.getFieldTwo()) + .eq(StringUtils.isNotBlank(bo.getFieldThree()), SysDesignFieldMapping::getFieldThree, bo.getFieldThree()) + .eq(StringUtils.isNotBlank(bo.getFieldFour()), SysDesignFieldMapping::getFieldFour, bo.getFieldFour()) + .eq(StringUtils.isNotBlank(bo.getFieldFive()), SysDesignFieldMapping::getFieldFive, bo.getFieldFive()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysDesignFieldMapping::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysDesignFieldMapping::getCreateTime); + return lqw; + } + + /** + * 新增大屏设计字段映射 + * + * @param bo 大屏设计字段映射 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SysDesignFieldMappingBo bo) { + SysDesignFieldMapping add = MapstructUtils.convert(bo, SysDesignFieldMapping.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setFieldMappingId(add.getFieldMappingId()); + } + return flag; + } + + /** + * 修改大屏设计字段映射 + * + * @param bo 大屏设计字段映射 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SysDesignFieldMappingBo bo) { + SysDesignFieldMapping update = MapstructUtils.convert(bo, SysDesignFieldMapping.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysDesignFieldMapping entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除大屏设计字段映射信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 大屏设计输出字段参考字段映射接口 + * + * @param fieldMappingCodeList + * @return + */ + @Override + public List> getDataSourceFieldMappingList(List fieldMappingCodeList) { + List> result = new ArrayList<>(); + if (fieldMappingCodeList.isEmpty()) { + return result; + } + for (String fieldMappingCode : fieldMappingCodeList) { + HashMap codeMap = new HashMap<>(); + SysDesignFieldMappingBo mapping = new SysDesignFieldMappingBo(); + mapping.setFieldMappingCode(fieldMappingCode); + List voList = this.queryList(mapping); + HashMap fieldMap = new HashMap<>(); + if (!voList.isEmpty()) { + SysDesignFieldMappingVo mappingVo = voList.get(0); + fieldMap.put("value",mappingVo.getFieldMappingName()); + fieldMap.put("bol", mappingVo.getCaseSensitiveFlag().equals("1")); + } + codeMap.put(fieldMappingCode, fieldMap); + result.add(codeMap); + } + return result; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java index 897d94a..8013665 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -27,7 +27,9 @@ import org.dromara.system.mapper.SysRoleMapper; import org.dromara.system.mapper.SysRoleMenuMapper; import org.dromara.system.mapper.SysTenantPackageMapper; import org.dromara.system.service.ISysMenuService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -140,7 +142,7 @@ public class SysMenuServiceImpl implements ISysMenuService { return getChildPerms(menus, 0); } @Override - public List selectMenuTreeByUserId(Long userId,int pId) { + public List selectMenuTreeByUserId(Long userId, int pId) { List menus; if (LoginHelper.isSuperAdmin(userId)) { menus = baseMapper.selectMenuTreeAll(); @@ -170,20 +172,74 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public List selectMenuListByPackageId(Long packageId) { + // 1. 查询套餐信息 SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); if (CollUtil.isEmpty(menuIds)) { return new ArrayList<>(); } + // 2. 初始化结果列表 + List result = new ArrayList<>(); + int batchSize = 500; // 每批处理1000个参数 + List parentIds = null; if (tenantPackage.getMenuCheckStrictly()) { parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() .select(SysMenu::getParentId) - .in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); + .in(SysMenu::getMenuId, menuIds), x -> { + return Convert.toLong(x); + }); } - return baseMapper.selectObjs(new LambdaQueryWrapper() - .in(SysMenu::getMenuId, menuIds) - .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); + if (tenantPackage.getMenuCheckStrictly()) { + parentIds = new ArrayList<>(); + // 分批查询父ID + for (int i = 0; i < menuIds.size(); i += batchSize) { + int endIndex = Math.min(i + batchSize, menuIds.size()); + List batchMenuIds = menuIds.subList(i, endIndex); + + List batchParentIds = baseMapper.selectObjs( + new LambdaQueryWrapper() + .select(SysMenu::getParentId) + .in(SysMenu::getMenuId, batchMenuIds), + x -> { + return Convert.toLong(x); + }); + parentIds.addAll(batchParentIds); + } + } + + // 4. 分批查询最终结果 + for (int i = 0; i < menuIds.size(); i += batchSize) { + int endIndex = Math.min(i + batchSize, menuIds.size()); + List batchMenuIds = menuIds.subList(i, endIndex); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .in(SysMenu::getMenuId, batchMenuIds); + + // 如果有父ID,也需要分批处理 + if (CollUtil.isNotEmpty(parentIds)) { + for (int j = 0; j < parentIds.size(); j += batchSize) { + int parentEndIndex = Math.min(j + batchSize, parentIds.size()); + List batchParentIds = parentIds.subList(j, parentEndIndex); + + wrapper.notIn(SysMenu::getMenuId, batchParentIds); + + // 执行查询并收集结果 + List batchResult = baseMapper.selectObjs(wrapper, x -> { + return Convert.toLong(x); + }); + result.addAll(batchResult); + } + } else { + // 如果没有父ID,直接查询 + List batchResult = baseMapper.selectObjs(wrapper, x -> { + return Convert.toLong(x); + }); + result.addAll(batchResult); + } + } + + return result; } /** @@ -301,7 +357,10 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public int insertMenu(SysMenuBo bo) { SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); - return baseMapper.insert(menu); + int insert = baseMapper.insert(menu); + assert menu != null; + bo.setMenuId(menu.getMenuId()); + return insert; } /** @@ -342,6 +401,84 @@ public class SysMenuServiceImpl implements ISysMenuService { return !exist; } + /** + * 复制菜单 + * + * @param menuId 源菜单ID + * @param menu 新菜单信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int copyMenu(Long menuId, SysMenuBo menu) { + // 1. 获取源菜单信息 + SysMenuVo sourceMenu = selectMenuById(menuId); + if (sourceMenu == null) { + throw new RuntimeException("源菜单不存在"); + } + + // 2. 创建新菜单对象 + SysMenuBo newMenu = new SysMenuBo(); + BeanUtils.copyProperties(sourceMenu, newMenu); + newMenu.setMenuId(null); + newMenu.setCreateTime(null); + newMenu.setMenuName(menu.getMenuName()); + newMenu.setParentId(menu.getParentId()); + newMenu.setOrderNum(menu.getOrderNum()); + + // 3. 检查菜单名称是否唯一 + if (!checkMenuNameUnique(newMenu)) { + throw new RuntimeException("菜单名称已存在"); + } + + // 4. 插入新菜单 + int rows = insertMenu(newMenu); + if (rows > 0) { + // 5. 获取新插入菜单的ID + Long newMenuId = newMenu.getMenuId(); + + // 6. 递归复制子菜单 + copyChildMenus(menuId, newMenuId); + } + return rows; + } + + /** + * 递归复制子菜单 + * + * @param sourceParentId 源父菜单ID + * @param targetParentId 目标父菜单ID + */ + private void copyChildMenus(Long sourceParentId, Long targetParentId) { + // 1. 查询源父菜单的所有子菜单 + List children = baseMapper.selectVoList( + new LambdaQueryWrapper() + .eq(SysMenu::getParentId, sourceParentId) + ); + + // 2. 递归复制每个子菜单 + if (CollUtil.isNotEmpty(children)) { + for (SysMenuVo child : children) { + // 2.1 创建新的子菜单对象 + SysMenuBo newChildMenu = new SysMenuBo(); + BeanUtils.copyProperties(child, newChildMenu); + newChildMenu.setMenuId(null); + newChildMenu.setCreateTime(null); + newChildMenu.setParentId(targetParentId); + newChildMenu.setMenuName(child.getMenuName()); + + // 2.2 插入新的子菜单 + int rows = insertMenu(newChildMenu); + if (rows > 0) { + // 2.3 获取新插入的子菜单ID + Long newChildMenuId = newChildMenu.getMenuId(); + // 2.4 递归复制下一级子菜单 + copyChildMenus(child.getMenuId(), newChildMenuId); + } + } + } + } + /** * 根据父节点的ID获取所有子节点 * diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignFieldMappingMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignFieldMappingMapper.xml new file mode 100644 index 0000000..1134257 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDesignFieldMappingMapper.xml @@ -0,0 +1,7 @@ + + + + +