From 7cef8f500873390adccea53a65988492c50f4058 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Mon, 14 Jul 2025 09:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/org/OrgController.java | 104 ++++++++++++++++++ .../controller/admin/org/vo/OrgPageReqVO.java | 44 ++++++++ .../controller/admin/org/vo/OrgRespVO.java | 55 +++++++++ .../controller/admin/org/vo/OrgSaveReqVO.java | 41 +++++++ .../system/dal/dataobject/org/OrgDO.java | 64 +++++++++++ .../system/dal/mysql/org/OrgMapper.java | 34 ++++++ .../module/system/service/org/OrgService.java | 62 +++++++++++ .../system/service/org/OrgServiceImpl.java | 92 ++++++++++++++++ .../main/resources/mapper/org/OrgMapper.xml | 12 ++ 9 files changed, 508 insertions(+) create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgPageReqVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgRespVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgSaveReqVO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgDO.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java create mode 100644 yudao-module-system/src/main/resources/mapper/org/OrgMapper.xml diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java new file mode 100644 index 0000000..0f72857 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java @@ -0,0 +1,104 @@ +package cn.iocoder.yudao.module.system.controller.admin.org; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.system.controller.admin.org.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgDO; +import cn.iocoder.yudao.module.system.service.org.OrgService; + +@Tag(name = "管理后台 - 机构") +@RestController +@RequestMapping("/system/org") +@Validated +public class OrgController { + + @Resource + private OrgService orgService; + + @PostMapping("/create") + @Operation(summary = "创建机构") + @PreAuthorize("@ss.hasPermission('system:org:create')") + public CommonResult createOrg(@Valid @RequestBody OrgSaveReqVO createReqVO) { + return success(orgService.createOrg(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新机构") + @PreAuthorize("@ss.hasPermission('system:org:update')") + public CommonResult updateOrg(@Valid @RequestBody OrgSaveReqVO updateReqVO) { + orgService.updateOrg(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除机构") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('system:org:delete')") + public CommonResult deleteOrg(@RequestParam("id") Integer id) { + orgService.deleteOrg(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除机构") + @PreAuthorize("@ss.hasPermission('system:org:delete')") + public CommonResult deleteOrgList(@RequestParam("ids") List ids) { + orgService.deleteOrgListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得机构") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:org:query')") + public CommonResult getOrg(@RequestParam("id") Integer id) { + OrgDO org = orgService.getOrg(id); + return success(BeanUtils.toBean(org, OrgRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得机构分页") + @PreAuthorize("@ss.hasPermission('system:org:query')") + public CommonResult> getOrgPage(@Valid OrgPageReqVO pageReqVO) { + PageResult pageResult = orgService.getOrgPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, OrgRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出机构 Excel") + @PreAuthorize("@ss.hasPermission('system:org:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportOrgExcel(@Valid OrgPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = orgService.getOrgPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "机构.xls", "数据", OrgRespVO.class, + BeanUtils.toBean(list, OrgRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgPageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgPageReqVO.java new file mode 100644 index 0000000..88ff360 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgPageReqVO.java @@ -0,0 +1,44 @@ +package cn.iocoder.yudao.module.system.controller.admin.org.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 机构分页 Request VO") +@Data +public class OrgPageReqVO extends PageParam { + + @Schema(description = "机构ID", example = "31188") + private Integer orgId; + + @Schema(description = "机构名称", example = "赵六") + private String orgName; + + @Schema(description = "机构地址") + private String orgAddress; + + @Schema(description = "负责人") + private String manager; + + @Schema(description = "电话") + private String phone; + + @Schema(description = "上级机构ID", example = "12053") + private Integer parentOrgId; + + @Schema(description = "上级机构名称", example = "芋艿") + private String parentOrgName; + + @Schema(description = "是否为上级机构（0否1是）") + private Integer isParent; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgRespVO.java new file mode 100644 index 0000000..bb1c34b --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgRespVO.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.system.controller.admin.org.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 机构 Response VO") +@Data +@ExcelIgnoreUnannotated +public class OrgRespVO { + + @Schema(description = "主键ID，自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "27344") + @ExcelProperty("主键ID，自增") + private Integer id; + + @Schema(description = "机构ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31188") + @ExcelProperty("机构ID") + private Integer orgId; + + @Schema(description = "机构名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("机构名称") + private String orgName; + + @Schema(description = "机构地址") + @ExcelProperty("机构地址") + private String orgAddress; + + @Schema(description = "负责人") + @ExcelProperty("负责人") + private String manager; + + @Schema(description = "电话") + @ExcelProperty("电话") + private String phone; + + @Schema(description = "上级机构ID", example = "12053") + @ExcelProperty("上级机构ID") + private Integer parentOrgId; + + @Schema(description = "上级机构名称", example = "芋艿") + @ExcelProperty("上级机构名称") + private String parentOrgName; + + @Schema(description = "是否为上级机构（0否1是）") + @ExcelProperty("是否为上级机构（0否1是）") + private Integer isParent; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgSaveReqVO.java new file mode 100644 index 0000000..146e8c3 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgSaveReqVO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.system.controller.admin.org.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 机构新增/修改 Request VO") +@Data +public class OrgSaveReqVO { + + @Schema(description = "主键ID，自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "27344") + private Integer id; + + @Schema(description = "机构ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31188") + @NotNull(message = "机构ID不能为空") + private Integer orgId; + + @Schema(description = "机构名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "机构名称不能为空") + private String orgName; + + @Schema(description = "机构地址") + private String orgAddress; + + @Schema(description = "负责人") + private String manager; + + @Schema(description = "电话") + private String phone; + + @Schema(description = "上级机构ID", example = "12053") + private Integer parentOrgId; + + @Schema(description = "上级机构名称", example = "芋艿") + private String parentOrgName; + + @Schema(description = "是否为上级机构（0否1是）") + private Integer isParent; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgDO.java new file mode 100644 index 0000000..d72b6ca --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgDO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.system.dal.dataobject.org; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 机构 DO + * + * @author 艾康菲 + */ +@TableName("tb_org") +@KeySequence("tb_org_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OrgDO extends BaseDO { + + /** + * 主键ID，自增 + */ + @TableId + private Integer id; + /** + * 机构ID + */ + private Integer orgId; + /** + * 机构名称 + */ + private String orgName; + /** + * 机构地址 + */ + private String orgAddress; + /** + * 负责人 + */ + private String manager; + /** + * 电话 + */ + private String phone; + /** + * 上级机构ID + */ + private Integer parentOrgId; + /** + * 上级机构名称 + */ + private String parentOrgName; + /** + * 是否为上级机构（0否1是） + */ + private Integer isParent; + + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java new file mode 100644 index 0000000..b6f719f --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.system.dal.mysql.org; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.system.controller.admin.org.vo.*; + +/** + * 机构 Mapper + * + * @author 艾康菲 + */ +@Mapper +public interface OrgMapper extends BaseMapperX { + + default PageResult selectPage(OrgPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(OrgDO::getOrgId, reqVO.getOrgId()) + .likeIfPresent(OrgDO::getOrgName, reqVO.getOrgName()) + .eqIfPresent(OrgDO::getOrgAddress, reqVO.getOrgAddress()) + .eqIfPresent(OrgDO::getManager, reqVO.getManager()) + .eqIfPresent(OrgDO::getPhone, reqVO.getPhone()) + .eqIfPresent(OrgDO::getParentOrgId, reqVO.getParentOrgId()) + .likeIfPresent(OrgDO::getParentOrgName, reqVO.getParentOrgName()) + .eqIfPresent(OrgDO::getIsParent, reqVO.getIsParent()) + .betweenIfPresent(OrgDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(OrgDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java new file mode 100644 index 0000000..f0419e3 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.system.service.org; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.system.controller.admin.org.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 机构 Service 接口 + * + * @author 艾康菲 + */ +public interface OrgService { + + /** + * 创建机构 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createOrg(@Valid OrgSaveReqVO createReqVO); + + /** + * 更新机构 + * + * @param updateReqVO 更新信息 + */ + void updateOrg(@Valid OrgSaveReqVO updateReqVO); + + /** + * 删除机构 + * + * @param id 编号 + */ + void deleteOrg(Integer id); + + /** + * 批量删除机构 + * + * @param ids 编号 + */ + void deleteOrgListByIds(List ids); + + /** + * 获得机构 + * + * @param id 编号 + * @return 机构 + */ + OrgDO getOrg(Integer id); + + /** + * 获得机构分页 + * + * @param pageReqVO 分页查询 + * @return 机构分页 + */ + PageResult getOrgPage(OrgPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java new file mode 100644 index 0000000..2064676 --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java @@ -0,0 +1,92 @@ +package cn.iocoder.yudao.module.system.service.org; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.system.controller.admin.org.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.system.dal.mysql.org.OrgMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; + +/** + * 机构 Service 实现类 + * + * @author 艾康菲 + */ +@Service +@Validated +public class OrgServiceImpl implements OrgService { + + @Resource + private OrgMapper orgMapper; + + @Override + public Integer createOrg(OrgSaveReqVO createReqVO) { + // 插入 + OrgDO org = BeanUtils.toBean(createReqVO, OrgDO.class); + orgMapper.insert(org); + // 返回 + return org.getId(); + } + + @Override + public void updateOrg(OrgSaveReqVO updateReqVO) { + // 校验存在 + validateOrgExists(updateReqVO.getId()); + // 更新 + OrgDO updateObj = BeanUtils.toBean(updateReqVO, OrgDO.class); + orgMapper.updateById(updateObj); + } + + @Override + public void deleteOrg(Integer id) { + // 校验存在 + validateOrgExists(id); + // 删除 + orgMapper.deleteById(id); + } + + @Override + public void deleteOrgListByIds(List ids) { + // 校验存在 + validateOrgExists(ids); + // 删除 + orgMapper.deleteByIds(ids); + } + + private void validateOrgExists(List ids) { + List list = orgMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(ORG_NOT_EXISTS); + } + } + + private void validateOrgExists(Integer id) { + if (orgMapper.selectById(id) == null) { + throw exception(ORG_NOT_EXISTS); + } + } + + @Override + public OrgDO getOrg(Integer id) { + return orgMapper.selectById(id); + } + + @Override + public PageResult getOrgPage(OrgPageReqVO pageReqVO) { + return orgMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/resources/mapper/org/OrgMapper.xml b/yudao-module-system/src/main/resources/mapper/org/OrgMapper.xml new file mode 100644 index 0000000..72ff87c --- /dev/null +++ b/yudao-module-system/src/main/resources/mapper/org/OrgMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file