From 95d3092434c6e52abb5effec891044131072f7a6 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 13 Dec 2025 15:41:05 +0800 Subject: [PATCH] app养护计划明细提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java | 24 ++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java | 6 +++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java | 20 ++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml | 1 + urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml | 1 + urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 535 insertions(+), 5 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java index 234dc8e..eab0cc6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java @@ -20,6 +20,9 @@ public class AppInspectionPlanDetailRespVO { @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) private String planNo; + @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String planName; + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") private Long roadId; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java new file mode 100644 index 0000000..5202ff9 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java @@ -0,0 +1,83 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanRespVO; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanSaveReqVO; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanUpdateReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.error; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_ERROR; + +@Tag(name = "APP管理 - 养护计划汇总") +@RestController +@RequestMapping("/app/garden/maintain-plan") +@Validated +@Slf4j +public class AppMaintainPlanController { + + @Resource + private MaintainPlanService maintainPlanService; + + @GetMapping("/get") + @Operation(summary = "获得养护计划汇总") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") + public CommonResult getMaintainPlan(@RequestParam("id") Long id) { + MaintainPlanDO maintainPlan = maintainPlanService.getMaintainPlan(id); + return success(BeanUtils.toBean(maintainPlan, MaintainPlanRespVO.class)); + } + + /** + * APP获得养护计划汇总分页-按道路 + */ + @GetMapping("/page/road") + @Operation(summary = "APP按道路-获得养护计划汇总分页") + //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan:road:query')") + public CommonResult> appMaintainPlanRoadPage(@Valid AppMaintainPlanPageRoadReqVO pageReqVO) { + PageResult pageResult = maintainPlanService.appMaintainPlanRoadPage(pageReqVO); + return success(pageResult); + } + + /** + * APP获得养护计划汇总分页-养护类型 + */ + @GetMapping("/page/plan-type-id") + @Operation(summary = "APP按养护类型-获得养护计划汇总分页") + //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan:plan-type:query')") + public CommonResult> appMaintainPlanPlanTypePage(@Valid AppMaintainPlanPagePlanTypeReqVO pageReqVO) { + PageResult pageResult = maintainPlanService.appMaintainPlanPlanTypePage(pageReqVO); + return success(pageResult); + } + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java new file mode 100644 index 0000000..f08f1d5 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java @@ -0,0 +1,47 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742") + @NotNull(message = "养护类型不能为空") + private Integer planTypeId; + + @Schema(description = "计划名称", example = "王五") + private String planName; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @NotNull(message = "完成状态不能为空") + @Min(value = 1, message = "状态最小为1") + @Max(value = 3, message = "状态不能大于4") + private Integer finishState; + + @Schema(description = "公司ID") + @Hidden + private Long companyId; + + @Schema(description = "角色IDS") + @Hidden + private List roleIds; + + @Schema(description = "业务线") + @Hidden + private List busiLineList; + + @Schema(description = "系统时间") + @Hidden + private LocalDate localDate; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java new file mode 100644 index 0000000..7678740 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java @@ -0,0 +1,60 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class AppMaintainPlanPagePlanTypeRespVO { + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String batchNo; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private Long roadId; + + @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String roadName; + + @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439") + private String streetId; + + @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + private String streetName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588") + private Integer levelId; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @NotNull(message = "完成状态不能为空") + @Min(value = 1, message = "状态最小为1") + @Max(value = 3, message = "状态不能大于4") + private Integer finishState; + + @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划次数") + private Integer planNum; + + @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("已完成次数") + private Integer planFinishNum; + + + @Schema(description = "执行开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime beginTime; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime endTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java new file mode 100644 index 0000000..c8d4f02 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java @@ -0,0 +1,46 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.util.List; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class AppMaintainPlanPageRoadReqVO extends PageParam { + + @Schema(description = "道路名称", example = "王五") + private String roadName; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @NotNull(message = "完成状态不能为空") + @Min(value = 1, message = "状态最小为1") + @Max(value = 3, message = "状态不能大于4") + private Integer finishState; + + @Schema(description = "公司ID") + @Hidden + private Long companyId; + + @Schema(description = "角色IDS") + @Hidden + private List roleIds; + + @Schema(description = "业务线") + @Hidden + private List busiLineList; + + @Schema(description = "系统时间") + @Hidden + private LocalDate localDate; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java new file mode 100644 index 0000000..58bf1ab --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java @@ -0,0 +1,61 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import cn.idev.excel.annotation.ExcelProperty; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class AppMaintainPlanPageRoadRespVO{ + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String batchNo; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private Long roadId; + + @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String roadName; + + @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439") + private String streetId; + + @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + private String streetName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588") + private Integer levelId; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @NotNull(message = "完成状态不能为空") + @Min(value = 1, message = "状态最小为1") + @Max(value = 3, message = "状态不能大于4") + private Integer finishState; + + @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划次数") + private Integer planNum; + + @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("已完成次数") + private Integer planFinishNum; + + + @Schema(description = "执行开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime beginTime; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime endTime; + +} \ 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 9416734..8f0b1c1 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 @@ -1,9 +1,15 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; +import com.baomidou.mybatisplus.core.metadata.IPage; 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.controller.app.inspectionplan.vo.AppInspectionPlanRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; import org.apache.ibatis.annotations.Mapper; import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; @@ -34,4 +40,22 @@ public interface MaintainPlanMapper extends BaseMapperX { int deleteByBatchNo(@Param("batchNo") String batchNo); + /** + * app-按道路获取巡检计划列表-app + * + * @param page + * @param req + * @return 列表 + */ + IPage appMaintainPlanRoadPage(@Param("page") IPage page, @Param("req") AppMaintainPlanPageRoadReqVO req); + + /** + * app-按养护类型获取巡检计划列表-app + * + * @param page + * @param req + * @return 列表 + */ + IPage appMaintainPlanPlanTypePage(@Param("page") IPage page, @Param("req") AppMaintainPlanPagePlanTypeReqVO req); + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java index 13fc5bc..4e8bc71 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java @@ -202,7 +202,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ List list = inspectionPlanCommitMapper.appInspectionPlanCommitListByPlanNo(planNo, busiLineList); list.forEach(e -> { - e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost())); + e.setImgList(StrUtils.imgProcess(e.getImg(), "")); }); return list; } @@ -238,7 +238,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ private List imgProcess(List list) { list.forEach(e -> { - e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost())); + e.setImgList(StrUtils.imgProcess(e.getImg(), "")); }); return list; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java index 9138ae8..80e1a75 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java @@ -103,9 +103,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService list.forEach(e -> { MaintainPlanCommitDetailRespVO respVO = new MaintainPlanCommitDetailRespVO(); BeanUtils.copyProperties(e, respVO); - respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), e.getImgHost())); - respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), e.getImgHost())); - respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), e.getImgHost())); + respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), "")); + respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), "")); + respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), "")); List commonUsers = new ArrayList<>(); List maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper().lambda() 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 310bfe2..9fb78f7 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 @@ -3,6 +3,10 @@ package com.zteits.urbanops.module.garden.service.maintainplan; import java.util.*; import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO; import jakarta.validation.*; import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; @@ -72,4 +76,20 @@ public interface MaintainPlanService { * @param batchNo */ void stopPlanInspectionPlan(String batchNo); + + /** + * app按道路-获得养护计划汇总分页 + * @param pageReqVO + * @return + */ + PageResult appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO); + + /** + * app按养护类型-获得养护计划汇总分页 + * @param pageReqVO + * @return + */ + PageResult appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO); + + } \ No newline at end of file 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 3d55d64..03cca94 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 @@ -4,17 +4,26 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils; +import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO; 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.dataobject.road.RoadDO; 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.dal.mysql.road.RoadMapper; import com.zteits.urbanops.module.garden.enums.FinishStateEnum; import com.zteits.urbanops.module.garden.enums.PlanConstants; import com.zteits.urbanops.module.garden.util.timeinterval.PeriodResult; @@ -25,11 +34,14 @@ 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.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -68,6 +80,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { private MaintainPlanRoleMapper maintainPlanRoleMapper; @Resource + private RoadMapper roadMapper; + + @Resource private DeptApi deptApi; @Resource @@ -312,4 +327,64 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { maintainPlanRoleMapper.delete(MaintainPlanRoleDO::getBatchNo, batchNo); } + @Override + public PageResult appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO) { + String busiLine = SecurityFrameworkUtils.getBusiLine(); + Long companyId = SecurityFrameworkUtils.getCompanyId(); + if (StringUtils.isNotEmpty(busiLine)) { + pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); + } + pageReqVO.setCompanyId(companyId); + + /*1.查询登录用户角色*/ + List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); + pageReqVO.setRoleIds(roleIds); + pageReqVO.setLocalDate(LocalDate.now()); + + /*2.分页*/ + IPage mpPage = MyBatisUtils.buildPage(pageReqVO); + IPage page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO); + addStreetInfo(page.getRecords()); + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + @Override + public PageResult appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) { + String busiLine = SecurityFrameworkUtils.getBusiLine(); + Long companyId = SecurityFrameworkUtils.getCompanyId(); + if (StringUtils.isNotEmpty(busiLine)) { + pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); + } + pageReqVO.setCompanyId(companyId); + + /*1.查询登录用户角色*/ + List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); + pageReqVO.setRoleIds(roleIds); + pageReqVO.setLocalDate(LocalDate.now()); + /*2.分页*/ + IPage mpPage = MyBatisUtils.buildPage(pageReqVO); + IPage page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO); + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + private void addStreetInfo(List list){ + if(CollectionUtils.isEmpty(list)){ + return ; + } + Set roadIds = list.stream().map(AppMaintainPlanPageRoadRespVO::getRoadId).collect(Collectors.toSet()); + + + List roadList = roadMapper.selectList(new QueryWrapper().lambda().in(RoadDO::getId, roadIds)); + //list转map + Map roadMap = roadList.stream().collect(Collectors.toMap(RoadDO::getId, road -> road)); + + list.forEach(plan -> { + RoadDO road = roadMap.get(plan.getRoadId()); + if(road != null){ + plan.setStreetId(road.getStreetId()); + plan.setStreetName(road.getStreetName()); + } + }); + } + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml index 6a8022f..374a767 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml @@ -16,6 +16,7 @@ SELECT a.batch_no, b.plan_no, + a.plan_name, a.road_id, a.road_name, a.plan_type_id, diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml index 6ec5a5f..2757b18 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml @@ -20,6 +20,7 @@ a.road_name, a.plan_type_id, a.level_id, + a.finish_state, a.begin_time, a.end_time FROM diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml index 43e0c60..dbf2621 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -11,4 +11,113 @@ delete from garden_maintain_plan where batch_no =#{batchNo} + + + + + + \ No newline at end of file -- libgit2 0.21.4