diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthGroupController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthGroupController.java new file mode 100644 index 0000000..9998945 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthGroupController.java @@ -0,0 +1,106 @@ +package org.dromara.sis.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.sis.domain.vo.SisAuthGroupVo; +import org.dromara.sis.domain.bo.SisAuthGroupBo; +import org.dromara.sis.service.ISisAuthGroupService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 授权组 + * 前端访问路由地址为:/sis/authGroup + * + * @author lsm + * @date 2025-07-23 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/authGroup") +public class SisAuthGroupController extends BaseController { + + private final ISisAuthGroupService sisAuthGroupService; + + /** + * 查询授权组列表 + */ + @SaCheckPermission("sis:authGroup:list") + @GetMapping("/list") + public TableDataInfo list(SisAuthGroupBo bo, PageQuery pageQuery) { + return sisAuthGroupService.queryPageList(bo, pageQuery); + } + + /** + * 导出授权组列表 + */ + @SaCheckPermission("sis:authGroup:export") + @Log(title = "授权组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SisAuthGroupBo bo, HttpServletResponse response) { + List list = sisAuthGroupService.queryList(bo); + ExcelUtil.exportExcel(list, "授权组", SisAuthGroupVo.class, response); + } + + /** + * 获取授权组详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("sis:authGroup:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(sisAuthGroupService.queryById(id)); + } + + /** + * 新增授权组 + */ + @SaCheckPermission("sis:authGroup:add") + @Log(title = "授权组", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SisAuthGroupBo bo) { + return toAjax(sisAuthGroupService.insertByBo(bo)); + } + + /** + * 修改授权组 + */ + @SaCheckPermission("sis:authGroup:edit") + @Log(title = "授权组", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SisAuthGroupBo bo) { + return toAjax(sisAuthGroupService.updateByBo(bo)); + } + + /** + * 删除授权组 + * + * @param ids 主键串 + */ + @SaCheckPermission("sis:authGroup:remove") + @Log(title = "授权组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(sisAuthGroupService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java new file mode 100644 index 0000000..36776cc --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java @@ -0,0 +1,48 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 授权组对象 sis_auth_group + * + * @author lsm + * @date 2025-07-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sis_auth_group") +public class SisAuthGroup extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 权限名称 + */ + private String name; + + /** + * 开始时间 + */ + private Date begTime; + + /** + * 结束时间 + */ + private Date endTime; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java new file mode 100644 index 0000000..6d712ee --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java @@ -0,0 +1,48 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.SisAuthGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 授权组业务对象 sis_auth_group + * + * @author lsm + * @date 2025-07-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SisAuthGroup.class, reverseConvertGenerate = false) +public class SisAuthGroupBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 权限名称 + */ + @NotBlank(message = "权限名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 开始时间 + */ + private Date begTime; + + /** + * 结束时间 + */ + private Date endTime; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java new file mode 100644 index 0000000..cbef544 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java @@ -0,0 +1,58 @@ +package org.dromara.sis.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.sis.domain.SisAuthGroup; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 授权组视图对象 sis_auth_group + * + * @author lsm + * @date 2025-07-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SisAuthGroup.class) +public class SisAuthGroupVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 权限名称 + */ + @ExcelProperty(value = "权限名称") + private String name; + + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + private Date begTime; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + private Date endTime; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java new file mode 100644 index 0000000..e049b0b --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthGroupMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.SisAuthGroup; +import org.dromara.sis.domain.vo.SisAuthGroupVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 授权组Mapper接口 + * + * @author lsm + * @date 2025-07-23 + */ +public interface SisAuthGroupMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java new file mode 100644 index 0000000..202d36a --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthGroupService.java @@ -0,0 +1,69 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.SisAuthGroup; +import org.dromara.sis.domain.vo.SisAuthGroupVo; +import org.dromara.sis.domain.bo.SisAuthGroupBo; +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 lsm + * @date 2025-07-23 + */ +public interface ISisAuthGroupService { + + /** + * 查询授权组 + * + * @param id 主键 + * @return 授权组 + */ + SisAuthGroupVo queryById(Long id); + + /** + * 分页查询授权组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 授权组分页列表 + */ + TableDataInfo queryPageList(SisAuthGroupBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的授权组列表 + * + * @param bo 查询条件 + * @return 授权组列表 + */ + List queryList(SisAuthGroupBo bo); + + /** + * 新增授权组 + * + * @param bo 授权组 + * @return 是否新增成功 + */ + Boolean insertByBo(SisAuthGroupBo bo); + + /** + * 修改授权组 + * + * @param bo 授权组 + * @return 是否修改成功 + */ + Boolean updateByBo(SisAuthGroupBo bo); + + /** + * 校验并批量删除授权组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java new file mode 100644 index 0000000..70fbd70 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.sis.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 lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.SisAuthGroupBo; +import org.dromara.sis.domain.vo.SisAuthGroupVo; +import org.dromara.sis.domain.SisAuthGroup; +import org.dromara.sis.mapper.SisAuthGroupMapper; +import org.dromara.sis.service.ISisAuthGroupService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 授权组Service业务层处理 + * + * @author lsm + * @date 2025-07-23 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SisAuthGroupServiceImpl implements ISisAuthGroupService { + + private final SisAuthGroupMapper baseMapper; + + /** + * 查询授权组 + * + * @param id 主键 + * @return 授权组 + */ + @Override + public SisAuthGroupVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询授权组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 授权组分页列表 + */ + @Override + public TableDataInfo queryPageList(SisAuthGroupBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的授权组列表 + * + * @param bo 查询条件 + * @return 授权组列表 + */ + @Override + public List queryList(SisAuthGroupBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SisAuthGroupBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(SisAuthGroup::getId); + lqw.like(StringUtils.isNotBlank(bo.getName()), SisAuthGroup::getName, bo.getName()); + lqw.eq(bo.getBegTime() != null, SisAuthGroup::getBegTime, bo.getBegTime()); + lqw.eq(bo.getEndTime() != null, SisAuthGroup::getEndTime, bo.getEndTime()); + return lqw; + } + + /** + * 新增授权组 + * + * @param bo 授权组 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SisAuthGroupBo bo) { + SisAuthGroup add = MapstructUtils.convert(bo, SisAuthGroup.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改授权组 + * + * @param bo 授权组 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SisAuthGroupBo bo) { + SisAuthGroup update = MapstructUtils.convert(bo, SisAuthGroup.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SisAuthGroup entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除授权组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}