From ce393c8817e50ff5dc4895ac05d1c4733bab59ba Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 23 Nov 2025 22:48:55 +0800 Subject: [PATCH] 养护频次提交+增加获取二级部门接口 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java | 38 ++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java | 38 ++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.java | 32 ++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java | 8 ++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java | 6 ++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java | 5 +++++ 11 files changed, 481 insertions(+), 0 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java new file mode 100644 index 0000000..1e2fffb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java @@ -0,0 +1,104 @@ +package com.zteits.urbanops.module.garden.controller.admin.planrate; + +import org.springframework.web.bind.annotation.*; +import jakarta.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 jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO; +import com.zteits.urbanops.module.garden.service.planrate.PlanRateService; + +@Tag(name = "管理后台 - 计划频次") +@RestController +@RequestMapping("/garden/plan-rate") +@Validated +public class PlanRateController { + + @Resource + private PlanRateService planRateService; + + @PostMapping("/create") + @Operation(summary = "创建计划频次") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:create')") + public CommonResult createPlanRate(@Valid @RequestBody PlanRateSaveReqVO createReqVO) { + return success(planRateService.createPlanRate(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新计划频次") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:update')") + public CommonResult updatePlanRate(@Valid @RequestBody PlanRateSaveReqVO updateReqVO) { + planRateService.updatePlanRate(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除计划频次") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:plan-rate:delete')") + public CommonResult deletePlanRate(@RequestParam("id") Long id) { + planRateService.deletePlanRate(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除计划频次") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:delete')") + public CommonResult deletePlanRateList(@RequestParam("ids") List ids) { + planRateService.deletePlanRateListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得计划频次") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')") + public CommonResult getPlanRate(@RequestParam("id") Long id) { + PlanRateDO planRate = planRateService.getPlanRate(id); + return success(BeanUtils.toBean(planRate, PlanRateRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得计划频次分页") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')") + public CommonResult> getPlanRatePage(@Valid PlanRatePageReqVO pageReqVO) { + PageResult pageResult = planRateService.getPlanRatePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PlanRateRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出计划频次 Excel") + @PreAuthorize("@ss.hasPermission('garden:plan-rate:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportPlanRateExcel(@Valid PlanRatePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = planRateService.getPlanRatePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "计划频次.xls", "数据", PlanRateRespVO.class, + BeanUtils.toBean(list, PlanRateRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java new file mode 100644 index 0000000..12a8b5a --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java @@ -0,0 +1,38 @@ +package com.zteits.urbanops.module.garden.controller.admin.planrate.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 计划频次分页 Request VO") +@Data +public class PlanRatePageReqVO extends PageParam { + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", example = "13649") + private Integer planTypeId; + + @Schema(description = "级别: 10:特级；11:一级：12:二级;13:三级", example = "14661") + private Integer levelId; + + @Schema(description = "次数 如：1/3等") + private String rate; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", example = "17826") + private Integer cycleId; + + @Schema(description = "是否为标准计划: 1:是；2:否") + private Integer stdPlan; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java new file mode 100644 index 0000000..7106763 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java @@ -0,0 +1,47 @@ +package com.zteits.urbanops.module.garden.controller.admin.planrate.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 cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 计划频次 Response VO") +@Data +@ExcelIgnoreUnannotated +public class PlanRateRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "13649") + @ExcelProperty("养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;") + private Integer planTypeId; + + @Schema(description = "级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "14661") + @ExcelProperty("级别: 10:特级；11:一级：12:二级;13:三级") + private Integer levelId; + + @Schema(description = "次数 如：1/3等") + @ExcelProperty("次数 如：1/3等") + private String rate; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "17826") + @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次") + private Integer cycleId; + + @Schema(description = "是否为标准计划: 1:是；2:否", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否为标准计划: 1:是；2:否") + private Integer stdPlan; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java new file mode 100644 index 0000000..8024f9f --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java @@ -0,0 +1,38 @@ +package com.zteits.urbanops.module.garden.controller.admin.planrate.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 计划频次新增/修改 Request VO") +@Data +public class PlanRateSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435") + private Long id; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空") + private String busiLine; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "13649") + @NotNull(message = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;不能为空") + private Integer planTypeId; + + @Schema(description = "级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "14661") + @NotNull(message = "级别: 10:特级；11:一级：12:二级;13:三级不能为空") + private Integer levelId; + + @Schema(description = "次数 如：1/3等") + private String rate; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "17826") + @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空") + private Integer cycleId; + + @Schema(description = "是否为标准计划: 1:是；2:否", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否为标准计划: 1:是；2:否不能为空") + private Integer stdPlan; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java new file mode 100644 index 0000000..9779d64 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java @@ -0,0 +1,56 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.planrate; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 计划频次 DO + * + * @author 超级管理员 + */ +@TableName("garden_plan_rate") +@KeySequence("garden_plan_rate_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PlanRateDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 业务线: yl-园林；wy-物业：sz-市政 + */ + private String busiLine; + /** + * 养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视; + */ + private Integer planTypeId; + /** + * 级别: 10:特级；11:一级：12:二级;13:三级 + */ + private Integer levelId; + /** + * 次数 如：1/3等 + */ + private String rate; + /** + * 周期ID: 1:日/次；2:周/次；3:月/次；4:年/次 + */ + private Integer cycleId; + /** + * 是否为标准计划: 1:是；2:否 + */ + private Integer stdPlan; + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.java new file mode 100644 index 0000000..7284c9e --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateMapper.java @@ -0,0 +1,32 @@ +package com.zteits.urbanops.module.garden.dal.mysql.planrate; + +import java.util.*; + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*; + +/** + * 计划频次 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PlanRateMapper extends BaseMapperX { + + default PageResult selectPage(PlanRatePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PlanRateDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(PlanRateDO::getPlanTypeId, reqVO.getPlanTypeId()) + .eqIfPresent(PlanRateDO::getLevelId, reqVO.getLevelId()) + .eqIfPresent(PlanRateDO::getRate, reqVO.getRate()) + .eqIfPresent(PlanRateDO::getCycleId, reqVO.getCycleId()) + .eqIfPresent(PlanRateDO::getStdPlan, reqVO.getStdPlan()) + .betweenIfPresent(PlanRateDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(PlanRateDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java new file mode 100644 index 0000000..1634b80 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java @@ -0,0 +1,62 @@ +package com.zteits.urbanops.module.garden.service.planrate; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; + +/** + * 计划频次 Service 接口 + * + * @author 超级管理员 + */ +public interface PlanRateService { + + /** + * 创建计划频次 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPlanRate(@Valid PlanRateSaveReqVO createReqVO); + + /** + * 更新计划频次 + * + * @param updateReqVO 更新信息 + */ + void updatePlanRate(@Valid PlanRateSaveReqVO updateReqVO); + + /** + * 删除计划频次 + * + * @param id 编号 + */ + void deletePlanRate(Long id); + + /** + * 批量删除计划频次 + * + * @param ids 编号 + */ + void deletePlanRateListByIds(List ids); + + /** + * 获得计划频次 + * + * @param id 编号 + * @return 计划频次 + */ + PlanRateDO getPlanRate(Long id); + + /** + * 获得计划频次分页 + * + * @param pageReqVO 分页查询 + * @return 计划频次分页 + */ + PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java new file mode 100644 index 0000000..ba74807 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java @@ -0,0 +1,85 @@ +package com.zteits.urbanops.module.garden.service.planrate; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateMapper; + +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; + +/** + * 计划频次 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PlanRateServiceImpl implements PlanRateService { + + @Resource + private PlanRateMapper planRateMapper; + + @Override + public Long createPlanRate(PlanRateSaveReqVO createReqVO) { + // 插入 + PlanRateDO planRate = BeanUtils.toBean(createReqVO, PlanRateDO.class); + planRateMapper.insert(planRate); + + // 返回 + return planRate.getId(); + } + + @Override + public void updatePlanRate(PlanRateSaveReqVO updateReqVO) { + // 校验存在 + validatePlanRateExists(updateReqVO.getId()); + // 更新 + PlanRateDO updateObj = BeanUtils.toBean(updateReqVO, PlanRateDO.class); + planRateMapper.updateById(updateObj); + } + + @Override + public void deletePlanRate(Long id) { + // 校验存在 + validatePlanRateExists(id); + // 删除 + planRateMapper.deleteById(id); + } + + @Override + public void deletePlanRateListByIds(List ids) { + // 删除 + planRateMapper.deleteByIds(ids); + } + + + private void validatePlanRateExists(Long id) { + if (planRateMapper.selectById(id) == null) { + //throw exception(PLAN_RATE_NOT_EXISTS); + } + } + + @Override + public PlanRateDO getPlanRate(Long id) { + return planRateMapper.selectById(id); + } + + @Override + public PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO) { + return planRateMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java index e8340b1..784ebdc 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java @@ -90,4 +90,12 @@ public class DeptController { return success(BeanUtils.toBean(dept, DeptRespVO.class)); } + @GetMapping("/sub-list") + @Operation(summary = "获取二级部门列表") + @PreAuthorize("@ss.hasPermission('system:dept:query')") + public CommonResult> getSubDeptList() { + List list = deptService.getSubDeptList(); + return success(BeanUtils.toBean(list, DeptRespVO.class)); + } + } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java index e6ad4cf..6c8e72e 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java @@ -60,6 +60,12 @@ public interface DeptService { List getDeptList(Collection ids); /** + * 获取二级部门 + * @return 部门信息数组 + */ + List getSubDeptList(); + + /** * 筛选部门列表 * * @param reqVO 筛选条件请求 VO diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java index 9e83704..75b00cc 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java @@ -178,6 +178,11 @@ public class DeptServiceImpl implements DeptService { } @Override + public List getSubDeptList() { + return deptMapper.selectList(DeptDO::getParentId,100); + } + + @Override public List getDeptList(DeptListReqVO reqVO) { List list = deptMapper.selectList(reqVO); list.sort(Comparator.comparing(DeptDO::getSort)); -- libgit2 0.21.4