diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbUserGroupController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbUserGroupController.java new file mode 100644 index 0000000..bfdc90c --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbUserGroupController.java @@ -0,0 +1,106 @@ +package org.dromara.property.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.property.domain.vo.TbUserGroupVo; +import org.dromara.property.domain.bo.TbUserGroupBo; +import org.dromara.property.service.ITbUserGroupService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 人员组管理 + * 前端访问路由地址为:/property/userGroup + * + * @author dy + * @date 2025-06-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/userGroup") +public class TbUserGroupController extends BaseController { + + private final ITbUserGroupService tbUserGroupService; + + /** + * 查询人员组管理列表 + */ + @SaCheckPermission("property:userGroup:list") + @GetMapping("/list") + public TableDataInfo list(TbUserGroupBo bo, PageQuery pageQuery) { + return tbUserGroupService.queryPageList(bo, pageQuery); + } + + /** + * 导出人员组管理列表 + */ + @SaCheckPermission("property:userGroup:export") + @Log(title = "人员组管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TbUserGroupBo bo, HttpServletResponse response) { + List list = tbUserGroupService.queryList(bo); + ExcelUtil.exportExcel(list, "人员组管理", TbUserGroupVo.class, response); + } + + /** + * 获取人员组管理详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:userGroup:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(tbUserGroupService.queryById(id)); + } + + /** + * 新增人员组管理 + */ + @SaCheckPermission("property:userGroup:add") + @Log(title = "人员组管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TbUserGroupBo bo) { + return toAjax(tbUserGroupService.insertByBo(bo)); + } + + /** + * 修改人员组管理 + */ + @SaCheckPermission("property:userGroup:edit") + @Log(title = "人员组管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TbUserGroupBo bo) { + return toAjax(tbUserGroupService.updateByBo(bo)); + } + + /** + * 删除人员组管理 + * + * @param ids 主键串 + */ + @SaCheckPermission("property:userGroup:remove") + @Log(title = "人员组管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(tbUserGroupService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbUserGroup.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbUserGroup.java new file mode 100644 index 0000000..6c558f6 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbUserGroup.java @@ -0,0 +1,41 @@ +package org.dromara.property.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 人员组管理对象 tb_user_group + * + * @author dy + * @date 2025-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tb_user_group") +public class TbUserGroup extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 人员组id + */ + private Long userGroupId; + + /** + * 人员组名称 + */ + private String userGroupName; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbUserGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbUserGroupBo.java new file mode 100644 index 0000000..5a86d2d --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbUserGroupBo.java @@ -0,0 +1,40 @@ +package org.dromara.property.domain.bo; + +import org.dromara.property.domain.TbUserGroup; +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.*; + +/** + * 人员组管理业务对象 tb_user_group + * + * @author dy + * @date 2025-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TbUserGroup.class, reverseConvertGenerate = false) +public class TbUserGroupBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 人员组id + */ + private Long userGroupId; + + /** + * 人员组名称 + */ + private String userGroupName; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbUserGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbUserGroupVo.java new file mode 100644 index 0000000..e9466aa --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbUserGroupVo.java @@ -0,0 +1,50 @@ +package org.dromara.property.domain.vo; + +import org.dromara.property.domain.TbUserGroup; +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; + + + +/** + * 人员组管理视图对象 tb_user_group + * + * @author dy + * @date 2025-06-25 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TbUserGroup.class) +public class TbUserGroupVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 人员组id + */ + @ExcelProperty(value = "人员组id") + private Long userGroupId; + + /** + * 人员组名称 + */ + @ExcelProperty(value = " 人员组名称") + private String userGroupName; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java new file mode 100644 index 0000000..67dafe0 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java @@ -0,0 +1,15 @@ +package org.dromara.property.mapper; + +import org.dromara.property.domain.TbUserGroup; +import org.dromara.property.domain.vo.TbUserGroupVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 人员组管理Mapper接口 + * + * @author dy + * @date 2025-06-25 + */ +public interface TbUserGroupMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbUserGroupService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbUserGroupService.java new file mode 100644 index 0000000..c6ea190 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbUserGroupService.java @@ -0,0 +1,69 @@ +package org.dromara.property.service; + +import org.dromara.property.domain.TbUserGroup; +import org.dromara.property.domain.vo.TbUserGroupVo; +import org.dromara.property.domain.bo.TbUserGroupBo; +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 dy + * @date 2025-06-25 + */ +public interface ITbUserGroupService { + + /** + * 查询人员组管理 + * + * @param id 主键 + * @return 人员组管理 + */ + TbUserGroupVo queryById(Long id); + + /** + * 分页查询人员组管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员组管理分页列表 + */ + TableDataInfo queryPageList(TbUserGroupBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人员组管理列表 + * + * @param bo 查询条件 + * @return 人员组管理列表 + */ + List queryList(TbUserGroupBo bo); + + /** + * 新增人员组管理 + * + * @param bo 人员组管理 + * @return 是否新增成功 + */ + Boolean insertByBo(TbUserGroupBo bo); + + /** + * 修改人员组管理 + * + * @param bo 人员组管理 + * @return 是否修改成功 + */ + Boolean updateByBo(TbUserGroupBo bo); + + /** + * 校验并批量删除人员组管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java new file mode 100644 index 0000000..e2f298d --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.property.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.property.domain.bo.TbUserGroupBo; +import org.dromara.property.domain.vo.TbUserGroupVo; +import org.dromara.property.domain.TbUserGroup; +import org.dromara.property.mapper.TbUserGroupMapper; +import org.dromara.property.service.ITbUserGroupService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人员组管理Service业务层处理 + * + * @author dy + * @date 2025-06-25 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TbUserGroupServiceImpl implements ITbUserGroupService { + + private final TbUserGroupMapper baseMapper; + + /** + * 查询人员组管理 + * + * @param id 主键 + * @return 人员组管理 + */ + @Override + public TbUserGroupVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询人员组管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员组管理分页列表 + */ + @Override + public TableDataInfo queryPageList(TbUserGroupBo 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(TbUserGroupBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbUserGroupBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TbUserGroup::getId); + lqw.like(bo.getUserGroupId() != null, TbUserGroup::getUserGroupId, bo.getUserGroupId()); + lqw.like(StringUtils.isNotBlank(bo.getUserGroupName()), TbUserGroup::getUserGroupName, bo.getUserGroupName()); + return lqw; + } + + /** + * 新增人员组管理 + * + * @param bo 人员组管理 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TbUserGroupBo bo) { + TbUserGroup add = MapstructUtils.convert(bo, TbUserGroup.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改人员组管理 + * + * @param bo 人员组管理 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TbUserGroupBo bo) { + TbUserGroup update = MapstructUtils.convert(bo, TbUserGroup.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TbUserGroup 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/Property/src/main/resources/mapper/Property/TbUserGroupMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbUserGroupMapper.xml new file mode 100644 index 0000000..4f7f985 --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbUserGroupMapper.xml @@ -0,0 +1,7 @@ + + + + +