From 8f469e6fca2e6dcbfb433f9f403c9dfe3c3bd66a Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Wed, 3 Dec 2025 22:33:57 +0800 Subject: [PATCH] 测试bug优化 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java | 6 ++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java | 23 ++++++++++++++++++++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java | 5 ++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java | 18 ++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java | 3 ++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java | 5 +++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDO.java | 5 +++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java | 7 ++++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanMapper.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java | 37 +++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleService.java | 7 +++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleServiceImpl.java | 7 +++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java | 7 ------- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java | 10 ++++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java | 7 +++++++ 28 files changed, 284 insertions(+), 48 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java index 9cedc07..55df46e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java @@ -113,8 +113,8 @@ public class InspectionPlanController { @Operation(summary = "获得巡检计划汇总分页") @PreAuthorize("@ss.hasPermission('garden:inspection-plan:query')") public CommonResult> getInspectionPlanPage(@Valid InspectionPlanPageReqVO pageReqVO) { - PageResult pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, InspectionPlanRespVO.class)); + PageResult pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -124,10 +124,10 @@ public class InspectionPlanController { public void exportInspectionPlanExcel(@Valid InspectionPlanPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = inspectionPlanService.getInspectionPlanPage(pageReqVO).getList(); + List list = inspectionPlanService.getInspectionPlanPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "巡检计划汇总.xls", "数据", InspectionPlanRespVO.class, - BeanUtils.toBean(list, InspectionPlanRespVO.class)); + list); } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java index cd63a37..acda41f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java @@ -3,8 +3,6 @@ package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.time.LocalDate; -import java.util.*; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -48,11 +46,11 @@ public class InspectionPlanDetailRespVO { @Schema(description = "执行开始时间") @ExcelProperty("执行开始时间") - private LocalDate beginTime; + private LocalDateTime beginTime; @Schema(description = "执行时间") @ExcelProperty("执行时间") - private LocalDate endTime; + private LocalDateTime endTime; @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成状态 1:未完成;2:进行中;3:已完成") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java index 6d4dc00..c0e4275 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java @@ -43,4 +43,7 @@ public class InspectionPlanPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] endTime; + @Schema(description = "完成状态 : 1:未完成；2:已完成") + private Integer finishState; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java index d894669..c2009a2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java @@ -4,6 +4,8 @@ import com.fhs.core.trans.vo.VO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; +import java.util.List; + import cn.idev.excel.annotation.*; @Schema(description = "管理后台 - 巡检计划汇总 Response VO") @@ -39,10 +41,17 @@ public class InspectionPlanRespVO implements VO { @ExcelProperty("归属(一级部门id)") private Long companyId; + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800") + @ExcelProperty("归属(一级部门id)") + private String companyName; + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16445") @ExcelProperty("部门ID(道路负责部门id)") private Long deptId; + @ExcelProperty("部门(道路负责部门)") + private String deptName; + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15557") @ExcelProperty("道路ID") private Long roadId; @@ -55,6 +64,10 @@ public class InspectionPlanRespVO implements VO { @ExcelProperty("养护级别: 10:特级；11:一级：12:二级;13:三级") private Integer levelId; + @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3") + @ExcelProperty("次数 如：1/3等") + private String rate; + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415") @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次") private Integer cycleId; @@ -93,9 +106,17 @@ public class InspectionPlanRespVO implements VO { /** * 创建者 */ - @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") + @Schema(description = "创建人名字", example = "ZIEITS") @ExcelProperty("创建人") private String creatorName; + /** + * 角色 + */ + @Schema(description = "角色列表", example = "ZIEITS") + @ExcelProperty("角色列表") + private List roleNameList; + + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java index 41357bf..33704e7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java @@ -111,8 +111,8 @@ public class MaintainPlanController { @Operation(summary = "获得养护计划汇总分页") @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") public CommonResult> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) { - PageResult pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaintainPlanRespVO.class)); + PageResult pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -122,10 +122,10 @@ public class MaintainPlanController { public void exportMaintainPlanExcel(@Valid MaintainPlanPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = maintainPlanService.getMaintainPlanPage(pageReqVO).getList(); + List list = maintainPlanService.getMaintainPlanPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "养护计划汇总.xls", "数据", MaintainPlanRespVO.class, - BeanUtils.toBean(list, MaintainPlanRespVO.class)); + list); } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java index d5684fc..3a8054a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java @@ -3,7 +3,6 @@ package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.time.LocalDate; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -46,11 +45,11 @@ public class MaintainPlanDetailRespVO { @Schema(description = "执行开始时间") @ExcelProperty("执行开始时间") - private LocalDate beginTime; + private LocalDateTime beginTime; @Schema(description = "执行时间") @ExcelProperty("执行时间") - private LocalDate endTime; + private LocalDateTime endTime; @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成百分比") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java index 242eeb6..501b878 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java @@ -44,4 +44,7 @@ public class MaintainPlanPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDate[] endTime; + @Schema(description = "完成状态 : 1:未完成；2:已完成") + private Integer finishState; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java index de813b6..fc58213 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java @@ -42,10 +42,18 @@ public class MaintainPlanRespVO { @ExcelProperty("归属(一级部门id)") private Long companyId; + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800") + @ExcelProperty("归属(一级部门id)") + private String companyName; + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") @ExcelProperty("部门ID(道路负责部门id)") private Long deptId; + @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") + @ExcelProperty("部门") + private String deptName; + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19114") @ExcelProperty("道路ID") private Long roadId; @@ -58,6 +66,10 @@ public class MaintainPlanRespVO { @ExcelProperty("养护级别: 10:特级；11:一级：12:二级;13:三级") private Integer levelId; + @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3") + @ExcelProperty("次数 如：1/3等") + private String rate; + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "28220") @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次") private Integer cycleId; @@ -98,5 +110,11 @@ public class MaintainPlanRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + /** + * 角色 + */ + @Schema(description = "角色列表", example = "ZIEITS") + @ExcelProperty("角色列表") + private List roleNameList; } \ No newline at end of file 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 a2e3ff0..947a443 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,6 +14,7 @@ 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) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java index 79d858d..8018a60 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java @@ -2,8 +2,8 @@ package com.zteits.urbanops.module.garden.controller.admin.road.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; import jakarta.validation.constraints.*; +import org.hibernate.validator.constraints.Length; @Schema(description = "管理后台 - 道路管理新增/修改 Request VO") @Data @@ -11,6 +11,7 @@ public class RoadSaveReqVO { @Schema(description = "道路名称", example = "赵六") + @Length(max = 128) private String roadName; @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11139") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java index 11a7941..68f0ddb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java @@ -66,6 +66,11 @@ public class InspectionPlanDO extends BaseDO { */ private Integer levelId; /** + * 次数 如：1/3等 + */ + private String rate; + + /** * 周期ID: 1:日/次；2:周/次；3:月/次；4:年/次 */ private Integer cycleId; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java index 5cb3e25..b3abc98 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java @@ -60,11 +60,11 @@ public class InspectionPlanDetailDO extends BaseDO { /** * 执行开始时间 */ - private LocalDate beginTime; + private LocalDateTime beginTime; /** * 执行时间 */ - private LocalDate endTime; + private LocalDateTime endTime; /** * 完成状态 1:未完成;2:进行中;3:已完成 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDO.java index d31b82b..32f7a6d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDO.java @@ -66,6 +66,11 @@ public class MaintainPlanDO extends BaseDO { * 养护级别: 10:特级；11:一级：12:二级;13:三级 */ private Integer levelId; + + /** + * 次数 如：1/3等 + */ + private String rate; /** * 周期ID: 1:日/次；2:周/次；3:月/次；4:年/次 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java index 5928564..0961d27 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java @@ -2,7 +2,8 @@ package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; import lombok.*; -import java.time.LocalDate; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.*; import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; @@ -57,11 +58,11 @@ public class MaintainPlanDetailDO extends BaseDO { /** * 执行开始时间 */ - private LocalDate beginTime; + private LocalDateTime beginTime; /** * 执行时间 */ - private LocalDate endTime; + private LocalDateTime endTime; /** * 完成百分比 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java index e077e78..fe6fc8f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java @@ -31,6 +31,7 @@ public interface InspectionPlanDetailMapper extends BaseMapperX { .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId()) .betweenIfPresent(InspectionPlanDO::getBeginTime, reqVO.getBeginTime()) .betweenIfPresent(InspectionPlanDO::getEndTime, reqVO.getEndTime()) + .eq(InspectionPlanDO::getDeleted,0) .orderByDesc(InspectionPlanDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java new file mode 100644 index 0000000..0f5b146 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java @@ -0,0 +1,37 @@ +package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + + +import com.zteits.urbanops.framework.annotation.ProcessBusinessLine; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 养护计划汇总 Mapper + * + * @author 超级管理员 + */ +@ProcessBusinessLine +@Mapper +public interface MaintainPlanInterceptMapper extends BaseMapperX { + + default PageResult selectPage(MaintainPlanPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo()) + .likeIfPresent(MaintainPlanDO::getPlanName, reqVO.getPlanName()) + .eqIfPresent(MaintainPlanDO::getPlanAttr, reqVO.getPlanAttr()) + .eqIfPresent(MaintainPlanDO::getPlanTypeId, reqVO.getPlanTypeId()) + .eqIfPresent(MaintainPlanDO::getCompanyId, reqVO.getCompanyId()) + .likeIfPresent(MaintainPlanDO::getRoadName, reqVO.getRoadName()) + .eqIfPresent(MaintainPlanDO::getFinishState, reqVO.getFinishState()) + .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId()) + .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime()) + .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime()) + .eq(MaintainPlanDO::getDeleted,0) + .orderByDesc(MaintainPlanDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java index e2a5674..9416734 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java @@ -28,6 +28,7 @@ public interface MaintainPlanMapper extends BaseMapperX { .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId()) .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime()) .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime()) + .eq(MaintainPlanDO::getDeleted,0) .orderByDesc(MaintainPlanDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleService.java index ee16b6e..4a3cda2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleService.java @@ -60,4 +60,11 @@ public interface InspectionPlanRoleService { */ PageResult getInspectionPlanRolePage(InspectionPlanRolePageReqVO pageReqVO); + /** + * 通过批次号查询 + * @param batchNo 批次号 + * @return 巡检计划 + */ + List getInspectionPlanRoleList(String batchNo); + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleServiceImpl.java index 136b539..1635246 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.garden.service.inspectionplan; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRolePageReqVO; import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRoleSaveReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanRoleDO; @@ -74,4 +75,10 @@ public class InspectionPlanRoleServiceImpl implements InspectionPlanRoleService return inspectionPlanRoleMapper.selectPage(pageReqVO); } + @Override + public List getInspectionPlanRoleList(String batchNo) { + return inspectionPlanRoleMapper.selectList(new QueryWrapper().lambda() + .eq(InspectionPlanRoleDO::getBatchNo, batchNo)); + } + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java index ce41c98..91c584a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java @@ -58,7 +58,7 @@ public interface InspectionPlanService { * @param pageReqVO 分页查询 * @return 巡检计划汇总分页 */ - PageResult getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO); + PageResult getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO); /** * 根据批次号删除 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index 174ab00..e9fb9e0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; @@ -15,10 +14,16 @@ import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlan import com.zteits.urbanops.module.garden.enums.FinishStateEnum; import com.zteits.urbanops.module.garden.enums.PlanConstants; import com.zteits.urbanops.module.garden.util.TimeIntervalCalculatorUtil; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; +import com.zteits.urbanops.module.system.api.permission.RoleApi; +import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import java.time.LocalDate; @@ -59,6 +64,12 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @Resource private InspectionPlanRoleMapper inspectionPlanRoleMapper; + @Resource + private DeptApi deptApi; + + @Resource + private RoleApi roleApi; + @Transactional(rollbackFor = Exception.class) @Override public CommonResult createInspectionPlan(InspectionPlanSaveReqVO createReqVO) { @@ -75,7 +86,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { } //计算开始和计算时间 在间隔周期下每天的次数 List betweenDayList = TimeIntervalCalculatorUtil.calculateIntervals(createReqVO.getBeginTime(), createReqVO.getEndTime(), createReqVO.getCycleId(), rateValue); - if (CollectionUtils.isAnyEmpty(betweenDayList)) { + if (CollectionUtils.isEmpty(betweenDayList)) { log.warn("获取两个时间之间间隔天数错误"); return CommonResult.error(INSPECTION_CYCLE_ERROR); } @@ -103,13 +114,15 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { inspectionPlan.setCreatorName(userName); inspectionPlan.setUpdater(userId); inspectionPlan.setUpdaterName(userName); + inspectionPlan.setRate(createReqVO.getRateValue()); inspectionPlan.setDeptId(roadReqVO.getDeptId()); inspectionPlan.setRoadId(roadReqVO.getRoadId()); inspectionPlan.setRoadName(roadReqVO.getRoadName()); //计划属性label String planAttrLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr()); String planTypeIdLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.INSPECTION_MAINTAIN_TYPE, createReqVO.getPlanTypeId()); - inspectionPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + createReqVO.getPlanNameSuffix()); + String planNameSuffix = StringUtil.isNotEmpty(createReqVO.getPlanNameSuffix()) ? createReqVO.getPlanNameSuffix() :""; + inspectionPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + planNameSuffix); inspectionPlanList.add(inspectionPlan); /*2.插入角色*/ createReqVO.getRoleIds().forEach(roleId -> { @@ -131,8 +144,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now); ThreadUtil.sleep(2); entity.setSortNum(i + 1); - entity.setBeginTime(LocalDate.parse(dateStr[0], DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - entity.setEndTime(LocalDate.parse(dateStr[1], DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + entity.setBeginTime(LocalDateTime.parse(dateStr[0], DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00"))); + entity.setEndTime(LocalDateTime.parse(dateStr[1], DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59"))); detailDOList.add(entity); } }); @@ -231,8 +244,51 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { } @Override - public PageResult getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) { - return inspectionPlanInterceptMapper.selectPage(pageReqVO); + public PageResult getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) { + PageResult pageResult = inspectionPlanInterceptMapper.selectPage(pageReqVO); + + PageResult result = BeanUtils.toBean(pageResult, InspectionPlanRespVO.class); + addDataInspectionPlan(result.getList()); + return result; + } + + /** + * 回填部门/公司/角色 + * @param list 分页对象 + */ + private void addDataInspectionPlan(List list ){ + if(CollectionUtils.isEmpty(list)){ + return ; + } + //公司 + Set companyIds = list.stream().map(InspectionPlanRespVO::getCompanyId).collect(Collectors.toSet()); + //部门 + Set deptIds = list.stream().map(InspectionPlanRespVO::getDeptId).collect(Collectors.toSet()); + deptIds.addAll(companyIds); + /*1.获取部门*/ + Map deptMap = deptApi.getDeptMap(deptIds); + + list.forEach(plan -> { + DeptRespDTO dept = deptMap.get(plan.getDeptId()); + if (dept != null) { + plan.setDeptName(dept.getName()); + + } + DeptRespDTO company = deptMap.get(plan.getCompanyId()); + if(company != null){ + plan.setCompanyName(company.getName()); + } + List roleList = inspectionPlanRoleMapper.selectList(new QueryWrapper().lambda() + .eq(InspectionPlanRoleDO::getBatchNo, plan.getBatchNo())); + + Set roleIds = roleList.stream().map(InspectionPlanRoleDO::getRoleId).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(roleIds)){ + List roles = roleApi.getRoleList(roleIds); + if(!CollectionUtils.isEmpty(roles)){ + plan.setRoleNameList(roles.stream().map(RoleDO::getName).collect(Collectors.toList())); + } + } + }); } @Override diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java index 011de74..cde4dd2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java @@ -59,7 +59,7 @@ public interface MaintainPlanService { * @param pageReqVO 分页查询 * @return 养护计划汇总分页 */ - PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO); + PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO); /** * 根据批次号删除 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java index d1fea3b..1a2c928 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java @@ -1,6 +1,5 @@ package com.zteits.urbanops.module.garden.service.maintainplan; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.RandomUtil; @@ -9,16 +8,19 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; -import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO; -import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; -import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanRoleDO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper; +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanInterceptMapper; import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanRoleMapper; import com.zteits.urbanops.module.garden.enums.FinishStateEnum; import com.zteits.urbanops.module.garden.enums.PlanConstants; import com.zteits.urbanops.module.garden.util.TimeIntervalCalculatorUtil; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; +import com.zteits.urbanops.module.system.api.permission.RoleApi; +import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -54,6 +56,8 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @Resource private MaintainPlanMapper maintainPlanMapper; + @Resource + private MaintainPlanInterceptMapper maintainPlanInterceptMapper; @Resource private MaintainPlanDetailMapper maintainPlanDetailMapper; @@ -61,6 +65,15 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @Resource private MaintainPlanRoleMapper maintainPlanRoleMapper; + @Resource + private DeptApi deptApi; + + @Resource + private RoleApi roleApi; + + @Resource + private MaintainPlanRoleMapper MaintainPlanRoleMapper; + @Override public CommonResult createMaintainPlan(MaintainPlanSaveReqVO createReqVO) { //存在性校验 @@ -104,13 +117,15 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { maintainPlan.setCreatorName(userName); maintainPlan.setUpdater(userId); maintainPlan.setUpdaterName(userName); + maintainPlan.setRate(createReqVO.getRateValue()); maintainPlan.setDeptId(roadReqVO.getDeptId()); maintainPlan.setRoadId(roadReqVO.getRoadId()); maintainPlan.setRoadName(roadReqVO.getRoadName()); //计划属性label String planAttrLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr()); String planTypeIdLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.MAINTAIN_TYPE, createReqVO.getPlanTypeId()); - maintainPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + createReqVO.getPlanNameSuffix()); + String planNameSuffix = StringUtil.isNotEmpty(createReqVO.getPlanNameSuffix()) ? createReqVO.getPlanNameSuffix() :""; + maintainPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + planNameSuffix); maintainPlanList.add(maintainPlan); /*2.插入角色*/ createReqVO.getRoleIds().forEach(roleId -> { @@ -132,8 +147,8 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { MaintainPlanDetailDO entity = getMaintainPlanDetailDO(batchNo, createReqVO, roadReqVO, now); ThreadUtil.sleep(2); entity.setSortNum(i+1); - entity.setBeginTime(LocalDate.parse(dateStr[0], DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - entity.setEndTime(LocalDate.parse(dateStr[1], DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + entity.setBeginTime(LocalDateTime.parse(dateStr[0], DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00"))); + entity.setEndTime(LocalDateTime.parse(dateStr[1], DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59"))); detailDOList.add(entity); } }); @@ -225,10 +240,54 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { } @Override - public PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO) { - return maintainPlanMapper.selectPage(pageReqVO); + public PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanInterceptMapper.selectPage(pageReqVO); + PageResult result = BeanUtils.toBean(pageResult, MaintainPlanRespVO.class); + addDataInspectionPlan(result.getList()); + return result; } + /** + * 回填部门/公司/角色 + * @param list 分页对象 + */ + private void addDataInspectionPlan(List list ){ + if(org.springframework.util.CollectionUtils.isEmpty(list)){ + return ; + } + + //公司 + Set companyIds = list.stream().map(MaintainPlanRespVO::getCompanyId).collect(Collectors.toSet()); + //部门 + Set deptIds = list.stream().map(MaintainPlanRespVO::getDeptId).collect(Collectors.toSet()); + deptIds.addAll(companyIds); + /*1.获取部门*/ + Map deptMap = deptApi.getDeptMap(deptIds); + + list.forEach(plan -> { + DeptRespDTO dept = deptMap.get(plan.getDeptId()); + if (dept != null) { + plan.setDeptName(dept.getName()); + + } + DeptRespDTO company = deptMap.get(plan.getCompanyId()); + if(company != null){ + plan.setCompanyName(company.getName()); + } + List roleList = maintainPlanRoleMapper.selectList(new QueryWrapper().lambda() + .eq(MaintainPlanRoleDO::getBatchNo, plan.getBatchNo())); + + Set roleIds = roleList.stream().map(MaintainPlanRoleDO::getRoleId).collect(Collectors.toSet()); + if(!org.springframework.util.CollectionUtils.isEmpty(roleIds)){ + List roles = roleApi.getRoleList(roleIds); + if(!org.springframework.util.CollectionUtils.isEmpty(roles)){ + plan.setRoleNameList(roles.stream().map(RoleDO::getName).collect(Collectors.toList())); + } + } + }); + } + + @Override public void deleteInspectionPlanByBatchNo(String batchNo) { MaintainPlanDO inspectionPlanDO = maintainPlanMapper.selectOne(MaintainPlanDO::getBatchNo, batchNo); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java index 2e43a9d..477f81e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java @@ -1,6 +1,5 @@ package com.zteits.urbanops.module.garden.service.road; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.garden.dal.mysql.road.RoadInterceptMapper; @@ -8,22 +7,16 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; import com.zteits.urbanops.module.garden.controller.admin.road.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; 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.road.RoadMapper; -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 实现类 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 b0c6ae0..3dbdfcb 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,6 +1,9 @@ package com.zteits.urbanops.module.system.api.permission; +import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; + import java.util.Collection; +import java.util.List; /** * 角色 API 接口 @@ -18,4 +21,11 @@ public interface RoleApi { */ void validRoleList(Collection ids); + /** + * 获得角色列表 + * + * @param ids 角色编号数组 + * @return 角色列表 + */ + List getRoleList(Collection ids); } 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 76e827e..1ef76e8 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,10 +1,12 @@ package com.zteits.urbanops.module.system.api.permission; +import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO; import com.zteits.urbanops.module.system.service.permission.RoleService; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import java.util.Collection; +import java.util.List; /** * 角色 API 实现类 @@ -21,4 +23,9 @@ public class RoleApiImpl implements RoleApi { public void validRoleList(Collection ids) { roleService.validateRoleList(ids); } + + @Override + public List getRoleList(Collection ids) { + return roleService.getRoleList(ids); + } } -- libgit2 0.21.4