api提供

王富生
1 parent 15545517
Showing 5 changed files with 49 additions and 18 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApiImpl.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.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<MaintainPlanRoadReqVO> 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<MaintainPlanRoadReqVO> 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不能为空")
@@ -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<DeptRespDTO> getSubDeptList();
+    /**
+     * 获取公司列表
+     * @return 公司
+     */
+    List<DeptRespVO> getCompanyList();
+
+    /**
+     * 获取班组列表
+     * @param id 公司ID
+     * @return 班组列表
+     */
+    List<DeptRespVO> getLastDeptList(Long id);
+
 }
 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<DeptRespVO> getCompanyList() {
+        List<DeptDO> list = deptService.getSubDeptList();
+        return BeanUtils.toBean(list, DeptRespVO.class);
+    }
+
+    @Override
+    public List<DeptRespVO> getLastDeptList(Long id) {
+        List<DeptDO> list = deptService.getLastDeptList(id);
+        return BeanUtils.toBean(list, DeptRespVO.class);
+    }
+
 }
 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<RoleDO> getRoleList(Collection<Long> ids);
+
+    /**
+     * 通过业务线查询角色列表
+     * @param busiLine 业务线
+     * @return
+     */
+    List<RoleRespVO> getRoleListByBusiLine(String busiLine);
 }
 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<RoleDO> getRoleList(Collection<Long> ids) {
         return roleService.getRoleList(ids);
     }
+
+    @Override
+    public List<RoleRespVO> getRoleListByBusiLine(String busiLine) {
+       return roleService.getRoleListByBusiLine(busiLine);
+    }
 }