diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanCommitController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanCommitController.java new file mode 100644 index 0000000..8cca41f --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanCommitController.java @@ -0,0 +1,103 @@ +package com.zteits.urbanops.module.garden.controller.admin.inspectionplan; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; +import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanCommitService; + +@Tag(name = "管理后台 - 巡检计划提交明细") +@RestController +@RequestMapping("/garden/inspection-plan-commit") +@Validated +public class InspectionPlanCommitController { + + @Resource + private InspectionPlanCommitService inspectionPlanCommitService; + + @PostMapping("/create") + @Operation(summary = "创建巡检计划提交明细") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:create')") + public CommonResult createInspectionPlanCommit(@Valid @RequestBody InspectionPlanCommitSaveReqVO createReqVO) { + return success(inspectionPlanCommitService.createInspectionPlanCommit(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新巡检计划提交明细") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:update')") + public CommonResult updateInspectionPlanCommit(@Valid @RequestBody InspectionPlanCommitSaveReqVO updateReqVO) { + inspectionPlanCommitService.updateInspectionPlanCommit(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除巡检计划提交明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:delete')") + public CommonResult deleteInspectionPlanCommit(@RequestParam("id") Long id) { + inspectionPlanCommitService.deleteInspectionPlanCommit(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除巡检计划提交明细") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:delete')") + public CommonResult deleteInspectionPlanCommitList(@RequestParam("ids") List ids) { + inspectionPlanCommitService.deleteInspectionPlanCommitListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得巡检计划提交明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')") + public CommonResult getInspectionPlanCommit(@RequestParam("id") Long id) { + InspectionPlanCommitDO inspectionPlanCommit = inspectionPlanCommitService.getInspectionPlanCommit(id); + return success(BeanUtils.toBean(inspectionPlanCommit, InspectionPlanCommitRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得巡检计划提交明细分页") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')") + public CommonResult> getInspectionPlanCommitPage(@Valid InspectionPlanCommitPageReqVO pageReqVO) { + PageResult pageResult = inspectionPlanCommitService.getInspectionPlanCommitPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, InspectionPlanCommitRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出巡检计划提交明细 Excel") + @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportInspectionPlanCommitExcel(@Valid InspectionPlanCommitPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = inspectionPlanCommitService.getInspectionPlanCommitPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "巡检计划提交明细.xls", "数据", InspectionPlanCommitRespVO.class, + BeanUtils.toBean(list, InspectionPlanCommitRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitPageReqVO.java new file mode 100644 index 0000000..ec1a930 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitPageReqVO.java @@ -0,0 +1,71 @@ +package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 巡检计划提交明细分页 Request VO") +@Data +public class InspectionPlanCommitPageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "归属(一级部门id)", example = "18172") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "9510") + private Long deptId; + + @Schema(description = "道路ID", example = "21939") + private Long roadId; + + @Schema(description = "图片地址host") + private String imgHost; + + @Schema(description = "巡检照片") + private String img; + + @Schema(description = "巡检结果: 1:正常;2:异常") + private Integer inspectionState; + + @Schema(description = "转交状态: 1:未转交;2:已转交") + private Integer transState; + + @Schema(description = "转交问题单编码") + private String transWorkNo; + + @Schema(description = "完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] finishTime; + + @Schema(description = "提交人用户ID", example = "30987") + private Long userId; + + @Schema(description = "提交人", example = "赵六") + private String userName; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建者", example = "张三") + private String creatorName; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "更新者", example = "赵六") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java new file mode 100644 index 0000000..5e6359b --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java @@ -0,0 +1,89 @@ +package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 巡检计划提交明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class InspectionPlanCommitRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25349") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "18172") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "9510") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21939") + @ExcelProperty("道路ID") + private Long roadId; + + @Schema(description = "图片地址host", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("图片地址host") + private String imgHost; + + @Schema(description = "巡检照片", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("巡检照片") + private String img; + + @Schema(description = "巡检结果: 1:正常;2:异常", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("巡检结果: 1:正常;2:异常") + private Integer inspectionState; + + @Schema(description = "转交状态: 1:未转交;2:已转交", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("转交状态: 1:未转交;2:已转交") + private Integer transState; + + @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("转交问题单编码") + private String transWorkNo; + + @Schema(description = "完成时间") + @ExcelProperty("完成时间") + private LocalDateTime finishTime; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30987") + @ExcelProperty("提交人用户ID") + private Long userId; + + @Schema(description = "提交人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("提交人") + private String userName; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("创建者") + private String creatorName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("更新者") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitSaveReqVO.java new file mode 100644 index 0000000..7686929 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitSaveReqVO.java @@ -0,0 +1,82 @@ +package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import jakarta.validation.constraints.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 巡检计划提交明细新增/修改 Request VO") +@Data +public class InspectionPlanCommitSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25349") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空") + private String busiLine; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "18172") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "9510") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21939") + @NotNull(message = "道路ID不能为空") + private Long roadId; + + @Schema(description = "图片地址host", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "图片地址host不能为空") + private String imgHost; + + @Schema(description = "巡检照片", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "巡检照片不能为空") + private String img; + + @Schema(description = "巡检结果: 1:正常;2:异常", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "巡检结果: 1:正常;2:异常不能为空") + private Integer inspectionState; + + @Schema(description = "转交状态: 1:未转交;2:已转交", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "转交状态: 1:未转交;2:已转交不能为空") + private Integer transState; + + @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "转交问题单编码不能为空") + private String transWorkNo; + + @Schema(description = "完成时间") + private LocalDateTime finishTime; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30987") + @NotNull(message = "提交人用户ID不能为空") + private Long userId; + + @Schema(description = "提交人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "提交人不能为空") + private String userName; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "备注不能为空") + private String remark; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @NotEmpty(message = "创建者不能为空") + private String creatorName; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "更新者不能为空") + private String updaterName; + +} \ 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 9c7fb4b..cd63a37 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 @@ -5,7 +5,7 @@ import lombok.*; import java.time.LocalDate; import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -62,4 +62,14 @@ public class InspectionPlanDetailRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "创建人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") + @ExcelProperty("创建人ID") + private String creator; + /** + * 创建者 + */ + @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") + @ExcelProperty("创建人") + private String creatorName; + } \ 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 ead85bc..d894669 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 @@ -1,7 +1,5 @@ package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.vo.VO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -89,13 +87,15 @@ public class InspectionPlanRespVO implements VO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @Schema(description = "创建人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO", - fields = "nickname", ref = "creatorName") + @Schema(description = "创建人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") + @ExcelProperty("创建人ID") private String creator; - + /** + * 创建者 + */ @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") @ExcelProperty("创建人") private String creatorName; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java new file mode 100644 index 0000000..d21f5ea --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java @@ -0,0 +1,103 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanCommitService; + +@Tag(name = "管理后台 - 养护计划明细") +@RestController +@RequestMapping("/garden/maintain-plan-commit") +@Validated +public class MaintainPlanCommitController { + + @Resource + private MaintainPlanCommitService maintainPlanCommitService; + + @PostMapping("/create") + @Operation(summary = "创建养护计划明细") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:create')") + public CommonResult createMaintainPlanCommit(@Valid @RequestBody MaintainPlanCommitSaveReqVO createReqVO) { + return success(maintainPlanCommitService.createMaintainPlanCommit(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新养护计划明细") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:update')") + public CommonResult updateMaintainPlanCommit(@Valid @RequestBody MaintainPlanCommitSaveReqVO updateReqVO) { + maintainPlanCommitService.updateMaintainPlanCommit(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除养护计划明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:delete')") + public CommonResult deleteMaintainPlanCommit(@RequestParam("id") Long id) { + maintainPlanCommitService.deleteMaintainPlanCommit(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除养护计划明细") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:delete')") + public CommonResult deleteMaintainPlanCommitList(@RequestParam("ids") List ids) { + maintainPlanCommitService.deleteMaintainPlanCommitListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得养护计划明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") + public CommonResult getMaintainPlanCommit(@RequestParam("id") Long id) { + MaintainPlanCommitDO maintainPlanCommit = maintainPlanCommitService.getMaintainPlanCommit(id); + return success(BeanUtils.toBean(maintainPlanCommit, MaintainPlanCommitRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得养护计划明细分页") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") + public CommonResult> getMaintainPlanCommitPage(@Valid MaintainPlanCommitPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaintainPlanCommitRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出养护计划明细 Excel") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaintainPlanCommitExcel(@Valid MaintainPlanCommitPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "养护计划明细.xls", "数据", MaintainPlanCommitRespVO.class, + BeanUtils.toBean(list, MaintainPlanCommitRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommonUserController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommonUserController.java new file mode 100644 index 0000000..868b3eb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommonUserController.java @@ -0,0 +1,103 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanCommonUserService; + +@Tag(name = "管理后台 - 养护计划共同处理人") +@RestController +@RequestMapping("/garden/maintain-plan-common-user") +@Validated +public class MaintainPlanCommonUserController { + + @Resource + private MaintainPlanCommonUserService maintainPlanCommonUserService; + + @PostMapping("/create") + @Operation(summary = "创建养护计划共同处理人") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:create')") + public CommonResult createMaintainPlanCommonUser(@Valid @RequestBody MaintainPlanCommonUserSaveReqVO createReqVO) { + return success(maintainPlanCommonUserService.createMaintainPlanCommonUser(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新养护计划共同处理人") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:update')") + public CommonResult updateMaintainPlanCommonUser(@Valid @RequestBody MaintainPlanCommonUserSaveReqVO updateReqVO) { + maintainPlanCommonUserService.updateMaintainPlanCommonUser(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除养护计划共同处理人") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:delete')") + public CommonResult deleteMaintainPlanCommonUser(@RequestParam("id") Long id) { + maintainPlanCommonUserService.deleteMaintainPlanCommonUser(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除养护计划共同处理人") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:delete')") + public CommonResult deleteMaintainPlanCommonUserList(@RequestParam("ids") List ids) { + maintainPlanCommonUserService.deleteMaintainPlanCommonUserListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得养护计划共同处理人") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:query')") + public CommonResult getMaintainPlanCommonUser(@RequestParam("id") Long id) { + MaintainPlanCommonUserDO maintainPlanCommonUser = maintainPlanCommonUserService.getMaintainPlanCommonUser(id); + return success(BeanUtils.toBean(maintainPlanCommonUser, MaintainPlanCommonUserRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得养护计划共同处理人分页") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:query')") + public CommonResult> getMaintainPlanCommonUserPage(@Valid MaintainPlanCommonUserPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanCommonUserService.getMaintainPlanCommonUserPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaintainPlanCommonUserRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出养护计划共同处理人 Excel") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-common-user:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaintainPlanCommonUserExcel(@Valid MaintainPlanCommonUserPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = maintainPlanCommonUserService.getMaintainPlanCommonUserPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "养护计划共同处理人.xls", "数据", MaintainPlanCommonUserRespVO.class, + BeanUtils.toBean(list, MaintainPlanCommonUserRespVO.class)); + } + +} \ 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 fbcdc96..8022bfa 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 @@ -1,74 +1,103 @@ package com.zteits.urbanops.module.garden.controller.admin.maintainplan; -import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanAddReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanForPageReqVO; -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.tags.Tag; +import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 养护计划") +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService; + +@Tag(name = "管理后台 - 养护计划汇总") @RestController -@RequestMapping("/maintain/plan") +@RequestMapping("/garden/maintain-plan") +@Validated public class MaintainPlanController { @Resource private MaintainPlanService maintainPlanService; - @Resource - private com.zteits.urbanops.module.garden.service.plancommit.MaintainPlanCommitDetailService maintainPlanCommitDetailService; - @PostMapping("/listForPage") - @Operation(summary = "养护计划-分页查询") - @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") - public CommonResult> listForPage(@Valid @RequestBody MaintainPlanForPageReqVO reqVO) { - return success(maintainPlanService.selectPage(reqVO)); + @PostMapping("/create") + @Operation(summary = "创建养护计划汇总") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')") + public CommonResult createMaintainPlan(@Valid @RequestBody MaintainPlanSaveReqVO createReqVO) { + return success(maintainPlanService.createMaintainPlan(createReqVO)); } - @GetMapping("/detail") - @Operation(summary = "养护计划-对象明细") - @Parameter(name = "plan_no", description = "编码", required = true) - @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") - public CommonResult detail(@RequestParam("plan_no") String planNo) { - return success(maintainPlanService.selectByPlanNo(planNo)); + @PutMapping("/update") + @Operation(summary = "更新养护计划汇总") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:update')") + public CommonResult updateMaintainPlan(@Valid @RequestBody MaintainPlanSaveReqVO updateReqVO) { + maintainPlanService.updateMaintainPlan(updateReqVO); + return success(true); } - @PostMapping("/add") - @Operation(summary = "养护计划-添加") - @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')") - public CommonResult add(@Valid @RequestBody MaintainPlanAddReqVO reqVO) { - Long companyId = SecurityFrameworkUtils.getLoginUserDeptId(); - Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); - return success(maintainPlanService.insert(reqVO, companyId, deptId)); + @DeleteMapping("/delete") + @Operation(summary = "删除养护计划汇总") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:delete')") + public CommonResult deleteMaintainPlan(@RequestParam("id") Long id) { + maintainPlanService.deleteMaintainPlan(id); + return success(true); } - @GetMapping("/deleteById") - @Operation(summary = "养护计划-删除") - @PreAuthorize("@ss.hasPermission('garden:maintain-plan:delete')") - public CommonResult deleteById(@RequestParam("id") Long id) { - return success(maintainPlanService.deleteById(id)); + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除养护计划汇总") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:delete')") + public CommonResult deleteMaintainPlanList(@RequestParam("ids") List ids) { + maintainPlanService.deleteMaintainPlanListByIds(ids); + return success(true); + } + + @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)); } - @PostMapping("/yh/listForPage") - @Operation(summary = "PC养护计划提交记录-分页查询") + @GetMapping("/page") + @Operation(summary = "获得养护计划汇总分页") @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") - public CommonResult> yhListForPage(@RequestBody com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.AdminPlanYhCommitDetailPageReqVO reqVO) { - com.zteits.urbanops.framework.common.pojo.PageParam page = new com.zteits.urbanops.framework.common.pojo.PageParam(); - page.setPageNo(reqVO.getPageNo()); - page.setPageSize(reqVO.getPageSize()); - com.zteits.urbanops.module.garden.controller.app.vo.PlanYhCommitDetailPageReqVO where = new com.zteits.urbanops.module.garden.controller.app.vo.PlanYhCommitDetailPageReqVO(); - where.setPageNo(reqVO.getPageNo()); - where.setPageSize(reqVO.getPageSize()); - where.setCompanyId(reqVO.getCompanyId()); - return success(maintainPlanCommitDetailService.pageListYH(page, where)); + public CommonResult> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaintainPlanRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出养护计划汇总 Excel") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaintainPlanExcel(@Valid MaintainPlanPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = maintainPlanService.getMaintainPlanPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "养护计划汇总.xls", "数据", MaintainPlanRespVO.class, + BeanUtils.toBean(list, MaintainPlanRespVO.class)); } + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanDetailController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanDetailController.java new file mode 100644 index 0000000..b0ccaba --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanDetailController.java @@ -0,0 +1,103 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanDetailService; + +@Tag(name = "管理后台 - 养护计划") +@RestController +@RequestMapping("/garden/maintain-plan-detail") +@Validated +public class MaintainPlanDetailController { + + @Resource + private MaintainPlanDetailService maintainPlanDetailService; + + @PostMapping("/create") + @Operation(summary = "创建养护计划") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:create')") + public CommonResult createMaintainPlanDetail(@Valid @RequestBody MaintainPlanDetailSaveReqVO createReqVO) { + return success(maintainPlanDetailService.createMaintainPlanDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新养护计划") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:update')") + public CommonResult updateMaintainPlanDetail(@Valid @RequestBody MaintainPlanDetailSaveReqVO updateReqVO) { + maintainPlanDetailService.updateMaintainPlanDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除养护计划") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:delete')") + public CommonResult deleteMaintainPlanDetail(@RequestParam("id") Long id) { + maintainPlanDetailService.deleteMaintainPlanDetail(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除养护计划") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:delete')") + public CommonResult deleteMaintainPlanDetailList(@RequestParam("ids") List ids) { + maintainPlanDetailService.deleteMaintainPlanDetailListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得养护计划") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:query')") + public CommonResult getMaintainPlanDetail(@RequestParam("id") Long id) { + MaintainPlanDetailDO maintainPlanDetail = maintainPlanDetailService.getMaintainPlanDetail(id); + return success(BeanUtils.toBean(maintainPlanDetail, MaintainPlanDetailRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得养护计划分页") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:query')") + public CommonResult> getMaintainPlanDetailPage(@Valid MaintainPlanDetailPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanDetailService.getMaintainPlanDetailPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaintainPlanDetailRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出养护计划 Excel") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-detail:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaintainPlanDetailExcel(@Valid MaintainPlanDetailPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = maintainPlanDetailService.getMaintainPlanDetailPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "养护计划.xls", "数据", MaintainPlanDetailRespVO.class, + BeanUtils.toBean(list, MaintainPlanDetailRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanRoleController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanRoleController.java new file mode 100644 index 0000000..e542861 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanRoleController.java @@ -0,0 +1,104 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; +import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanRoleService; + +@Tag(name = "管理后台 - 养护计划角色") +@RestController +@RequestMapping("/garden/maintain-plan-role") +@Validated +public class MaintainPlanRoleController { + + @Resource + private MaintainPlanRoleService maintainPlanRoleService; + + @PostMapping("/create") + @Operation(summary = "创建养护计划角色") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:create')") + public CommonResult createMaintainPlanRole(@Valid @RequestBody MaintainPlanRoleSaveReqVO createReqVO) { + return success(maintainPlanRoleService.createMaintainPlanRole(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新养护计划角色") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:update')") + public CommonResult updateMaintainPlanRole(@Valid @RequestBody MaintainPlanRoleSaveReqVO updateReqVO) { + maintainPlanRoleService.updateMaintainPlanRole(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除养护计划角色") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:delete')") + public CommonResult deleteMaintainPlanRole(@RequestParam("id") Long id) { + maintainPlanRoleService.deleteMaintainPlanRole(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除养护计划角色") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:delete')") + public CommonResult deleteMaintainPlanRoleList(@RequestParam("ids") List ids) { + maintainPlanRoleService.deleteMaintainPlanRoleListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得养护计划角色") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:query')") + public CommonResult getMaintainPlanRole(@RequestParam("id") Long id) { + MaintainPlanRoleDO maintainPlanRole = maintainPlanRoleService.getMaintainPlanRole(id); + return success(BeanUtils.toBean(maintainPlanRole, MaintainPlanRoleRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得养护计划角色分页") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:query')") + public CommonResult> getMaintainPlanRolePage(@Valid MaintainPlanRolePageReqVO pageReqVO) { + PageResult pageResult = maintainPlanRoleService.getMaintainPlanRolePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaintainPlanRoleRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出养护计划角色 Excel") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-role:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaintainPlanRoleExcel(@Valid MaintainPlanRolePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = maintainPlanRoleService.getMaintainPlanRolePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "养护计划角色.xls", "数据", MaintainPlanRoleRespVO.class, + BeanUtils.toBean(list, MaintainPlanRoleRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/AdminPlanYhCommitDetailPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/AdminPlanYhCommitDetailPageReqVO.java deleted file mode 100644 index 22f2dc8..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/AdminPlanYhCommitDetailPageReqVO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import lombok.Data; - -@Data -public class AdminPlanYhCommitDetailPageReqVO extends PageParam { - private Long companyId; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanAddReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanAddReqVO.java deleted file mode 100644 index 7387a7b..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanAddReqVO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class MaintainPlanAddReqVO { - @NotEmpty - private String planNo; - @NotEmpty - private String planName; - @NotNull - private Integer type; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java new file mode 100644 index 0000000..fa7383c --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java @@ -0,0 +1,83 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import lombok.*; + +import java.time.LocalDate; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划明细分页 Request VO") +@Data +public class MaintainPlanCommitPageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "提交次序号") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", example = "2759") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "29117") + private Long deptId; + + @Schema(description = "道路ID", example = "12084") + private Long roadId; + + @Schema(description = "本次完成百分比") + private Double finishPercent; + + @Schema(description = "照片host") + private String imgHost; + + @Schema(description = "开始照片") + private String beginImg; + + @Schema(description = "处理中照片") + private String processImg; + + @Schema(description = "结束照片") + private String endImg; + + @Schema(description = "养护面积:单位m²") + private Double opArea; + + @Schema(description = "操作时长") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Double[] opTime; + + @Schema(description = "完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] finishTime; + + @Schema(description = "提交人用户", example = "19167") + private Long userId; + + @Schema(description = "提交人用户ID", example = "王五") + private String userName; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建者", example = "张三") + private String creatorName; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "更新者", example = "赵六") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java new file mode 100644 index 0000000..82c9e89 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java @@ -0,0 +1,102 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 养护计划明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanCommitRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26945") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "提交次序号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("提交次序号") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2759") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "29117") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12084") + @ExcelProperty("道路ID") + private Long roadId; + + @Schema(description = "本次完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("本次完成百分比") + private Double finishPercent; + + @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("照片host") + private String imgHost; + + @Schema(description = "开始照片", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("开始照片") + private String beginImg; + + @Schema(description = "处理中照片", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("处理中照片") + private String processImg; + + @Schema(description = "结束照片", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("结束照片") + private String endImg; + + @Schema(description = "养护面积:单位m²", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("养护面积:单位m²") + private Double opArea; + + @Schema(description = "操作时长", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("操作时长") + private Double opTime; + + @Schema(description = "完成时间") + @ExcelProperty("完成时间") + private LocalDateTime finishTime; + + @Schema(description = "提交人用户", requiredMode = Schema.RequiredMode.REQUIRED, example = "19167") + @ExcelProperty("提交人用户") + private Long userId; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("提交人用户ID") + private String userName; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("创建者") + private String creatorName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("更新者") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java new file mode 100644 index 0000000..502f5b5 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java @@ -0,0 +1,95 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 养护计划明细新增/修改 Request VO") +@Data +public class MaintainPlanCommitSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26945") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空") + private String busiLine; + + @Schema(description = "提交次序号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "提交次序号不能为空") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2759") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "29117") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12084") + @NotNull(message = "道路ID不能为空") + private Long roadId; + + @Schema(description = "本次完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "本次完成百分比不能为空") + private Double finishPercent; + + @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "照片host不能为空") + private String imgHost; + + @Schema(description = "开始照片", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "开始照片不能为空") + private String beginImg; + + @Schema(description = "处理中照片", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "处理中照片不能为空") + private String processImg; + + @Schema(description = "结束照片", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "结束照片不能为空") + private String endImg; + + @Schema(description = "养护面积:单位m²", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "养护面积:单位m²不能为空") + private Double opArea; + + @Schema(description = "操作时长", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "操作时长不能为空") + private Double opTime; + + @Schema(description = "完成时间") + private LocalDateTime finishTime; + + @Schema(description = "提交人用户", requiredMode = Schema.RequiredMode.REQUIRED, example = "19167") + @NotNull(message = "提交人用户不能为空") + private Long userId; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "提交人用户ID不能为空") + private String userName; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "备注不能为空") + private String remark; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @NotEmpty(message = "创建者不能为空") + private String creatorName; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "更新者不能为空") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserPageReqVO.java new file mode 100644 index 0000000..22b1b56 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserPageReqVO.java @@ -0,0 +1,47 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划共同处理人分页 Request VO") +@Data +public class MaintainPlanCommonUserPageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "计划编码") + private String planNo; + + @Schema(description = "提交次序号") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", example = "28203") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "27061") + private Long deptId; + + @Schema(description = "用户ID", example = "14415") + private Long userId; + + @Schema(description = "用户名", example = "李四") + private String userName; + + @Schema(description = "创建者", example = "芋艿") + private String creatorName; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "更新者", example = "李四") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserRespVO.java new file mode 100644 index 0000000..d2f8c21 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserRespVO.java @@ -0,0 +1,57 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 养护计划共同处理人 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanCommonUserRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6621") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "提交次序号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("提交次序号") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "28203") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "27061") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14415") + @ExcelProperty("用户ID") + private Long userId; + + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("用户名") + private String userName; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("创建者") + private String creatorName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("更新者") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserSaveReqVO.java new file mode 100644 index 0000000..0767560 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserSaveReqVO.java @@ -0,0 +1,50 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 养护计划共同处理人新增/修改 Request VO") +@Data +public class MaintainPlanCommonUserSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6621") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planNo; + + @Schema(description = "提交次序号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "提交次序号不能为空") + private Integer sortNum; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "28203") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "27061") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14415") + @NotNull(message = "用户ID不能为空") + private Long userId; + + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @NotEmpty(message = "用户名不能为空") + private String userName; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "创建者不能为空") + private String creatorName; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @NotEmpty(message = "更新者不能为空") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java new file mode 100644 index 0000000..f195f8a --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java @@ -0,0 +1,62 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import lombok.*; + +import java.time.LocalDate; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划分页 Request VO") +@Data +public class MaintainPlanDetailPageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "归属(一级部门id)", example = "304") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "11976") + private Long deptId; + + @Schema(description = "道路ID", example = "23595") + private Long roadId; + + @Schema(description = "排序号:第n次计划") + private Integer sortNum; + + @Schema(description = "执行开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] beginTime; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] endTime; + + @Schema(description = "完成百分比") + private Double finishPercent; + + @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成") + private Integer finishState; + + @Schema(description = "创建者", example = "李四") + private String creatorName; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "更新者", example = "芋艿") + private String updaterName; + +} \ 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 new file mode 100644 index 0000000..d98a450 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java @@ -0,0 +1,75 @@ +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.*; + +@Schema(description = "管理后台 - 养护计划 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanDetailRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29810") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "304") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "11976") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23595") + @ExcelProperty("道路ID") + private Long roadId; + + @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("排序号:第n次计划") + private Integer sortNum; + + @Schema(description = "执行开始时间") + @ExcelProperty("执行开始时间") + private LocalDate beginTime; + + @Schema(description = "执行时间") + @ExcelProperty("执行时间") + private LocalDate endTime; + + @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("完成百分比") + private Double finishPercent; + + @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成") + private Integer finishState; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("创建者") + private String creatorName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("更新者") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java new file mode 100644 index 0000000..bbac97f --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java @@ -0,0 +1,66 @@ +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 jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 养护计划新增/修改 Request VO") +@Data +public class MaintainPlanDetailSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29810") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planNo; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空") + private String busiLine; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "304") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "11976") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23595") + @NotNull(message = "道路ID不能为空") + private Long roadId; + + @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "排序号:第n次计划不能为空") + private Integer sortNum; + + @Schema(description = "执行开始时间") + private LocalDate beginTime; + + @Schema(description = "执行时间") + private LocalDate endTime; + + @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "完成百分比不能为空") + private Double finishPercent; + + @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "完成状态 1:未完成;2:进行中；3:已完成不能为空") + private Integer finishState; + + @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @NotEmpty(message = "创建者不能为空") + private String creatorName; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "更新者不能为空") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanForPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanForPageReqVO.java deleted file mode 100644 index d32f67f..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanForPageReqVO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import lombok.Data; - -@Data -public class MaintainPlanForPageReqVO extends PageParam { - private Integer type; - private String planName; -} \ No newline at end of file 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 new file mode 100644 index 0000000..5ae6813 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java @@ -0,0 +1,80 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import lombok.*; + +import java.time.LocalDate; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class MaintainPlanPageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "计划名称", example = "王五") + private String planName; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "计划属性:1:标准计划；2:临时计划") + private Integer planAttr; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", example = "7439") + private Integer planTypeId; + + @Schema(description = "归属(一级部门id)", example = "1713") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "12055") + private Long deptId; + + @Schema(description = "道路ID", example = "19114") + private Long roadId; + + @Schema(description = "道路名称", example = "王五") + private String roadName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "16420") + private Integer levelId; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", example = "28220") + private Integer cycleId; + + @Schema(description = "计划次数") + private Integer planNum; + + @Schema(description = "已完成次数") + private Integer planFinishNum; + + @Schema(description = "完成状态 : 1:未完成；2:已完成") + private Integer finishState; + + @Schema(description = "开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] beginTime; + + @Schema(description = "开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDate[] endTime; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建人", example = "赵六") + private String creatorName; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "更新者", example = "芋艿") + private String updaterName; + +} \ 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 new file mode 100644 index 0000000..e652093 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRespVO.java @@ -0,0 +1,101 @@ +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.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 养护计划汇总 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2058") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("计划名称") + private String planName; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "计划属性:1:标准计划；2:临时计划", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划属性:1:标准计划；2:临时计划") + private Integer planAttr; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "7439") + @ExcelProperty("养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;") + private Integer planTypeId; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1713") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19114") + @ExcelProperty("道路ID") + private Long roadId; + + @Schema(description = "道路名称", example = "王五") + @ExcelProperty("道路名称") + private String roadName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "16420") + @ExcelProperty("养护级别: 10:特级；11:一级：12:二级;13:三级") + private Integer levelId; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "28220") + @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次") + private Integer cycleId; + + @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("计划次数") + private Integer planNum; + + @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("已完成次数") + private Integer planFinishNum; + + @Schema(description = "完成状态 : 1:未完成；2:已完成", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("完成状态 : 1:未完成；2:已完成") + private Integer finishState; + + @Schema(description = "开始时间") + @ExcelProperty("开始时间") + private LocalDate beginTime; + + @Schema(description = "开始时间") + @ExcelProperty("开始时间") + private LocalDate endTime; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("创建人") + private String creatorName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("更新者") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRolePageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRolePageReqVO.java new file mode 100644 index 0000000..147ed6c --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRolePageReqVO.java @@ -0,0 +1,35 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划角色分页 Request VO") +@Data +public class MaintainPlanRolePageReqVO extends PageParam { + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "归属(一级部门id)", example = "18833") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "16673") + private Long deptId; + + @Schema(description = "道路ID", example = "5089") + private Long roadId; + + @Schema(description = "角色ID", example = "20734") + private Long roleId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleRespVO.java new file mode 100644 index 0000000..2d68ecb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleRespVO.java @@ -0,0 +1,43 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 养护计划角色 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanRoleRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28217") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "18833") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16673") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5089") + @ExcelProperty("道路ID") + private Long roadId; + + @Schema(description = "角色ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20734") + @ExcelProperty("角色ID") + private Long roleId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleSaveReqVO.java new file mode 100644 index 0000000..8668f89 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanRoleSaveReqVO.java @@ -0,0 +1,35 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 养护计划角色新增/修改 Request VO") +@Data +public class MaintainPlanRoleSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28217") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "18833") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16673") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5089") + @NotNull(message = "道路ID不能为空") + private Long roadId; + + @Schema(description = "角色ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20734") + @NotNull(message = "角色ID不能为空") + private Long roleId; + +} \ 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 new file mode 100644 index 0000000..c42bf4e --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java @@ -0,0 +1,90 @@ +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.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 养护计划汇总新增/修改 Request VO") +@Data +public class MaintainPlanSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2058") + private Long id; + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "批次号不能为空") + private String batchNo; + + @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "计划名称不能为空") + private String planName; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政不能为空") + private String busiLine; + + @Schema(description = "计划属性:1:标准计划；2:临时计划", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "计划属性:1:标准计划；2:临时计划不能为空") + private Integer planAttr; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "7439") + @NotNull(message = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;不能为空") + private Integer planTypeId; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1713") + @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 = "道路名称", example = "王五") + private String roadName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "16420") + @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级不能为空") + private Integer levelId; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "28220") + @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空") + private Integer cycleId; + + @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "计划次数不能为空") + private Integer planNum; + + @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "已完成次数不能为空") + private Integer planFinishNum; + + @Schema(description = "完成状态 : 1:未完成；2:已完成", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "完成状态 : 1:未完成；2:已完成不能为空") + private Integer finishState; + + @Schema(description = "开始时间") + private LocalDate beginTime; + + @Schema(description = "开始时间") + private LocalDate endTime; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "备注不能为空") + private String remark; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "创建人不能为空") + private String creatorName; + + @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "更新者不能为空") + private String updaterName; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanCommitDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanCommitDO.java new file mode 100644 index 0000000..c8500a4 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanCommitDO.java @@ -0,0 +1,98 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan; + +import lombok.*; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 巡检计划提交明细 DO + * + * @author 超级管理员 + */ +@TableName("garden_inspection_plan_commit") +@KeySequence("garden_inspection_plan_commit_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InspectionPlanCommitDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 批次号 + */ + private String batchNo; + /** + * 计划编码 + */ + private String planNo; + /** + * 业务线: yl-园林；wy-物业：sz-市政 + */ + private String busiLine; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 道路ID + */ + private Long roadId; + /** + * 图片地址host + */ + private String imgHost; + /** + * 巡检照片 + */ + private String img; + /** + * 巡检结果: 1:正常;2:异常 + */ + private Integer inspectionState; + /** + * 转交状态: 1:未转交;2:已转交 + */ + private Integer transState; + /** + * 转交问题单编码 + */ + private String transWorkNo; + /** + * 完成时间 + */ + private LocalDateTime finishTime; + /** + * 提交人用户ID + */ + private Long userId; + /** + * 提交人 + */ + private String userName; + /** + * 备注 + */ + private String remark; + /** + * 创建者 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + + +} \ No newline at end of file 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 cc1df2b..11a7941 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 @@ -94,5 +94,14 @@ public class InspectionPlanDO extends BaseDO { */ private String remark; + /** + * 创建者 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + } \ No newline at end of file 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 f05ef64..5cb3e25 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 @@ -70,5 +70,15 @@ public class InspectionPlanDetailDO extends BaseDO { */ private Integer finishState; + /** + * 创建者 + */ + private String creatorName; + + + /** + * 更新者 + */ + private String updaterName; } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java new file mode 100644 index 0000000..05406ef --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java @@ -0,0 +1,111 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; + +import lombok.*; + +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 养护计划明细 DO + * + * @author 超级管理员 + */ +@TableName("garden_maintain_plan_commit") +@KeySequence("garden_maintain_plan_commit_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MaintainPlanCommitDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 批次号 + */ + private String batchNo; + /** + * 计划编码 + */ + private String planNo; + /** + * 业务线: yl-园林；wy-物业：sz-市政 + */ + private String busiLine; + /** + * 提交次序号 + */ + private Integer sortNum; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 道路ID + */ + private Long roadId; + /** + * 本次完成百分比 + */ + private Double finishPercent; + /** + * 照片host + */ + private String imgHost; + /** + * 开始照片 + */ + private String beginImg; + /** + * 处理中照片 + */ + private String processImg; + /** + * 结束照片 + */ + private String endImg; + /** + * 养护面积:单位m² + */ + private Double opArea; + /** + * 操作时长 + */ + private Double opTime; + /** + * 完成时间 + */ + private LocalDateTime finishTime; + /** + * 提交人用户 + */ + private Long userId; + /** + * 提交人用户ID + */ + private String userName; + /** + * 备注 + */ + private String remark; + /** + * 创建者 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommonUserDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommonUserDO.java new file mode 100644 index 0000000..b5f213a --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommonUserDO.java @@ -0,0 +1,65 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; + +import lombok.*; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 养护计划共同处理人 DO + * + * @author 超级管理员 + */ +@TableName("garden_maintain_plan_common_user") +@KeySequence("garden_maintain_plan_common_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MaintainPlanCommonUserDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 批次号 + */ + private String batchNo; + /** + * 计划编码 + */ + private String planNo; + /** + * 提交次序号 + */ + private Integer sortNum; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 用户ID + */ + private Long userId; + /** + * 用户名 + */ + private String userName; + /** + * 创建者 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + + +} \ No newline at end of file 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 f8fa45b..d31b82b 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 @@ -1,21 +1,107 @@ package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.*; import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; -import lombok.Data; +/** + * 养护计划汇总 DO + * + * @author 超级管理员 + */ @TableName("garden_maintain_plan") -@KeySequence("garden_maintain_plan_seq") +@KeySequence("garden_maintain_plan_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor public class MaintainPlanDO extends BaseDO { + + /** + * ID + */ @TableId private Long id; - private String planNo; + /** + * 批次号 + */ + private String batchNo; + /** + * 计划名称 + */ private String planName; - private Integer type; - private Long deptId; + /** + * 业务线: yl-园林；wy-物业：sz-市政 + */ + private String busiLine; + /** + * 计划属性:1:标准计划；2:临时计划 + */ + private Integer planAttr; + /** + * 养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视; + */ + private Integer planTypeId; + /** + * 归属(一级部门id) + */ private Long companyId; - private String status; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 道路ID + */ + private Long roadId; + /** + * 道路名称 + */ + private String roadName; + /** + * 养护级别: 10:特级；11:一级：12:二级;13:三级 + */ + private Integer levelId; + /** + * 周期ID: 1:日/次；2:周/次；3:月/次；4:年/次 + */ + private Integer cycleId; + /** + * 计划次数 + */ + private Integer planNum; + /** + * 已完成次数 + */ + private Integer planFinishNum; + /** + * 完成状态 : 1:未完成；2:已完成 + */ + private Integer finishState; + /** + * 开始时间 + */ + private LocalDate beginTime; + /** + * 开始时间 + */ + private LocalDate endTime; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + + } \ No newline at end of file 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 new file mode 100644 index 0000000..5928564 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java @@ -0,0 +1,83 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; + +import lombok.*; + +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 养护计划 DO + * + * @author 超级管理员 + */ +@TableName("garden_maintain_plan_detail") +@KeySequence("garden_maintain_plan_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MaintainPlanDetailDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 批次号 + */ + private String batchNo; + /** + * 计划编码 + */ + private String planNo; + /** + * 业务线: yl-园林；wy-物业：sz-市政 + */ + private String busiLine; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 道路ID + */ + private Long roadId; + /** + * 排序号:第n次计划 + */ + private Integer sortNum; + /** + * 执行开始时间 + */ + private LocalDate beginTime; + /** + * 执行时间 + */ + private LocalDate endTime; + /** + * 完成百分比 + */ + private Double finishPercent; + /** + * 完成状态 1:未完成;2:进行中；3:已完成 + */ + private Integer finishState; + /** + * 创建者 + */ + private String creatorName; + /** + * 更新者 + */ + private String updaterName; + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanRoleDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanRoleDO.java new file mode 100644 index 0000000..1ca7f33 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanRoleDO.java @@ -0,0 +1,52 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.maintainplan; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 养护计划角色 DO + * + * @author 超级管理员 + */ +@TableName("garden_maintain_plan_role") +@KeySequence("garden_maintain_plan_role_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MaintainPlanRoleDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 批次号 + */ + private String batchNo; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 道路ID + */ + private Long roadId; + /** + * 角色ID + */ + private Long roleId; + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java new file mode 100644 index 0000000..b271038 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java @@ -0,0 +1,42 @@ +package com.zteits.urbanops.module.garden.dal.mysql.inspectionplan; + + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; + +/** + * 巡检计划提交明细 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface InspectionPlanCommitMapper extends BaseMapperX { + + default PageResult selectPage(InspectionPlanCommitPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InspectionPlanCommitDO::getBatchNo, reqVO.getBatchNo()) + .eqIfPresent(InspectionPlanCommitDO::getPlanNo, reqVO.getPlanNo()) + .eqIfPresent(InspectionPlanCommitDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(InspectionPlanCommitDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(InspectionPlanCommitDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(InspectionPlanCommitDO::getRoadId, reqVO.getRoadId()) + .eqIfPresent(InspectionPlanCommitDO::getImgHost, reqVO.getImgHost()) + .eqIfPresent(InspectionPlanCommitDO::getImg, reqVO.getImg()) + .eqIfPresent(InspectionPlanCommitDO::getInspectionState, reqVO.getInspectionState()) + .eqIfPresent(InspectionPlanCommitDO::getTransState, reqVO.getTransState()) + .eqIfPresent(InspectionPlanCommitDO::getTransWorkNo, reqVO.getTransWorkNo()) + .betweenIfPresent(InspectionPlanCommitDO::getFinishTime, reqVO.getFinishTime()) + .eqIfPresent(InspectionPlanCommitDO::getUserId, reqVO.getUserId()) + .likeIfPresent(InspectionPlanCommitDO::getUserName, reqVO.getUserName()) + .eqIfPresent(InspectionPlanCommitDO::getRemark, reqVO.getRemark()) + .likeIfPresent(InspectionPlanCommitDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(InspectionPlanCommitDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(InspectionPlanCommitDO::getUpdaterName, reqVO.getUpdaterName()) + .orderByDesc(InspectionPlanCommitDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java new file mode 100644 index 0000000..5697345 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java @@ -0,0 +1,45 @@ +package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; + +/** + * 养护计划明细 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface MaintainPlanCommitMapper extends BaseMapperX { + + default PageResult selectPage(MaintainPlanCommitPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanCommitDO::getBatchNo, reqVO.getBatchNo()) + .eqIfPresent(MaintainPlanCommitDO::getPlanNo, reqVO.getPlanNo()) + .eqIfPresent(MaintainPlanCommitDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(MaintainPlanCommitDO::getSortNum, reqVO.getSortNum()) + .eqIfPresent(MaintainPlanCommitDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(MaintainPlanCommitDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(MaintainPlanCommitDO::getRoadId, reqVO.getRoadId()) + .eqIfPresent(MaintainPlanCommitDO::getFinishPercent, reqVO.getFinishPercent()) + .eqIfPresent(MaintainPlanCommitDO::getImgHost, reqVO.getImgHost()) + .eqIfPresent(MaintainPlanCommitDO::getBeginImg, reqVO.getBeginImg()) + .eqIfPresent(MaintainPlanCommitDO::getProcessImg, reqVO.getProcessImg()) + .eqIfPresent(MaintainPlanCommitDO::getEndImg, reqVO.getEndImg()) + .eqIfPresent(MaintainPlanCommitDO::getOpArea, reqVO.getOpArea()) + .betweenIfPresent(MaintainPlanCommitDO::getOpTime, reqVO.getOpTime()) + .betweenIfPresent(MaintainPlanCommitDO::getFinishTime, reqVO.getFinishTime()) + .eqIfPresent(MaintainPlanCommitDO::getUserId, reqVO.getUserId()) + .likeIfPresent(MaintainPlanCommitDO::getUserName, reqVO.getUserName()) + .eqIfPresent(MaintainPlanCommitDO::getRemark, reqVO.getRemark()) + .likeIfPresent(MaintainPlanCommitDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(MaintainPlanCommitDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(MaintainPlanCommitDO::getUpdaterName, reqVO.getUpdaterName()) + .orderByDesc(MaintainPlanCommitDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommonUserMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommonUserMapper.java new file mode 100644 index 0000000..d67ecd4 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommonUserMapper.java @@ -0,0 +1,35 @@ +package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + +import java.util.*; + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; + +/** + * 养护计划共同处理人 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface MaintainPlanCommonUserMapper extends BaseMapperX { + + default PageResult selectPage(MaintainPlanCommonUserPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanCommonUserDO::getBatchNo, reqVO.getBatchNo()) + .eqIfPresent(MaintainPlanCommonUserDO::getPlanNo, reqVO.getPlanNo()) + .eqIfPresent(MaintainPlanCommonUserDO::getSortNum, reqVO.getSortNum()) + .eqIfPresent(MaintainPlanCommonUserDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(MaintainPlanCommonUserDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(MaintainPlanCommonUserDO::getUserId, reqVO.getUserId()) + .likeIfPresent(MaintainPlanCommonUserDO::getUserName, reqVO.getUserName()) + .likeIfPresent(MaintainPlanCommonUserDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(MaintainPlanCommonUserDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(MaintainPlanCommonUserDO::getUpdaterName, reqVO.getUpdaterName()) + .orderByDesc(MaintainPlanCommonUserDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java new file mode 100644 index 0000000..54de22d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java @@ -0,0 +1,38 @@ +package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; + +/** + * 养护计划 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface MaintainPlanDetailMapper extends BaseMapperX { + + default PageResult selectPage(MaintainPlanDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanDetailDO::getBatchNo, reqVO.getBatchNo()) + .eqIfPresent(MaintainPlanDetailDO::getPlanNo, reqVO.getPlanNo()) + .eqIfPresent(MaintainPlanDetailDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(MaintainPlanDetailDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(MaintainPlanDetailDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(MaintainPlanDetailDO::getRoadId, reqVO.getRoadId()) + .eqIfPresent(MaintainPlanDetailDO::getSortNum, reqVO.getSortNum()) + .betweenIfPresent(MaintainPlanDetailDO::getBeginTime, reqVO.getBeginTime()) + .betweenIfPresent(MaintainPlanDetailDO::getEndTime, reqVO.getEndTime()) + .eqIfPresent(MaintainPlanDetailDO::getFinishPercent, reqVO.getFinishPercent()) + .eqIfPresent(MaintainPlanDetailDO::getFinishState, reqVO.getFinishState()) + .likeIfPresent(MaintainPlanDetailDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(MaintainPlanDetailDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(MaintainPlanDetailDO::getUpdaterName, reqVO.getUpdaterName()) + .orderByDesc(MaintainPlanDetailDO::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 1ed25c2..a47171f 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,19 +1,44 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + 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.framework.mybatis.core.mapper.BaseMapperX; 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.*; +/** + * 养护计划汇总 Mapper + * + * @author 超级管理员 + */ @Mapper public interface MaintainPlanMapper extends BaseMapperX { - default PageResult selectPage(com.zteits.urbanops.framework.common.pojo.PageParam pageParam, MaintainPlanDO where) { - return selectPage(pageParam, null, new LambdaQueryWrapperX() - .eqIfPresent(MaintainPlanDO::getType, where.getType()) - .likeIfPresent(MaintainPlanDO::getPlanName, where.getPlanName()) - .eqIfPresent(MaintainPlanDO::getCompanyId, where.getCompanyId()) - .eqIfPresent(MaintainPlanDO::getDeptId, where.getDeptId()) + + default PageResult selectPage(MaintainPlanPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo()) + .likeIfPresent(MaintainPlanDO::getPlanName, reqVO.getPlanName()) + .eqIfPresent(MaintainPlanDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(MaintainPlanDO::getPlanAttr, reqVO.getPlanAttr()) + .eqIfPresent(MaintainPlanDO::getPlanTypeId, reqVO.getPlanTypeId()) + .eqIfPresent(MaintainPlanDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(MaintainPlanDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(MaintainPlanDO::getRoadId, reqVO.getRoadId()) + .likeIfPresent(MaintainPlanDO::getRoadName, reqVO.getRoadName()) + .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId()) + .eqIfPresent(MaintainPlanDO::getCycleId, reqVO.getCycleId()) + .eqIfPresent(MaintainPlanDO::getPlanNum, reqVO.getPlanNum()) + .eqIfPresent(MaintainPlanDO::getPlanFinishNum, reqVO.getPlanFinishNum()) + .eqIfPresent(MaintainPlanDO::getFinishState, reqVO.getFinishState()) + .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime()) + .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime()) + .eqIfPresent(MaintainPlanDO::getRemark, reqVO.getRemark()) + .likeIfPresent(MaintainPlanDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(MaintainPlanDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(MaintainPlanDO::getUpdaterName, reqVO.getUpdaterName()) .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/MaintainPlanRoleMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanRoleMapper.java new file mode 100644 index 0000000..944b6c9 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanRoleMapper.java @@ -0,0 +1,31 @@ +package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; + +import java.util.*; + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; + +/** + * 养护计划角色 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface MaintainPlanRoleMapper extends BaseMapperX { + + default PageResult selectPage(MaintainPlanRolePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaintainPlanRoleDO::getBatchNo, reqVO.getBatchNo()) + .eqIfPresent(MaintainPlanRoleDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(MaintainPlanRoleDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(MaintainPlanRoleDO::getRoadId, reqVO.getRoadId()) + .eqIfPresent(MaintainPlanRoleDO::getRoleId, reqVO.getRoleId()) + .betweenIfPresent(MaintainPlanRoleDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MaintainPlanRoleDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java new file mode 100644 index 0000000..8a4277b --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java @@ -0,0 +1,61 @@ +package com.zteits.urbanops.module.garden.service.inspectionplan; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; + +/** + * 巡检计划提交明细 Service 接口 + * + * @author 超级管理员 + */ +public interface InspectionPlanCommitService { + + /** + * 创建巡检计划提交明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createInspectionPlanCommit(@Valid InspectionPlanCommitSaveReqVO createReqVO); + + /** + * 更新巡检计划提交明细 + * + * @param updateReqVO 更新信息 + */ + void updateInspectionPlanCommit(@Valid InspectionPlanCommitSaveReqVO updateReqVO); + + /** + * 删除巡检计划提交明细 + * + * @param id 编号 + */ + void deleteInspectionPlanCommit(Long id); + + /** + * 批量删除巡检计划提交明细 + * + * @param ids 编号 + */ + void deleteInspectionPlanCommitListByIds(List ids); + + /** + * 获得巡检计划提交明细 + * + * @param id 编号 + * @return 巡检计划提交明细 + */ + InspectionPlanCommitDO getInspectionPlanCommit(Long id); + + /** + * 获得巡检计划提交明细分页 + * + * @param pageReqVO 分页查询 + * @return 巡检计划提交明细分页 + */ + PageResult getInspectionPlanCommitPage(InspectionPlanCommitPageReqVO pageReqVO); + +} \ 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 new file mode 100644 index 0000000..4a349eb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java @@ -0,0 +1,78 @@ +package com.zteits.urbanops.module.garden.service.inspectionplan; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanCommitMapper; + + +/** + * 巡检计划提交明细 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitService { + + @Resource + private InspectionPlanCommitMapper inspectionPlanCommitMapper; + + @Override + public Long createInspectionPlanCommit(InspectionPlanCommitSaveReqVO createReqVO) { + // 插入 + InspectionPlanCommitDO inspectionPlanCommit = BeanUtils.toBean(createReqVO, InspectionPlanCommitDO.class); + inspectionPlanCommitMapper.insert(inspectionPlanCommit); + + // 返回 + return inspectionPlanCommit.getId(); + } + + @Override + public void updateInspectionPlanCommit(InspectionPlanCommitSaveReqVO updateReqVO) { + // 校验存在 + validateInspectionPlanCommitExists(updateReqVO.getId()); + // 更新 + InspectionPlanCommitDO updateObj = BeanUtils.toBean(updateReqVO, InspectionPlanCommitDO.class); + inspectionPlanCommitMapper.updateById(updateObj); + } + + @Override + public void deleteInspectionPlanCommit(Long id) { + // 校验存在 + validateInspectionPlanCommitExists(id); + // 删除 + inspectionPlanCommitMapper.deleteById(id); + } + + @Override + public void deleteInspectionPlanCommitListByIds(List ids) { + // 删除 + inspectionPlanCommitMapper.deleteByIds(ids); + } + + + private void validateInspectionPlanCommitExists(Long id) { + if (inspectionPlanCommitMapper.selectById(id) == null) { + //throw exception(INSPECTION_PLAN_COMMIT_NOT_EXISTS); + } + } + + @Override + public InspectionPlanCommitDO getInspectionPlanCommit(Long id) { + return inspectionPlanCommitMapper.selectById(id); + } + + @Override + public PageResult getInspectionPlanCommitPage(InspectionPlanCommitPageReqVO pageReqVO) { + return inspectionPlanCommitMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file 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 0b1ba8a..dff9775 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 @@ -62,7 +62,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { //存在性校验 validateInspectionPlanExists(createReqVO); LocalDateTime now = LocalDateTime.now(); - String userName = SecurityFrameworkUtils.getLoginUserId()+""; + String userId = SecurityFrameworkUtils.getLoginUserId()+""; + String userName = SecurityFrameworkUtils.getLoginUserNickname(); int rateValue; if (createReqVO.getRateValue().contains("/")) { rateValue = Integer.parseInt(createReqVO.getRateValue().split("/")[1]); @@ -89,8 +90,10 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { inspectionPlan.setPlanNum(planNum); inspectionPlan.setCreateTime(now); inspectionPlan.setUpdateTime(now); - inspectionPlan.setCreator(userName); - inspectionPlan.setUpdater(userName); + inspectionPlan.setCreator(userId); + inspectionPlan.setCreatorName(userName); + inspectionPlan.setUpdater(userId); + inspectionPlan.setUpdaterName(userName); inspectionPlan.setDeptId(roadReqVO.getDeptId()); inspectionPlan.setRoadId(roadReqVO.getRoadId()); inspectionPlan.setRoadName(roadReqVO.getRoadName()); @@ -115,7 +118,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { /*3.插入巡查计划明细*/ for (int i = 0; i < betweenDayList.size(); i++) { String[] dateStr = betweenDayList.get(i).split("/"); - InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now, userName); + InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now); 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"))); @@ -129,7 +132,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { } private InspectionPlanDetailDO getInspectionPlanDetailDO(String batchNo, InspectionPlanSaveReqVO saveReqVO, - InspectionPlanRoadReqVO roadReqVO, LocalDateTime now, String userName) { + InspectionPlanRoadReqVO roadReqVO, LocalDateTime now) { + String userId = SecurityFrameworkUtils.getLoginUserId()+""; + String userName = SecurityFrameworkUtils.getLoginUserNickname(); InspectionPlanDetailDO entity = new InspectionPlanDetailDO(); entity.setBatchNo(batchNo); entity.setPlanNo("P" + DateUtil.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomInt(1000)); @@ -138,8 +143,10 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { entity.setDeptId(roadReqVO.getDeptId()); entity.setRoadId(roadReqVO.getRoadId()); entity.setFinishState(FinishStateEnum.NOT_FINISHED.getStatus()); - entity.setCreator(userName); - entity.setUpdater(userName); + entity.setCreator(userId); + entity.setCreatorName(userName); + entity.setUpdater(userId); + entity.setUpdaterName(userName); entity.setCreateTime(now); entity.setUpdateTime(now); return entity; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java new file mode 100644 index 0000000..2aba25f --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java @@ -0,0 +1,61 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; + +/** + * 养护计划明细 Service 接口 + * + * @author 超级管理员 + */ +public interface MaintainPlanCommitService { + + /** + * 创建养护计划明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaintainPlanCommit(@Valid MaintainPlanCommitSaveReqVO createReqVO); + + /** + * 更新养护计划明细 + * + * @param updateReqVO 更新信息 + */ + void updateMaintainPlanCommit(@Valid MaintainPlanCommitSaveReqVO updateReqVO); + + /** + * 删除养护计划明细 + * + * @param id 编号 + */ + void deleteMaintainPlanCommit(Long id); + + /** + * 批量删除养护计划明细 + * + * @param ids 编号 + */ + void deleteMaintainPlanCommitListByIds(List ids); + + /** + * 获得养护计划明细 + * + * @param id 编号 + * @return 养护计划明细 + */ + MaintainPlanCommitDO getMaintainPlanCommit(Long id); + + /** + * 获得养护计划明细分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划明细分页 + */ + PageResult getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO); + +} \ No newline at end of file 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 new file mode 100644 index 0000000..ce9dd61 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java @@ -0,0 +1,78 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanCommitMapper; + + +/** + * 养护计划明细 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService { + + @Resource + private MaintainPlanCommitMapper maintainPlanCommitMapper; + + @Override + public Long createMaintainPlanCommit(MaintainPlanCommitSaveReqVO createReqVO) { + // 插入 + MaintainPlanCommitDO maintainPlanCommit = BeanUtils.toBean(createReqVO, MaintainPlanCommitDO.class); + maintainPlanCommitMapper.insert(maintainPlanCommit); + + // 返回 + return maintainPlanCommit.getId(); + } + + @Override + public void updateMaintainPlanCommit(MaintainPlanCommitSaveReqVO updateReqVO) { + // 校验存在 + validateMaintainPlanCommitExists(updateReqVO.getId()); + // 更新 + MaintainPlanCommitDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanCommitDO.class); + maintainPlanCommitMapper.updateById(updateObj); + } + + @Override + public void deleteMaintainPlanCommit(Long id) { + // 校验存在 + validateMaintainPlanCommitExists(id); + // 删除 + maintainPlanCommitMapper.deleteById(id); + } + + @Override + public void deleteMaintainPlanCommitListByIds(List ids) { + // 删除 + maintainPlanCommitMapper.deleteByIds(ids); + } + + + private void validateMaintainPlanCommitExists(Long id) { + if (maintainPlanCommitMapper.selectById(id) == null) { + // throw exception(MAINTAIN_PLAN_COMMIT_NOT_EXISTS); + } + } + + @Override + public MaintainPlanCommitDO getMaintainPlanCommit(Long id) { + return maintainPlanCommitMapper.selectById(id); + } + + @Override + public PageResult getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO) { + return maintainPlanCommitMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserService.java new file mode 100644 index 0000000..8859d85 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserService.java @@ -0,0 +1,61 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; + +/** + * 养护计划共同处理人 Service 接口 + * + * @author 超级管理员 + */ +public interface MaintainPlanCommonUserService { + + /** + * 创建养护计划共同处理人 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaintainPlanCommonUser(@Valid MaintainPlanCommonUserSaveReqVO createReqVO); + + /** + * 更新养护计划共同处理人 + * + * @param updateReqVO 更新信息 + */ + void updateMaintainPlanCommonUser(@Valid MaintainPlanCommonUserSaveReqVO updateReqVO); + + /** + * 删除养护计划共同处理人 + * + * @param id 编号 + */ + void deleteMaintainPlanCommonUser(Long id); + + /** + * 批量删除养护计划共同处理人 + * + * @param ids 编号 + */ + void deleteMaintainPlanCommonUserListByIds(List ids); + + /** + * 获得养护计划共同处理人 + * + * @param id 编号 + * @return 养护计划共同处理人 + */ + MaintainPlanCommonUserDO getMaintainPlanCommonUser(Long id); + + /** + * 获得养护计划共同处理人分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划共同处理人分页 + */ + PageResult getMaintainPlanCommonUserPage(MaintainPlanCommonUserPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserServiceImpl.java new file mode 100644 index 0000000..a6bfc3d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommonUserServiceImpl.java @@ -0,0 +1,78 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanCommonUserMapper; + + +/** + * 养护计划共同处理人 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class MaintainPlanCommonUserServiceImpl implements MaintainPlanCommonUserService { + + @Resource + private MaintainPlanCommonUserMapper maintainPlanCommonUserMapper; + + @Override + public Long createMaintainPlanCommonUser(MaintainPlanCommonUserSaveReqVO createReqVO) { + // 插入 + MaintainPlanCommonUserDO maintainPlanCommonUser = BeanUtils.toBean(createReqVO, MaintainPlanCommonUserDO.class); + maintainPlanCommonUserMapper.insert(maintainPlanCommonUser); + + // 返回 + return maintainPlanCommonUser.getId(); + } + + @Override + public void updateMaintainPlanCommonUser(MaintainPlanCommonUserSaveReqVO updateReqVO) { + // 校验存在 + validateMaintainPlanCommonUserExists(updateReqVO.getId()); + // 更新 + MaintainPlanCommonUserDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanCommonUserDO.class); + maintainPlanCommonUserMapper.updateById(updateObj); + } + + @Override + public void deleteMaintainPlanCommonUser(Long id) { + // 校验存在 + validateMaintainPlanCommonUserExists(id); + // 删除 + maintainPlanCommonUserMapper.deleteById(id); + } + + @Override + public void deleteMaintainPlanCommonUserListByIds(List ids) { + // 删除 + maintainPlanCommonUserMapper.deleteByIds(ids); + } + + + private void validateMaintainPlanCommonUserExists(Long id) { + if (maintainPlanCommonUserMapper.selectById(id) == null) { + // throw exception(MAINTAIN_PLAN_COMMON_USER_NOT_EXISTS); + } + } + + @Override + public MaintainPlanCommonUserDO getMaintainPlanCommonUser(Long id) { + return maintainPlanCommonUserMapper.selectById(id); + } + + @Override + public PageResult getMaintainPlanCommonUserPage(MaintainPlanCommonUserPageReqVO pageReqVO) { + return maintainPlanCommonUserMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java new file mode 100644 index 0000000..0095d11 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java @@ -0,0 +1,61 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; + +/** + * 养护计划 Service 接口 + * + * @author 超级管理员 + */ +public interface MaintainPlanDetailService { + + /** + * 创建养护计划 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaintainPlanDetail(@Valid MaintainPlanDetailSaveReqVO createReqVO); + + /** + * 更新养护计划 + * + * @param updateReqVO 更新信息 + */ + void updateMaintainPlanDetail(@Valid MaintainPlanDetailSaveReqVO updateReqVO); + + /** + * 删除养护计划 + * + * @param id 编号 + */ + void deleteMaintainPlanDetail(Long id); + + /** + * 批量删除养护计划 + * + * @param ids 编号 + */ + void deleteMaintainPlanDetailListByIds(List ids); + + /** + * 获得养护计划 + * + * @param id 编号 + * @return 养护计划 + */ + MaintainPlanDetailDO getMaintainPlanDetail(Long id); + + /** + * 获得养护计划分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划分页 + */ + PageResult getMaintainPlanDetailPage(MaintainPlanDetailPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java new file mode 100644 index 0000000..0c3b458 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java @@ -0,0 +1,78 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper; + + +/** + * 养护计划 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService { + + @Resource + private MaintainPlanDetailMapper maintainPlanDetailMapper; + + @Override + public Long createMaintainPlanDetail(MaintainPlanDetailSaveReqVO createReqVO) { + // 插入 + MaintainPlanDetailDO maintainPlanDetail = BeanUtils.toBean(createReqVO, MaintainPlanDetailDO.class); + maintainPlanDetailMapper.insert(maintainPlanDetail); + + // 返回 + return maintainPlanDetail.getId(); + } + + @Override + public void updateMaintainPlanDetail(MaintainPlanDetailSaveReqVO updateReqVO) { + // 校验存在 + validateMaintainPlanDetailExists(updateReqVO.getId()); + // 更新 + MaintainPlanDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanDetailDO.class); + maintainPlanDetailMapper.updateById(updateObj); + } + + @Override + public void deleteMaintainPlanDetail(Long id) { + // 校验存在 + validateMaintainPlanDetailExists(id); + // 删除 + maintainPlanDetailMapper.deleteById(id); + } + + @Override + public void deleteMaintainPlanDetailListByIds(List ids) { + // 删除 + maintainPlanDetailMapper.deleteByIds(ids); + } + + + private void validateMaintainPlanDetailExists(Long id) { + if (maintainPlanDetailMapper.selectById(id) == null) { + //throw exception(MAINTAIN_PLAN_DETAIL_NOT_EXISTS); + } + } + + @Override + public MaintainPlanDetailDO getMaintainPlanDetail(Long id) { + return maintainPlanDetailMapper.selectById(id); + } + + @Override + public PageResult getMaintainPlanDetailPage(MaintainPlanDetailPageReqVO pageReqVO) { + return maintainPlanDetailMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleService.java new file mode 100644 index 0000000..453cfbb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleService.java @@ -0,0 +1,62 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; + +/** + * 养护计划角色 Service 接口 + * + * @author 超级管理员 + */ +public interface MaintainPlanRoleService { + + /** + * 创建养护计划角色 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaintainPlanRole(@Valid MaintainPlanRoleSaveReqVO createReqVO); + + /** + * 更新养护计划角色 + * + * @param updateReqVO 更新信息 + */ + void updateMaintainPlanRole(@Valid MaintainPlanRoleSaveReqVO updateReqVO); + + /** + * 删除养护计划角色 + * + * @param id 编号 + */ + void deleteMaintainPlanRole(Long id); + + /** + * 批量删除养护计划角色 + * + * @param ids 编号 + */ + void deleteMaintainPlanRoleListByIds(List ids); + + /** + * 获得养护计划角色 + * + * @param id 编号 + * @return 养护计划角色 + */ + MaintainPlanRoleDO getMaintainPlanRole(Long id); + + /** + * 获得养护计划角色分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划角色分页 + */ + PageResult getMaintainPlanRolePage(MaintainPlanRolePageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleServiceImpl.java new file mode 100644 index 0000000..b8d02c4 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanRoleServiceImpl.java @@ -0,0 +1,85 @@ +package com.zteits.urbanops.module.garden.service.maintainplan; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; +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.maintainplan.MaintainPlanRoleMapper; + +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; + +/** + * 养护计划角色 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class MaintainPlanRoleServiceImpl implements MaintainPlanRoleService { + + @Resource + private MaintainPlanRoleMapper maintainPlanRoleMapper; + + @Override + public Long createMaintainPlanRole(MaintainPlanRoleSaveReqVO createReqVO) { + // 插入 + MaintainPlanRoleDO maintainPlanRole = BeanUtils.toBean(createReqVO, MaintainPlanRoleDO.class); + maintainPlanRoleMapper.insert(maintainPlanRole); + + // 返回 + return maintainPlanRole.getId(); + } + + @Override + public void updateMaintainPlanRole(MaintainPlanRoleSaveReqVO updateReqVO) { + // 校验存在 + validateMaintainPlanRoleExists(updateReqVO.getId()); + // 更新 + MaintainPlanRoleDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanRoleDO.class); + maintainPlanRoleMapper.updateById(updateObj); + } + + @Override + public void deleteMaintainPlanRole(Long id) { + // 校验存在 + validateMaintainPlanRoleExists(id); + // 删除 + maintainPlanRoleMapper.deleteById(id); + } + + @Override + public void deleteMaintainPlanRoleListByIds(List ids) { + // 删除 + maintainPlanRoleMapper.deleteByIds(ids); + } + + + private void validateMaintainPlanRoleExists(Long id) { + if (maintainPlanRoleMapper.selectById(id) == null) { + // throw exception(MAINTAIN_PLAN_ROLE_NOT_EXISTS); + } + } + + @Override + public MaintainPlanRoleDO getMaintainPlanRole(Long id) { + return maintainPlanRoleMapper.selectById(id); + } + + @Override + public PageResult getMaintainPlanRolePage(MaintainPlanRolePageReqVO pageReqVO) { + return maintainPlanRoleMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file 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 f219c7c..d169411 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 @@ -1,13 +1,62 @@ package com.zteits.urbanops.module.garden.service.maintainplan; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanAddReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanForPageReqVO; +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; +/** + * 养护计划汇总 Service 接口 + * + * @author 超级管理员 + */ public interface MaintainPlanService { - PageResult selectPage(MaintainPlanForPageReqVO reqVO); - MaintainPlanDO selectByPlanNo(String planNo); - Boolean insert(MaintainPlanAddReqVO reqVO, Long companyId, Long deptId); - Boolean deleteById(Long id); + + /** + * 创建养护计划汇总 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaintainPlan(@Valid MaintainPlanSaveReqVO createReqVO); + + /** + * 更新养护计划汇总 + * + * @param updateReqVO 更新信息 + */ + void updateMaintainPlan(@Valid MaintainPlanSaveReqVO updateReqVO); + + /** + * 删除养护计划汇总 + * + * @param id 编号 + */ + void deleteMaintainPlan(Long id); + + /** + * 批量删除养护计划汇总 + * + * @param ids 编号 + */ + void deleteMaintainPlanListByIds(List ids); + + /** + * 获得养护计划汇总 + * + * @param id 编号 + * @return 养护计划汇总 + */ + MaintainPlanDO getMaintainPlan(Long id); + + /** + * 获得养护计划汇总分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划汇总分页 + */ + PageResult getMaintainPlanPage(MaintainPlanPageReqVO 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 b0d831e..382551f 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,51 +1,85 @@ package com.zteits.urbanops.module.garden.service.maintainplan; -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanAddReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanForPageReqVO; +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; +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.maintainplan.MaintainPlanMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; + +/** + * 养护计划汇总 Service 实现类 + * + * @author 超级管理员 + */ @Service +@Validated public class MaintainPlanServiceImpl implements MaintainPlanService { @Resource private MaintainPlanMapper maintainPlanMapper; @Override - public PageResult selectPage(MaintainPlanForPageReqVO reqVO) { - MaintainPlanDO where = new MaintainPlanDO(); - where.setType(reqVO.getType()); - where.setPlanName(reqVO.getPlanName()); - PageParam page = new PageParam(); - page.setPageNo(reqVO.getPageNo()); - page.setPageSize(reqVO.getPageSize()); - return maintainPlanMapper.selectPage(page, where); + public Long createMaintainPlan(MaintainPlanSaveReqVO createReqVO) { + // 插入 + MaintainPlanDO maintainPlan = BeanUtils.toBean(createReqVO, MaintainPlanDO.class); + maintainPlanMapper.insert(maintainPlan); + + // 返回 + return maintainPlan.getId(); + } + + @Override + public void updateMaintainPlan(MaintainPlanSaveReqVO updateReqVO) { + // 校验存在 + validateMaintainPlanExists(updateReqVO.getId()); + // 更新 + MaintainPlanDO updateObj = BeanUtils.toBean(updateReqVO, MaintainPlanDO.class); + maintainPlanMapper.updateById(updateObj); + } + + @Override + public void deleteMaintainPlan(Long id) { + // 校验存在 + validateMaintainPlanExists(id); + // 删除 + maintainPlanMapper.deleteById(id); } @Override - public MaintainPlanDO selectByPlanNo(String planNo) { - return maintainPlanMapper.selectOne(new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX() - .eq(MaintainPlanDO::getPlanNo, planNo)); + public void deleteMaintainPlanListByIds(List ids) { + // 删除 + maintainPlanMapper.deleteByIds(ids); + } + + + private void validateMaintainPlanExists(Long id) { + if (maintainPlanMapper.selectById(id) == null) { + // throw exception(MAINTAIN_PLAN_NOT_EXISTS); + } } @Override - public Boolean insert(MaintainPlanAddReqVO reqVO, Long companyId, Long deptId) { - MaintainPlanDO entity = new MaintainPlanDO(); - entity.setPlanNo(reqVO.getPlanNo()); - entity.setPlanName(reqVO.getPlanName()); - entity.setType(reqVO.getType()); - entity.setCompanyId(companyId); - entity.setDeptId(deptId); - entity.setStatus("0"); - return maintainPlanMapper.insert(entity) > 0; + public MaintainPlanDO getMaintainPlan(Long id) { + return maintainPlanMapper.selectById(id); } @Override - public Boolean deleteById(Long id) { - return maintainPlanMapper.deleteById(id) > 0; + public PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO) { + return maintainPlanMapper.selectPage(pageReqVO); } + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml new file mode 100644 index 0000000..1c3ab50 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml new file mode 100644 index 0000000..200a01f --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommonUserMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommonUserMapper.xml new file mode 100644 index 0000000..28ef63e --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommonUserMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml new file mode 100644 index 0000000..627a695 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml new file mode 100644 index 0000000..c553792 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanRoleMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanRoleMapper.xml new file mode 100644 index 0000000..8c2f558 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanRoleMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file