diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/MaintainRateController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/MaintainRateController.java deleted file mode 100644 index b1c5c0b..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/MaintainRateController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainrate; - -import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRatePageReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateRespVO; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainrate.MaintainRateDO; -import com.zteits.urbanops.module.garden.service.maintainrate.MaintainRateService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.util.List; - -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; -import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; - -@Tag(name = "管理后台 - 养护频次") -@RestController -@RequestMapping("/maintain/rate") -public class MaintainRateController { - - @Resource - private MaintainRateService maintainRateService; - - @PostMapping("/listForPage") - @Operation(summary = "养护频次-分页查询") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')") - public CommonResult> listForPage(@Valid @RequestBody MaintainRatePageReqVO reqVO) { - return success(maintainRateService.selectPage(reqVO)); - } - - @PostMapping("/getMaintainRateValue") - @Operation(summary = "养护频次-获取养护频次值") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')") - public CommonResult getMaintainRateValue(@Valid @RequestBody MaintainRateReqVO reqVO) { - return success(maintainRateService.getMaintainRateValue(reqVO)); - } - - @GetMapping("/selectMaintainRateByLevel") - @Operation(summary = "通过植物类型获取养护频次值") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')") - public CommonResult selectMaintainRateByLevel(@RequestParam("maintain_type_id") Integer maintainTypeId, - @RequestParam("level") Integer level) { - return success(maintainRateService.selectMaintainRateByLevel(maintainTypeId, level)); - } - - @GetMapping("/export") - @Operation(summary = "导出养护频次列表") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportExcel(@Valid MaintainRatePageReqVO reqVO, HttpServletResponse response) throws IOException { - List list = maintainRateService.selectPage(reqVO).getList(); - ExcelUtils.write(response, "养护频次.xls", "数据", MaintainRateDO.class, - BeanUtils.toBean(list, MaintainRateDO.class)); - } - - @GetMapping("/{id}") - @Operation(summary = "养护频次-详情") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')") - public CommonResult getInfo(@PathVariable("id") Long id) { - return success(maintainRateService.selectById(id)); - } - - @PostMapping("/add") - @Operation(summary = "养护频次-添加") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:create')") - public CommonResult add(@Valid @RequestBody MaintainRateDO entity) { - entity.setStatus("0"); - return success(maintainRateService.insert(entity)); - } - - @PostMapping("/edit") - @Operation(summary = "养护频次-修改") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:update')") - public CommonResult edit(@Valid @RequestBody MaintainRateDO entity) { - return success(maintainRateService.update(entity)); - } - - @GetMapping("/delete/byId") - @Operation(summary = "养护频次-删除") - @PreAuthorize("@ss.hasPermission('garden:maintain-rate:delete')") - public CommonResult deleteById(@RequestParam("id") Long id) { - return success(maintainRateService.deleteById(id)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRatePageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRatePageReqVO.java deleted file mode 100644 index d84cab3..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRatePageReqVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class MaintainRatePageReqVO extends PageParam { - @Schema(description = "类型:1巡查;2养护") - private Integer type; - - @Schema(description = "科目ID") - private Integer maintainSubjectId; - - @Schema(description = "科目名称") - private String maintainSubjectName; - - @Schema(description = "养护类型ID") - private Integer maintainTypeId; - - @Schema(description = "养护类型名称") - private String maintainTypeName; - - @Schema(description = "周期ID") - private Integer cycleId; - - @Schema(description = "周期名称") - private String cycleName; - - @Schema(description = "状态") - private String status; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateReqVO.java deleted file mode 100644 index 6e237e7..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateReqVO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class MaintainRateReqVO { - @NotNull - @Schema(description = "科目ID") - private Integer maintainSubjectId; - - @NotNull - @Schema(description = "养护类型ID") - private Integer maintainTypeId; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateRespVO.java deleted file mode 100644 index ccbb556..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainrate/vo/MaintainRateRespVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class MaintainRateRespVO { - @Schema(description = "养护类型ID") - private Integer maintainTypeId; - @Schema(description = "养护类型名称") - private String maintainTypeName; - - @Schema(description = "周期ID") - private Integer cycleId; - @Schema(description = "周期名称") - private String cycleName; - - @Schema(description = "特级频次") - private String levelTop; - @Schema(description = "一级频次") - private String levelOne; - @Schema(description = "二级频次") - private String levelTwo; - @Schema(description = "三级频次") - private String levelThree; - - @Schema(description = "根据等级选择的频次值") - private String value; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java new file mode 100644 index 0000000..f158202 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java @@ -0,0 +1,104 @@ +package com.zteits.urbanops.module.garden.controller.admin.road; + +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.road.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; +import com.zteits.urbanops.module.garden.service.road.RoadService; + +@Tag(name = "管理后台 - 道路管理") +@RestController +@RequestMapping("/garden/road") +@Validated +public class RoadController { + + @Resource + private RoadService roadService; + + @PostMapping("/create") + @Operation(summary = "创建道路管理") + @PreAuthorize("@ss.hasPermission('garden:road:create')") + public CommonResult createRoad(@Valid @RequestBody RoadSaveReqVO createReqVO) { + return success(roadService.createRoad(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新道路管理") + @PreAuthorize("@ss.hasPermission('garden:road:update')") + public CommonResult updateRoad(@Valid @RequestBody RoadSaveReqVO updateReqVO) { + roadService.updateRoad(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除道路管理") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:road:delete')") + public CommonResult deleteRoad(@RequestParam("id") Long id) { + roadService.deleteRoad(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除道路管理") + @PreAuthorize("@ss.hasPermission('garden:road:delete')") + public CommonResult deleteRoadList(@RequestParam("ids") List ids) { + roadService.deleteRoadListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得道路管理") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:road:query')") + public CommonResult getRoad(@RequestParam("id") Long id) { + RoadDO road = roadService.getRoad(id); + return success(BeanUtils.toBean(road, RoadRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得道路管理分页") + @PreAuthorize("@ss.hasPermission('garden:road:query')") + public CommonResult> getRoadPage(@Valid RoadPageReqVO pageReqVO) { + PageResult pageResult = roadService.getRoadPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, RoadRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出道路管理 Excel") + @PreAuthorize("@ss.hasPermission('garden:road:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportRoadExcel(@Valid RoadPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = roadService.getRoadPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "道路管理.xls", "数据", RoadRespVO.class, + BeanUtils.toBean(list, RoadRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java new file mode 100644 index 0000000..10d3f00 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java @@ -0,0 +1,77 @@ +package com.zteits.urbanops.module.garden.controller.admin.road.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 RoadPageReqVO extends PageParam { + + @Schema(description = "道路名称", example = "赵六") + private String roadName; + + @Schema(description = "街道ID", example = "30480") + private String streetId; + + @Schema(description = "街道名称", example = "赵六") + private String streetName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "26337") + private Integer levelId; + + @Schema(description = "行道树绿化面积") + private String greenBeltTreeArea; + + @Schema(description = "绿化带面积") + private String greenBeltArea; + + @Schema(description = "总绿化带面积") + private String totalArea; + + @Schema(description = "行道树(棵)面积") + private String treeArea; + + @Schema(description = "起点经度") + private String startingLatitude; + + @Schema(description = "起点维度") + private String startingLongitude; + + @Schema(description = "起点描述", example = "你猜") + private String startingRemark; + + @Schema(description = "终点经度") + private String endLatitude; + + @Schema(description = "终点维度") + private String endLongitude; + + @Schema(description = "终点描述", example = "你猜") + private String endRemark; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "归属(一级部门id)", example = "2323") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", example = "13872") + private Long deptId; + + @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/road/vo/RoadRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java new file mode 100644 index 0000000..fb2167d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java @@ -0,0 +1,99 @@ +package com.zteits.urbanops.module.garden.controller.admin.road.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 RoadRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15456") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "道路名称", example = "赵六") + @ExcelProperty("道路名称") + private String roadName; + + @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30480") + @ExcelProperty("街道ID") + private String streetId; + + @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("街道名称") + private String streetName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "26337") + @ExcelProperty("养护级别: 10:特级；11:一级：12:二级;13:三级") + private Integer levelId; + + @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("行道树绿化面积") + private String greenBeltTreeArea; + + @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("绿化带面积") + private String greenBeltArea; + + @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("总绿化带面积") + private String totalArea; + + @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("行道树(棵)面积") + private String treeArea; + + @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("起点经度") + private String startingLatitude; + + @Schema(description = "起点维度", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("起点维度") + private String startingLongitude; + + @Schema(description = "起点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("起点描述") + private String startingRemark; + + @Schema(description = "终点经度", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("终点经度") + private String endLatitude; + + @Schema(description = "终点维度", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("终点维度") + private String endLongitude; + + @Schema(description = "终点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("终点描述") + private String endRemark; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "13872") + @ExcelProperty("部门ID(道路负责部门id)") + private Long deptId; + + @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/road/vo/RoadSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java new file mode 100644 index 0000000..c867d9d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java @@ -0,0 +1,90 @@ +package com.zteits.urbanops.module.garden.controller.admin.road.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 道路管理新增/修改 Request VO") +@Data +public class RoadSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15456") + private Long id; + + @Schema(description = "道路名称", example = "赵六") + private String roadName; + + @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30480") + @NotEmpty(message = "街道ID不能为空") + private String streetId; + + @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "街道名称不能为空") + private String streetName; + + @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "26337") + @NotNull(message = "养护级别: 10:特级；11:一级：12:二级;13:三级不能为空") + private Integer levelId; + + @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "行道树绿化面积不能为空") + private String greenBeltTreeArea; + + @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "绿化带面积不能为空") + private String greenBeltArea; + + @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "总绿化带面积不能为空") + private String totalArea; + + @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "行道树(棵)面积不能为空") + private String treeArea; + + @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "起点经度不能为空") + private String startingLatitude; + + @Schema(description = "起点维度", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "起点维度不能为空") + private String startingLongitude; + + @Schema(description = "起点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "起点描述不能为空") + private String startingRemark; + + @Schema(description = "终点经度", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "终点经度不能为空") + private String endLatitude; + + @Schema(description = "终点维度", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "终点维度不能为空") + private String endLongitude; + + @Schema(description = "终点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "终点描述不能为空") + private String endRemark; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") + @NotEmpty(message = "备注不能为空") + private String remark; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "13872") + @NotNull(message = "部门ID(道路负责部门id)不能为空") + private Long deptId; + + @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/roadmanager/RoadManagerController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/RoadManagerController.java deleted file mode 100644 index 138eba9..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/RoadManagerController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.roadmanager; - -import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; -import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; -import com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo.RoadManagerPageReqVO; -import com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo.RoadManagerSaveReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadManagerDO; -import com.zteits.urbanops.module.garden.service.road.RoadManagerService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.util.List; - -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; -import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; - -@Tag(name = "管理后台 - 道路数据管理") -@RestController -@RequestMapping("/road/manager") -public class RoadManagerController { - - @Resource - private RoadManagerService roadManagerService; - - @PostMapping("/listForPage") - @Operation(summary = "道路数据管理-分页") - @PreAuthorize("@ss.hasPermission('garden:road-manager:query')") - public CommonResult> listForPage(@Valid @RequestBody RoadManagerPageReqVO reqVO) { - return success(roadManagerService.selectPage(reqVO)); - } - - @GetMapping("/export") - @Operation(summary = "道路数据管理-导出") - @PreAuthorize("@ss.hasPermission('garden:road-manager:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportExcel(RoadManagerPageReqVO reqVO, HttpServletResponse response) throws IOException { - List list = roadManagerService.selectPage(reqVO).getList(); - ExcelUtils.write(response, "道路数据.xls", "数据", RoadManagerDO.class, - BeanUtils.toBean(list, RoadManagerDO.class)); - } - - @GetMapping("/getById") - @Operation(summary = "道路数据管理-详情") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('garden:road-manager:query')") - public CommonResult getById(@RequestParam("id") Long id) { - return success(roadManagerService.selectById(id)); - } - - @PostMapping("/add") - @Operation(summary = "道路数据管理-添加") - @PreAuthorize("@ss.hasPermission('garden:road-manager:create')") - public CommonResult add(@Valid @RequestBody RoadManagerSaveReqVO reqVO) { - RoadManagerDO entity = BeanUtils.toBean(reqVO, RoadManagerDO.class); - entity.setStatus(0); - return success(roadManagerService.insert(entity)); - } - - @PostMapping("/edit") - @Operation(summary = "道路数据管理-修改") - @PreAuthorize("@ss.hasPermission('garden:road-manager:update')") - public CommonResult edit(@Valid @RequestBody RoadManagerSaveReqVO reqVO) { - RoadManagerDO entity = BeanUtils.toBean(reqVO, RoadManagerDO.class); - entity.setStatus(0); - return success(roadManagerService.update(entity)); - } - - @GetMapping("/deleteById") - @Operation(summary = "道路数据管理-删除") - @PreAuthorize("@ss.hasPermission('garden:road-manager:delete')") - public CommonResult deleteById(@RequestParam("id") Long id) { - return success(roadManagerService.deleteById(id)); - } - - @GetMapping("/list") - @Operation(summary = "道路数据管理-列表") - @PreAuthorize("@ss.hasPermission('garden:road-manager:query')") - public CommonResult> list(@RequestParam(value = "company_id", required = false) Long companyId) { - RoadManagerDO where = new RoadManagerDO(); - where.setCompanyId(companyId); - return success(roadManagerService.selectList(where)); - } - - @GetMapping("/tree") - @Operation(summary = "道路数据管理-树") - @PreAuthorize("@ss.hasPermission('garden:road-manager:query')") - public CommonResult> tree(@RequestParam(value = "company_id", required = false) Long companyId) { - RoadManagerDO where = new RoadManagerDO(); - where.setCompanyId(companyId); - return success(roadManagerService.selectList(where)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerPageReqVO.java deleted file mode 100644 index 465dcd2..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerPageReqVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class RoadManagerPageReqVO extends PageParam { - @Schema(description = "道路名称") - private String roadName; - @Schema(description = "街道ID") - private String streetId; - @Schema(description = "街道名称") - private String streetName; - @Schema(description = "养护级别ID") - private Integer curingLevelId; - @Schema(description = "养护级别") - private String curingLevelName; - @Schema(description = "公司ID") - private Long companyId; - @Schema(description = "部门ID") - private Long deptId; - @Schema(description = "状态") - private Integer status; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerSaveReqVO.java deleted file mode 100644 index 01faa64..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/roadmanager/vo/RoadManagerSaveReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class RoadManagerSaveReqVO { - private Long id; - @NotEmpty - @Schema(description = "道路名称") - private String roadName; - private String streetId; - private String streetName; - private Integer curingLevelId; - private String curingLevelName; - private String greenBeltTreeArea; - private String greenBeltArea; - private String totalArea; - private String treeArea; - private String startingLatitude; - private String startingLongitude; - private String startingRemark; - private String endLatitude; - private String endLongitude; - private String endRemark; - private Integer status; - private Long companyId; - private String companyName; - private Long deptId; - private String roadAttr; - private String direction; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/StandingBookController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/StandingBookController.java deleted file mode 100644 index 5712b09..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/StandingBookController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.standingbook; - -import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.standingbook.vo.StandingBookPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.standingbook.StandingBookDO; -import com.zteits.urbanops.module.garden.service.standingbook.StandingBookService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 年度基础台账") -@RestController -@RequestMapping("/standing/book") -public class StandingBookController { - - @Resource - private StandingBookService standingBookService; - - @PostMapping("/listForPage") - @Operation(summary = "年度基础台账-分页") - public CommonResult> listForPage(@RequestBody StandingBookPageReqVO reqVO) { - PageParam page = new PageParam(); - page.setPageNo(reqVO.getPageNo()); - page.setPageSize(reqVO.getPageSize()); - return success(standingBookService.selectPage(page, reqVO)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/vo/StandingBookPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/vo/StandingBookPageReqVO.java deleted file mode 100644 index 774d8ea..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/standingbook/vo/StandingBookPageReqVO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.standingbook.vo; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import lombok.Data; - -@Data -public class StandingBookPageReqVO extends PageParam { - private String standingBookYear; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainrate/MaintainRateDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainrate/MaintainRateDO.java deleted file mode 100644 index 5cbcffa..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainrate/MaintainRateDO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.dataobject.maintainrate; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -/** - * 养护频次 DO - */ -@TableName("garden_maintain_rate") -@KeySequence("garden_maintain_rate_seq") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MaintainRateDO extends BaseDO { - - @TableId - private Long id; - - private Integer type; - - private Integer maintainSubjectId; - private String maintainSubjectName; - - private Integer maintainTypeId; - private String maintainTypeName; - - private String levelTop; - private String levelOne; - private String levelTwo; - private String levelThree; - - private Integer cycleId; - private String cycleName; - - private String status; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java new file mode 100644 index 0000000..e052cb6 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java @@ -0,0 +1,108 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.road; + +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_road") +@KeySequence("garden_road_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RoadDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 道路名称 + */ + private String roadName; + /** + * 街道ID + */ + private String streetId; + /** + * 街道名称 + */ + private String streetName; + /** + * 养护级别: 10:特级；11:一级：12:二级;13:三级 + */ + private Integer levelId; + /** + * 行道树绿化面积 + */ + private String greenBeltTreeArea; + /** + * 绿化带面积 + */ + private String greenBeltArea; + /** + * 总绿化带面积 + */ + private String totalArea; + /** + * 行道树(棵)面积 + */ + private String treeArea; + /** + * 起点经度 + */ + private String startingLatitude; + /** + * 起点维度 + */ + private String startingLongitude; + /** + * 起点描述 + */ + private String startingRemark; + /** + * 终点经度 + */ + private String endLatitude; + /** + * 终点维度 + */ + private String endLongitude; + /** + * 终点描述 + */ + private String endRemark; + /** + * 备注 + */ + private String remark; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID(道路负责部门id) + */ + private Long deptId; + /** + * 创建者 + */ + 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/road/RoadManagerDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadManagerDO.java deleted file mode 100644 index b415cb0..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadManagerDO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.dataobject.road; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; -import lombok.Data; - -@TableName("garden_road_manager") -@KeySequence("garden_road_manager_seq") -@Data -public class RoadManagerDO extends BaseDO { - @TableId - private Long id; - private String roadName; - private String streetId; - private String streetName; - private Integer curingLevelId; - private String curingLevelName; - private String greenBeltTreeArea; - private String greenBeltArea; - private String totalArea; - private String treeArea; - private String startingLatitude; - private String startingLongitude; - private String startingRemark; - private String endLatitude; - private String endLongitude; - private String endRemark; - private Integer status; - private Long companyId; - private String companyName; - private Long deptId; - private String roadAttr; - private String direction; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/standingbook/StandingBookDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/standingbook/StandingBookDO.java deleted file mode 100644 index 6cb56bc..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/standingbook/StandingBookDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.dataobject.standingbook; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; -import lombok.Data; - -@TableName("garden_standing_book") -@Data -public class StandingBookDO extends BaseDO { - @TableId - private Long id; - private String standingBookNo; - private String standingBookYear; - private Long belongCompanyId; -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainrate/MaintainRateMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainrate/MaintainRateMapper.java deleted file mode 100644 index 22a22f4..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainrate/MaintainRateMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.mysql.maintainrate; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainrate.MaintainRateDO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRatePageReqVO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MaintainRateMapper extends BaseMapperX { - - default PageResult selectPage(MaintainRatePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaintainRateDO::getType, reqVO.getType()) - .eqIfPresent(MaintainRateDO::getMaintainSubjectId, reqVO.getMaintainSubjectId()) - .likeIfPresent(MaintainRateDO::getMaintainSubjectName, reqVO.getMaintainSubjectName()) - .eqIfPresent(MaintainRateDO::getMaintainTypeId, reqVO.getMaintainTypeId()) - .likeIfPresent(MaintainRateDO::getMaintainTypeName, reqVO.getMaintainTypeName()) - .eqIfPresent(MaintainRateDO::getCycleId, reqVO.getCycleId()) - .likeIfPresent(MaintainRateDO::getCycleName, reqVO.getCycleName()) - .eqIfPresent(MaintainRateDO::getStatus, reqVO.getStatus()) - .orderByDesc(MaintainRateDO::getId)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadManagerMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadManagerMapper.java deleted file mode 100644 index a571fd3..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadManagerMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.mysql.road; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo.RoadManagerPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadManagerDO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RoadManagerMapper extends BaseMapperX { - - default PageResult selectPage(RoadManagerPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(RoadManagerDO::getRoadName, reqVO.getRoadName()) - .eqIfPresent(RoadManagerDO::getStreetId, reqVO.getStreetId()) - .likeIfPresent(RoadManagerDO::getStreetName, reqVO.getStreetName()) - .eqIfPresent(RoadManagerDO::getCuringLevelId, reqVO.getCuringLevelId()) - .likeIfPresent(RoadManagerDO::getCuringLevelName, reqVO.getCuringLevelName()) - .eqIfPresent(RoadManagerDO::getCompanyId, reqVO.getCompanyId()) - .eqIfPresent(RoadManagerDO::getDeptId, reqVO.getDeptId()) - .eqIfPresent(RoadManagerDO::getStatus, reqVO.getStatus()) - .orderByDesc(RoadManagerDO::getId)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadMapper.java new file mode 100644 index 0000000..406671d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadMapper.java @@ -0,0 +1,45 @@ +package com.zteits.urbanops.module.garden.dal.mysql.road; + +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.road.RoadDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.road.vo.*; + +/** + * 道路管理 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface RoadMapper extends BaseMapperX { + + default PageResult selectPage(RoadPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(RoadDO::getRoadName, reqVO.getRoadName()) + .eqIfPresent(RoadDO::getStreetId, reqVO.getStreetId()) + .likeIfPresent(RoadDO::getStreetName, reqVO.getStreetName()) + .eqIfPresent(RoadDO::getLevelId, reqVO.getLevelId()) + .eqIfPresent(RoadDO::getGreenBeltTreeArea, reqVO.getGreenBeltTreeArea()) + .eqIfPresent(RoadDO::getGreenBeltArea, reqVO.getGreenBeltArea()) + .eqIfPresent(RoadDO::getTotalArea, reqVO.getTotalArea()) + .eqIfPresent(RoadDO::getTreeArea, reqVO.getTreeArea()) + .eqIfPresent(RoadDO::getStartingLatitude, reqVO.getStartingLatitude()) + .eqIfPresent(RoadDO::getStartingLongitude, reqVO.getStartingLongitude()) + .eqIfPresent(RoadDO::getStartingRemark, reqVO.getStartingRemark()) + .eqIfPresent(RoadDO::getEndLatitude, reqVO.getEndLatitude()) + .eqIfPresent(RoadDO::getEndLongitude, reqVO.getEndLongitude()) + .eqIfPresent(RoadDO::getEndRemark, reqVO.getEndRemark()) + .eqIfPresent(RoadDO::getRemark, reqVO.getRemark()) + .eqIfPresent(RoadDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(RoadDO::getDeptId, reqVO.getDeptId()) + .likeIfPresent(RoadDO::getCreatorName, reqVO.getCreatorName()) + .betweenIfPresent(RoadDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(RoadDO::getUpdaterName, reqVO.getUpdaterName()) + .orderByDesc(RoadDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/standingbook/StandingBookMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/standingbook/StandingBookMapper.java deleted file mode 100644 index 9c7f6c5..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/standingbook/StandingBookMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.mysql.standingbook; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zteits.urbanops.module.garden.dal.dataobject.standingbook.StandingBookDO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface StandingBookMapper extends BaseMapperX { - default PageResult selectPage(com.zteits.urbanops.framework.common.pojo.PageParam pageParam, StandingBookDO where) { - return selectPage(pageParam, null, new LambdaQueryWrapperX() - .eqIfPresent(StandingBookDO::getStandingBookYear, where.getStandingBookYear()) - .orderByDesc(StandingBookDO::getId)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateService.java deleted file mode 100644 index 648872c..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zteits.urbanops.module.garden.service.maintainrate; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRatePageReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateRespVO; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainrate.MaintainRateDO; - -public interface MaintainRateService { - - PageResult selectPage(MaintainRatePageReqVO reqVO); - - MaintainRateDO selectById(Long id); - - Boolean insert(MaintainRateDO entity); - - Boolean update(MaintainRateDO entity); - - Boolean deleteById(Long id); - - MaintainRateRespVO getMaintainRateValue(MaintainRateReqVO reqVO); - - MaintainRateRespVO selectMaintainRateByLevel(Integer maintainTypeId, Integer level); -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateServiceImpl.java deleted file mode 100644 index 157ec69..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainrate/MaintainRateServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.zteits.urbanops.module.garden.service.maintainrate; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRatePageReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateReqVO; -import com.zteits.urbanops.module.garden.controller.admin.maintainrate.vo.MaintainRateRespVO; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainrate.MaintainRateDO; -import com.zteits.urbanops.module.garden.dal.mysql.maintainrate.MaintainRateMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -@Service -@Validated -public class MaintainRateServiceImpl implements MaintainRateService { - - @Resource - private MaintainRateMapper maintainRateMapper; - - @Override - public PageResult selectPage(MaintainRatePageReqVO reqVO) { - return maintainRateMapper.selectPage(reqVO); - } - - @Override - public MaintainRateDO selectById(Long id) { - return maintainRateMapper.selectById(id); - } - - @Override - public Boolean insert(MaintainRateDO entity) { - return maintainRateMapper.insert(entity) > 0; - } - - @Override - public Boolean update(MaintainRateDO entity) { - return maintainRateMapper.updateById(entity) > 0; - } - - @Override - public Boolean deleteById(Long id) { - return maintainRateMapper.deleteById(id) > 0; - } - - @Override - public MaintainRateRespVO getMaintainRateValue(MaintainRateReqVO reqVO) { - LambdaQueryWrapper qw = Wrappers.lambdaQuery(); - qw.eq(MaintainRateDO::getMaintainSubjectId, reqVO.getMaintainSubjectId()); - qw.eq(MaintainRateDO::getMaintainTypeId, reqVO.getMaintainTypeId()); - qw.orderByDesc(MaintainRateDO::getId); - MaintainRateDO rate = maintainRateMapper.selectOne(qw); - if (rate == null) { - return null; - } - MaintainRateRespVO resp = new MaintainRateRespVO(); - resp.setMaintainTypeId(rate.getMaintainTypeId()); - resp.setMaintainTypeName(rate.getMaintainTypeName()); - resp.setCycleId(rate.getCycleId()); - resp.setCycleName(rate.getCycleName()); - resp.setLevelTop(rate.getLevelTop()); - resp.setLevelOne(rate.getLevelOne()); - resp.setLevelTwo(rate.getLevelTwo()); - resp.setLevelThree(rate.getLevelThree()); - return resp; - } - - @Override - public MaintainRateRespVO selectMaintainRateByLevel(Integer maintainTypeId, Integer level) { - LambdaQueryWrapper qw = Wrappers.lambdaQuery(); - qw.eq(MaintainRateDO::getMaintainTypeId, maintainTypeId); - qw.orderByDesc(MaintainRateDO::getId); - MaintainRateDO rate = maintainRateMapper.selectOne(qw); - if (rate == null) { - return null; - } - MaintainRateRespVO resp = new MaintainRateRespVO(); - resp.setMaintainTypeId(rate.getMaintainTypeId()); - resp.setMaintainTypeName(rate.getMaintainTypeName()); - resp.setCycleId(rate.getCycleId()); - resp.setCycleName(rate.getCycleName()); - String value; - if (level != null && level == 10) { - value = rate.getLevelTop(); - } else if (level != null && level == 11) { - value = rate.getLevelOne(); - } else if (level != null && level == 12) { - value = rate.getLevelTwo(); - } else { - value = rate.getLevelThree(); - } - resp.setValue(value); - return resp; - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerService.java deleted file mode 100644 index 804fa77..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zteits.urbanops.module.garden.service.road; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo.RoadManagerPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadManagerDO; - -import java.util.List; - -public interface RoadManagerService { - PageResult selectPage(RoadManagerPageReqVO reqVO); - RoadManagerDO selectById(Long id); - Boolean insert(RoadManagerDO entity); - Boolean update(RoadManagerDO entity); - Boolean deleteById(Long id); - List selectList(RoadManagerDO where); -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerServiceImpl.java deleted file mode 100644 index 220f71f..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadManagerServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zteits.urbanops.module.garden.service.road; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.roadmanager.vo.RoadManagerPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadManagerDO; -import com.zteits.urbanops.module.garden.dal.mysql.road.RoadManagerMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class RoadManagerServiceImpl implements RoadManagerService { - - @Resource - private RoadManagerMapper roadManagerMapper; - - @Override - public PageResult selectPage(RoadManagerPageReqVO reqVO) { - return roadManagerMapper.selectPage(reqVO); - } - - @Override - public RoadManagerDO selectById(Long id) { - return roadManagerMapper.selectById(id); - } - - @Override - public Boolean insert(RoadManagerDO entity) { - return roadManagerMapper.insert(entity) > 0; - } - - @Override - public Boolean update(RoadManagerDO entity) { - return roadManagerMapper.updateById(entity) > 0; - } - - @Override - public Boolean deleteById(Long id) { - return roadManagerMapper.deleteById(id) > 0; - } - - @Override - public List selectList(RoadManagerDO where) { - return roadManagerMapper.selectList(new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX() - .eqIfPresent(RoadManagerDO::getCompanyId, where.getCompanyId()) - .eqIfPresent(RoadManagerDO::getDeptId, where.getDeptId()) - .likeIfPresent(RoadManagerDO::getRoadName, where.getRoadName()) - .orderByAsc(RoadManagerDO::getRoadName)); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java new file mode 100644 index 0000000..55208d1 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java @@ -0,0 +1,62 @@ +package com.zteits.urbanops.module.garden.service.road; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.road.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; + +/** + * 道路管理 Service 接口 + * + * @author 超级管理员 + */ +public interface RoadService { + + /** + * 创建道路管理 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createRoad(@Valid RoadSaveReqVO createReqVO); + + /** + * 更新道路管理 + * + * @param updateReqVO 更新信息 + */ + void updateRoad(@Valid RoadSaveReqVO updateReqVO); + + /** + * 删除道路管理 + * + * @param id 编号 + */ + void deleteRoad(Long id); + + /** + * 批量删除道路管理 + * + * @param ids 编号 + */ + void deleteRoadListByIds(List ids); + + /** + * 获得道路管理 + * + * @param id 编号 + * @return 道路管理 + */ + RoadDO getRoad(Long id); + + /** + * 获得道路管理分页 + * + * @param pageReqVO 分页查询 + * @return 道路管理分页 + */ + PageResult getRoadPage(RoadPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java new file mode 100644 index 0000000..25584f3 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java @@ -0,0 +1,85 @@ +package com.zteits.urbanops.module.garden.service.road; + +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.road.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper; + +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; + +/** + * 道路管理 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class RoadServiceImpl implements RoadService { + + @Resource + private RoadMapper roadMapper; + + @Override + public Long createRoad(RoadSaveReqVO createReqVO) { + // 插入 + RoadDO road = BeanUtils.toBean(createReqVO, RoadDO.class); + roadMapper.insert(road); + + // 返回 + return road.getId(); + } + + @Override + public void updateRoad(RoadSaveReqVO updateReqVO) { + // 校验存在 + validateRoadExists(updateReqVO.getId()); + // 更新 + RoadDO updateObj = BeanUtils.toBean(updateReqVO, RoadDO.class); + roadMapper.updateById(updateObj); + } + + @Override + public void deleteRoad(Long id) { + // 校验存在 + validateRoadExists(id); + // 删除 + roadMapper.deleteById(id); + } + + @Override + public void deleteRoadListByIds(List ids) { + // 删除 + roadMapper.deleteByIds(ids); + } + + + private void validateRoadExists(Long id) { + if (roadMapper.selectById(id) == null) { + // throw exception(ROAD_NOT_EXISTS); + } + } + + @Override + public RoadDO getRoad(Long id) { + return roadMapper.selectById(id); + } + + @Override + public PageResult getRoadPage(RoadPageReqVO pageReqVO) { + return roadMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookService.java deleted file mode 100644 index e14d824..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.zteits.urbanops.module.garden.service.standingbook; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.standingbook.vo.StandingBookPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.standingbook.StandingBookDO; - -public interface StandingBookService { - PageResult selectPage(PageParam pageParam, StandingBookPageReqVO reqVO); -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookServiceImpl.java deleted file mode 100644 index 442543e..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/standingbook/StandingBookServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zteits.urbanops.module.garden.service.standingbook; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.garden.controller.admin.standingbook.vo.StandingBookPageReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.standingbook.StandingBookDO; -import com.zteits.urbanops.module.garden.dal.mysql.standingbook.StandingBookMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -@Service -public class StandingBookServiceImpl implements StandingBookService { - - @Resource - private StandingBookMapper mapper; - - @Override - public PageResult selectPage(PageParam pageParam, StandingBookPageReqVO reqVO) { - StandingBookDO where = new StandingBookDO(); - where.setStandingBookYear(reqVO.getStandingBookYear()); - return mapper.selectPage(pageParam, where); - } -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/road/RoadMapper.xml b/urbanops-module-garden/src/main/resources/mapper/road/RoadMapper.xml new file mode 100644 index 0000000..faef970 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/road/RoadMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file