From 478d294012490a411abf0aa81b78a4d498cc0e1e Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 6 Dec 2025 10:43:48 +0800 Subject: [PATCH] api提供 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java | 22 +++++----------------- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java | 17 ++++++++++++++++- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java | 14 ++++++++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java | 8 ++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java | 6 ++++++ 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java index 947a443..fb92fd1 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java @@ -14,7 +14,6 @@ import jakarta.validation.constraints.*; public class MaintainPlanSaveReqVO { @Schema(description = "计划名称后缀", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "张三") - @Max(value = 15) private String planNameSuffix; @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) @@ -33,16 +32,12 @@ public class MaintainPlanSaveReqVO { @NotNull(message = "归属(一级部门id)不能为空") private Long companyId; - @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") - @NotNull(message = "部门ID(道路负责部门id)不能为空") - private Long deptId; - - @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19114") - @NotNull(message = "道路ID不能为空") - private Long roadId; + @Schema(description = "道路信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "[{\"deptId\":11,\"roadId\":1,\"roadName\":\"测试\"}]") + @NotNull + @Size(min = 1) + @Valid + private List roadListReqVO; - @Schema(description = "道路名称", example = "王五") - private String roadName; @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "16420") @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级不能为空") @@ -56,12 +51,6 @@ public class MaintainPlanSaveReqVO { @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空") private Integer cycleId; - @Schema(description = "道路信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "[{\"deptId\":11,\"roadId\":1,\"roadName\":\"测试\"}]") - @NotNull - @Size(min = 1) - @Valid - private List roadListReqVO; - @Schema(description = "开始时间") private LocalDate beginTime; @@ -69,7 +58,6 @@ public class MaintainPlanSaveReqVO { private LocalDate endTime; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") - @NotEmpty(message = "备注不能为空") private String remark; @NotNull(message = "角色Ids不能为空") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java index f6265eb..a8f364e 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java @@ -2,6 +2,8 @@ package com.zteits.urbanops.module.system.api.dept; import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; +import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO; +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO; import java.util.Collection; import java.util.List; @@ -51,7 +53,7 @@ public interface DeptApi { } /** - * 获得指定部门的所有子部门 + * 获得指定部门的所有子部门() * * @param id 部门编号 * @return 子部门列表 @@ -65,4 +67,17 @@ public interface DeptApi { */ List getSubDeptList(); + /** + * 获取公司列表 + * @return 公司 + */ + List getCompanyList(); + + /** + * 获取班组列表 + * @param id 公司ID + * @return 班组列表 + */ + List getLastDeptList(Long id); + } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java index a784566..505e03b 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java @@ -1,10 +1,12 @@ package com.zteits.urbanops.module.system.api.dept; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO; import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO; import com.zteits.urbanops.module.system.service.dept.DeptService; +import com.zteits.urbanops.module.system.util.DeptTreeUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -53,4 +55,16 @@ public class DeptApiImpl implements DeptApi { return BeanUtils.toBean(list, DeptRespDTO.class); } + @Override + public List getCompanyList() { + List list = deptService.getSubDeptList(); + return BeanUtils.toBean(list, DeptRespVO.class); + } + + @Override + public List getLastDeptList(Long id) { + List list = deptService.getLastDeptList(id); + return BeanUtils.toBean(list, DeptRespVO.class); + } + } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java index 3dbdfcb..4793a3d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.system.api.permission; +import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO; import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; import java.util.Collection; @@ -28,4 +29,11 @@ public interface RoleApi { * @return 角色列表 */ List getRoleList(Collection ids); + + /** + * 通过业务线查询角色列表 + * @param busiLine 业务线 + * @return + */ + List getRoleListByBusiLine(String busiLine); } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java index 1ef76e8..726402b 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.system.api.permission; +import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO; import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; import com.zteits.urbanops.module.system.service.permission.RoleService; import org.springframework.stereotype.Service; @@ -28,4 +29,9 @@ public class RoleApiImpl implements RoleApi { public List getRoleList(Collection ids) { return roleService.getRoleList(ids); } + + @Override + public List getRoleListByBusiLine(String busiLine) { + return roleService.getRoleListByBusiLine(busiLine); + } } -- libgit2 0.21.4