迁移

戈灵虎
1 parent a096527a
Showing 161 changed files with 5432 additions and 4 deletions
.gitignore
.trae/documents/兼容旧接口路径的桥接实现方案.md
.trae/documents/继续迁移剩余旧接口到 urbanops-module-garden.md
.trae/documents/迁移并兼容 _yuanl_system_dict_data_type_{dictType} 接口.md
.vscode/settings.json
urbanops-module-garden/pom.xml
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/base/BaseCommonController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/WaterFeeBridgeController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/departmentcost/DepartmentCostController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderOldController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/RecordFileListReq.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gps/UserGpsController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gps/vo/UserGpsReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/MaintainSummaryController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/CommitCountByCompanyReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/HomePageSummaryReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/MaintainProportionReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/hotline/HotlineCaseAdminController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/hotline/HotlineCaseController.java
@@ -52,3 +52,4 @@ application-my.yaml
 /urbanops-ui-app/unpackage/
 **/.DS_Store
+old/
+## 现状排查结论
+- `material/out/listForPage`：已迁移并存在，路径不变（POST）。位置：`controller/admin/material/MaterialOutController.java:39`
+- 费用类接口已迁移到 garden 模块，但基础路径统一为 `garden/*`，查询接口统一使用 `GET /page`：
+  - 旧 `/costfee/departmentcost/list` → 新 `GET /garden/department-cost/page`（部门费用）位置：`controller/admin/departmentcost/DepartmentCostController.java:83`
+  - 旧 `/costfee/mechanicalcost/list` → 新 `GET /garden/mechanical-cost/page`（自有机械费用）位置：`controller/admin/mechanicalcost/MechanicalCostController.java:107`
+  - 旧 `/costfee/rentalmechanicalcost/list` → 新 `GET /garden/rental-mechanical-cost/page`（租赁机械费用）位置：`controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java:99`
+  - 旧 `/costfee/gardenwasterecord/list` → 新 `GET /garden/waste-record/page`（园林废弃物）位置：`controller/admin/wasterecord/WasteRecordController.java:83`
+- 系统用户分页：旧 `/system/user/listForPage` 不存在；新为 `GET /system/user/page`，位置：`urbanops-module-system/controller/admin/user/UserController.java:99`
+
+## 目标
+- 在不改动前端的情况下，兼容旧路径：为上述旧路径添加桥接（alias）接口，委托到现有服务或新路径，实现等价分页/列表能力。
+
+## 实施方案
+1. 新增桥接控制器（不改现有业务控制器）：
+   - `controller/admin/costfee/DepartmentCostBridgeController`：`@RequestMapping("/costfee/departmentcost")`
+     - `@GetMapping("/list")` → 适配分页 VO，内部调用 `departmentCostService.getDepartmentCostPage(...)`
+   - `controller/admin/costfee/MechanicalCostBridgeController`：`@RequestMapping("/costfee/mechanicalcost")`
+     - `@GetMapping("/list")` → 委托 `mechanicalCostService.getMechanicalCostPage(...)`
+   - `controller/admin/costfee/RentalMechanicalCostBridgeController`：`@RequestMapping("/costfee/rentalmechanicalcost")`
+     - `@GetMapping("/list")` → 委托 `rentalMechanicalCostService.getRentalMechanicalCostPage(...)`
+   - `controller/admin/costfee/GardenWasteRecordBridgeController`：`@RequestMapping("/costfee/gardenwasterecord")`
+     - `@GetMapping("/list")` → 委托 `wasteRecordService.getWasteRecordPage(...)`
+2. 系统用户桥接：
+   - 在 `urbanops-module-system` 新增 `controller/admin/user/UserBridgeController`：`@RequestMapping("/system/user")`
+     - `@PostMapping("/listForPage")` → 将请求体（或表单）转换为 `UserPageReqVO`，委托 `AdminUserService.getUserPage(...)` 返回分页。
+3. 统一返回结构：
+   - 所有桥接接口返回 `CommonResult<PageResult<...>>`，与现有新接口保持一致；如旧前端要求表格结构，按需封装字段但不改核心分页数据。
+4. 权限与审计：
+   - 复用现有权限标识：`@PreAuthorize` 与对应 `garden:*` 或 `system:*` 权限，不新增冗余权限点。
+5. 兼容性细节：
+   - 旧接口使用 `list` 命名且可能 GET；桥接按旧签名支持 GET 并允许 query 传参；必要时支持 POST（根据旧前端调用方式）。
+   - 字段名差异通过桥接层 VO 做轻量映射（如旧字段为 `pageNum/pageSize`）。
+
+## 测试与验证
+- 为每个桥接接口补充最小的集成测试：校验分页入参映射、权限与返回数据结构。
+- 本地编译与启动后，用现有新接口的数据源验证桥接输出一致性。
+
+## 变更范围控制
+- 不改现有业务控制器和服务实现；新增仅限桥接控制器与必要的请求 VO（轻量）。
+- 不改数据库结构与 Mapper。
+
+请确认以上桥接方案；确认后我将按上述路径添加兼容接口并进行编译与验证。
 \ No newline at end of file
+# 迁移计划
+
+## 范围与目标
+- 将旧工程 `/old/servicemanager/src/main/java/com/servicemanager/project/` 下剩余接口完整迁移到 `urbanops-module-garden`，保持原「路径/行为」不变。
+- 统一数据表前缀为 `garden_`，对齐新模块的分层规范（controller/admin|app、service、dal/mysql、dal/dataobject、vo）。
+
+## 当前进度（已完成且编译通过）
+- 树档案与古树：`/business/tree/*`、`/treerecord/oldtrees/*`
+- 养护计划与提交：`/maintain/plan/*`、`/app/plan/commit/*`
+- 物料库存/入出库：`/material/inventory/*`、`/material/in/*`、`/material/out/*`
+- 热线案件/文件/照片：`/business/hotlinecase/*`（含聚合详情 `/getInfoMore/{id}`）、`/business/file/*`、`/business/sysphoto/*`
+- PC 问题管理/任务：`/pc/problem/manager/*`、`/pc/problem/task/*`
+- 部门桥接、基础字典、道路、养护频次、摄像机接口等
+
+## 待迁移内容
+- 绩效系列
+  - `/performance/index/listForPage`
+  - `/performance/write/listForPage`
+  - `/performance/experts/listForPage`
+- 项目与子项目
+  - `/project/manager/listForPage`
+  - `/project/manager/selectProjectManagerForList`
+  - `/subProject/manager/listForPage`
+- 物料管理剩余
+  - `/material/manager/*`（分页、列表、导出）
+  - `/materialType/*`（大类/中类/分页、导入导出）
+
+## 技术方案
+- 控制层
+  - 保持旧路径与 HTTP 方法不变；后台接口放 `controller/admin/*`，App 接口放 `controller/app/*`。
+  - 权限注解对齐（`@PreAuthorize`），沿用旧权限字符串或等价替换。
+- 服务层
+  - 迁移旧的业务服务方法，保持参数/校验/业务流程；使用新模块工具集（分页 `PageParam/PageResult`、统一响应 `CommonResult`）。
+- 数据访问层
+  - Mapper 改造为 `BaseMapperX + LambdaQueryWrapperX`，SQL 条件与排序对齐旧逻辑。
+  - DataObject 使用 `@TableName("garden_*")` 对齐重命名后的表。
+- VO/DTO
+  - 保持旧的入参/出参结构；命名与包路径迁移至新模块相应 `vo` 目录。
+
+## 数据表映射
+- 旧表 `td_*/t_*` → 新表 `garden_*`（如 `td_project_manager` → `garden_project_manager`，`td_performance_index` → `garden_performance_index`，`td_material_type` → `garden_material_type` 等）。
+- 统一使用新模块审计字段（creator/updater、createTime/updateTime）与部门/公司维度（`SecurityFrameworkUtils`）。
+
+## 验证与交付
+- 每批迁移完成后：
+  - 运行 `mvn -q -DskipTests -U -pl urbanops-module-garden -am compile` 验证编译。
+  - 提供可访问端点清单与关键入参示例。
+  - 对导出接口进行本地验证（返回 XLS）。
+
+## 风险与处理
+- 依赖缓存损坏（如 kotlin 相关）：遇到后强制更新或清理缓存后重试编译。
+- 权限字符串不一致：若旧权限在新模块中无对应，按域统一到 `garden:*:*` 规范并在说明中列出调整。
+
+## 需要确认
+- 绩效/项目/物料三组是否作为本次优先批次全部迁移？
+- 若有其他域需优先（例如 App 端补充查询或导入），请指出以便先行安排。
 \ No newline at end of file
+## 目标
+- 提供旧路径 `/yuanl/system/dict/data/type/{dictType}` 的字典查询接口，返回与现有系统一致的字典数据列表，减少前端改动。
+
+## 现状
+- 已有接口：`GET /system/dict-data/type?type=...`（App端），使用 `DictDataService.getDictDataList(...)` 并返回 `AppDictDataRespVO`。
+- 未存在 `/yuanl/system/dict/data/type/{dictType}` 旧路径。
+
+## 实施方案
+- 在 `urbanops-module-system` 新增桥接控制器 `DictDataBridgeController`：
+  - 类级路径：`@RequestMapping("/yuanl/system/dict/data")`
+  - 方法：`@GetMapping("/type/{dictType}")`，`@PermitAll`
+  - 入参：`@PathVariable("dictType") String dictType`
+  - 逻辑：调用 `DictDataService.getDictDataList(CommonStatusEnum.ENABLE.getStatus(), dictType)`，返回 `List<AppDictDataRespVO>`（含 `id/label/value/dictType`）。
+- 返回结构与 `AppDictDataController` 保持一致，便于前端复用。
+- 不改动现有控制器与服务，实现最小侵入的兼容。
+
+## 验证
+- 编译 `urbanops-module-system` 并启动，使用示例：`GET /yuanl/system/dict/data/type/maintaint_type`；对比 `GET /system/dict-data/type?type=maintaint_type` 结果一致。
 \ No newline at end of file
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
 \ No newline at end of file
@@ -82,6 +82,13 @@
             <artifactId>velocity-engine-core</artifactId> <!-- 实现代码生成 -->
         </dependency>
+        <!-- OkHttp 用于设备接口对接 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.9</version>
+        </dependency>
+
         <!-- 监控相关 -->
         <dependency>
             <groupId>com.zteits.boot</groupId>
+package com.zteits.urbanops.module.garden.controller.admin.base;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.vo.DictTypeRespVO;
+import com.zteits.urbanops.module.system.dal.dataobject.dict.DictDataDO;
+import com.zteits.urbanops.module.system.service.dict.DictDataService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 基础字典")
+@RestController
+@RequestMapping("/base/common")
+public class BaseCommonController {
+
+    @Resource
+    private DictDataService dictDataService;
+
+    @GetMapping("/maintaint_grade/list")
+    @Operation(summary = "养护等级列表")
+    public CommonResult<List<DictTypeRespVO>> maintaintGradeList() {
+        return success(getDictList("maintaint_grade"));
+    }
+
+    @GetMapping("/plant_type/list")
+    @Operation(summary = "植物类型列表")
+    public CommonResult<List<DictTypeRespVO>> plantTypeList() {
+        return success(getDictList("plant_type"));
+    }
+
+    @GetMapping("/maintaint_type/list")
+    @Operation(summary = "养护类型列表")
+    public CommonResult<List<DictTypeRespVO>> maintaintTypeList() {
+        return success(getDictList("maintaint_type"));
+    }
+
+    private List<DictTypeRespVO> getDictList(String type) {
+        List<DictTypeRespVO> respList = new ArrayList<>();
+        List<DictDataDO> list = dictDataService.getDictDataListByDictType(type);
+        if (list == null || list.isEmpty()) {
+            return respList;
+        }
+        for (DictDataDO e : list) {
+            DictTypeRespVO resp = new DictTypeRespVO();
+            resp.setValue(e.getValue());
+            resp.setLabel(e.getLabel());
+            respList.add(resp);
+        }
+        return respList;
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.costfee;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.admin.waterfee.vo.WaterFeePageReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.waterfee.WaterFeeDO;
+import com.zteits.urbanops.module.garden.service.waterfee.WaterFeeService;
+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.GetMapping;
+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("/costfee/waterfee")
+public class WaterFeeBridgeController {
+
+    @Resource
+    private WaterFeeService waterFeeService;
+
+    @GetMapping("/list")
+    @Operation(summary = "水费录入-列表")
+    public CommonResult<PageResult<WaterFeeDO>> list(WaterFeePageReqVO reqVO) {
+        if (reqVO.getPageSize() == null || reqVO.getPageSize() <= 0) {
+            reqVO.setPageSize(10);
+        }
+        if (reqVO.getPageNo() == null || reqVO.getPageNo() <= 0) {
+            reqVO.setPageNo(1);
+        }
+        return success(waterFeeService.getWaterFeePage(reqVO));
+    }
+}
 \ No newline at end of file
@@ -31,7 +31,7 @@ import com.zteits.urbanops.module.garden.service.departmentcost.DepartmentCostSe
 @Tag(name = "管理后台 - 部门费用录入")
 @RestController
-@RequestMapping("/garden/department-cost")
+@RequestMapping({"/garden/department-cost", "/costfee/departmentcost"})
 @Validated
 public class DepartmentCostController {
@@ -88,6 +88,14 @@ public class DepartmentCostController {
         return success(BeanUtils.toBean(pageResult, DepartmentCostRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "部门费用录入-列表(兼容旧路径)")
+    @PreAuthorize("@ss.hasPermission('garden:department-cost:query')")
+    public CommonResult<PageResult<DepartmentCostRespVO>> list(@Valid DepartmentCostPageReqVO pageReqVO) {
+        PageResult<DepartmentCostDO> pageResult = departmentCostService.getDepartmentCostPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, DepartmentCostRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出部门费用录入 Excel")
     @PreAuthorize("@ss.hasPermission('garden:department-cost:export')")
+package com.zteits.urbanops.module.garden.controller.admin.device;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 执法记录仪")
+@RestController
+@RequestMapping("/camera/recorder")
+public class CameraRecorderController {
+
+    @GetMapping("/device/page")
+    @Operation(summary = "设备-分页查询")
+    public CommonResult<Map<String,Object>> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
+                                                       @RequestParam(value = "enter_id", required = false) Integer enterId,
+                                                       @RequestParam(value = "group_id", required = false) Integer groupId,
+                                                       @RequestParam("page") Integer page,
+                                                       @RequestParam("pageSize") Integer pageSize) {
+        return success(Collections.emptyMap());
+    }
+
+    @PostMapping("/device/recordFileList")
+    @Operation(summary = "设备-设备执法记录信息")
+    public CommonResult<Map<String,Object>> deviceRecordFileList(@RequestBody Map<String,Object> req) {
+        return success(Collections.emptyMap());
+    }
+
+    @GetMapping("/group/group_list")
+    @Operation(summary = "调度组-分页")
+    public CommonResult<Map<String,Object>> groupList(@RequestParam(value = "group_name", required = false) String groupName,
+                                                      @RequestParam("page") Integer page,
+                                                      @RequestParam("pageSize") Integer pageSize) {
+        return success(Collections.emptyMap());
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.device;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.service.device.CameraRecorderHelper;
+import com.zteits.urbanops.module.garden.controller.admin.device.vo.RecordFileListReq;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 执法记录仪")
+@RestController
+@RequestMapping("/camera/recorder")
+public class CameraRecorderOldController {
+
+    @Resource
+    private CameraRecorderHelper cameraRecorderHelper;
+
+    @GetMapping("/device/page")
+    @Operation(summary = "设备-分页查询")
+    public CommonResult<Object> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
+                                           @RequestParam(value = "enter_id", required = false) Integer enterId,
+                                           @RequestParam(value = "group_id", required = false) Integer groupId,
+                                           @RequestParam("page") Integer page,
+                                           @RequestParam("pageSize") Integer pageSize) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.devicePage(deviceName, enterId, groupId, page, pageSize, companyId);
+    }
+
+    @PostMapping("/device/recordFileList")
+    @Operation(summary = "设备-设备执法记录信息")
+    public CommonResult<Object> deviceRecordFileList(@Valid @RequestBody RecordFileListReq req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.recordFileList(req, companyId);
+    }
+
+    @GetMapping("/group/group_list")
+    @Operation(summary = "调度组-分页")
+    public CommonResult<Object> groupList(@RequestParam(value = "group_name", required = false) String groupName,
+                                          @RequestParam("page") Integer page,
+                                          @RequestParam("pageSize") Integer pageSize) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.groupList(groupName, page, pageSize, companyId);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.device.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class RecordFileListReq {
+    @NotEmpty
+    public String st;
+    @NotEmpty
+    public String et;
+    public String keywords;
+    public Integer page;
+    public Integer pageSize;
+    public Long groupId;
+    public String devId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.gps;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.admin.gps.vo.UserGpsReqVO;
+import com.zteits.urbanops.module.garden.controller.app.vo.UserGpsRespVO;
+import com.zteits.urbanops.module.garden.service.usergps.UserGpsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+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 java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 用户经纬度")
+@RestController
+@RequestMapping("/user/gps")
+public class UserGpsController {
+
+    @Resource
+    private UserGpsService userGpsService;
+
+    @PostMapping("/list")
+    @Operation(summary = "用户经纬度-查询")
+    public CommonResult<List<UserGpsRespVO>> list(@Valid @RequestBody UserGpsReqVO reqVO) {
+        return success(userGpsService.selectUserGpsList(reqVO.getUserId(), reqVO.getBeginTime(), reqVO.getEndTime()));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.gps.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class UserGpsReqVO {
+    @NotNull
+    private Long userId;
+    @NotEmpty
+    private String beginTime;
+    @NotEmpty
+    private String endTime;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.homepage;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.CommitCountByCompanyReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.HomePageSummaryReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.MaintainProportionReqVO;
+import com.zteits.urbanops.module.garden.service.homepage.MaintainSummaryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+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 java.util.List;
+import java.util.Map;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 首页汇总")
+@RestController
+@RequestMapping("/homePage/summary")
+public class MaintainSummaryController {
+
+    @Resource
+    private MaintainSummaryService maintainSummaryService;
+
+    @PostMapping("/getSummary")
+    @Operation(summary = "首页汇总")
+    public CommonResult<Map<String, Object>> getSummary(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.selectMaintainSummary(req, companyId));
+    }
+
+    @PostMapping("/getSummary/maintain_type")
+    @Operation(summary = "首页汇总-养护类型统计")
+    public CommonResult<Map<String, List<Map<String, Object>>>> getSummaryByMaintainType(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getSummaryByMaintainType(req, companyId));
+    }
+
+    @PostMapping("/getSummary/maintain_type/proportion")
+    @Operation(summary = "首页汇总-养护类型占比")
+    public CommonResult<List<Map<String, Object>>> getSummaryByMaintainProportion(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getSummaryByMaintainProportion(req, companyId));
+    }
+
+    @PostMapping("/getSummary/plant_type/proportion")
+    @Operation(summary = "首页汇总-植物类型占比")
+    public CommonResult<List<Map<String, Object>>> getSummaryByPlantProportion(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getSummaryByPlantProportion(req, companyId));
+    }
+
+    @PostMapping("/getSummary/company")
+    @Operation(summary = "首页汇总-按公司统计")
+    public CommonResult<Map<String, Object>> getSummaryByCompany(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.selectSummaryByCompany(req, companyId));
+    }
+
+    @PostMapping("/proportion/by/company")
+    @Operation(summary = "首页汇总-按公司统计提交量占比")
+    public CommonResult<List<Map<String, Object>>> proportionByCompany(@Valid @RequestBody HomePageSummaryReqVO req) {
+        return success(maintainSummaryService.getProportionByCompany(req.beginTime, req.endTime));
+    }
+
+    @PostMapping("/commitCount/by/company")
+    @Operation(summary = "按公司统计-提交工单数量")
+    public CommonResult<List<Map<String, Object>>> getCommitCountByCompany(@Valid @RequestBody CommitCountByCompanyReqVO req) {
+        return success(maintainSummaryService.getCommitCountByCompany(req));
+    }
+
+    @PostMapping("/pressing_type/by/company")
+    @Operation(summary = "按公司统计-紧急程度占比")
+    public CommonResult<List<Map<String, Object>>> getPressingTypeByCompany(@Valid @RequestBody CommitCountByCompanyReqVO req) {
+        return success(maintainSummaryService.getPressingTypeByCompany(req));
+    }
+
+    @PostMapping("/process/order/xc")
+    @Operation(summary = "个人-巡查处理工单量排名")
+    public CommonResult<List<Map<String, Object>>> getXcProcessOrder(@Valid @RequestBody CommitCountByCompanyReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getXcProcessOrder(companyId, req.beginTime, req.endTime));
+    }
+
+    @PostMapping("/process/order/yh")
+    @Operation(summary = "个人-养护处理工单量排名")
+    public CommonResult<List<Map<String, Object>>> getProcessOrderReturn(@Valid @RequestBody CommitCountByCompanyReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getProcessOrderReturn(companyId, req.beginTime, req.endTime));
+    }
+
+    @PostMapping("/commitCount/group/commitDate")
+    @Operation(summary = "按时间统计-工单提交量")
+    public CommonResult<Map<String, List<Object>>> getCommitCountByTime(@Valid @RequestBody CommitCountByCompanyReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getCommitCountByTime(companyId, req));
+    }
+
+    @PostMapping("/orderList/by/status")
+    @Operation(summary = "按单位-工单处理情况")
+    public CommonResult<List<Map<String, Object>>> getOrderList(@Valid @RequestBody MaintainProportionReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getOrderList(companyId, req.getTaskStatus()));
+    }
+
+    @PostMapping("/maintainTypeCount")
+    @Operation(summary = "首页汇总-养护类型统计")
+    public CommonResult<Map<String, Object>> maintainTypeAndGrowthRate(@Valid @RequestBody HomePageSummaryReqVO req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainSummaryService.getSummaryByMaintainTypeAndGrowthRate(req, companyId));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.homepage.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class CommitCountByCompanyReqVO {
+    @NotEmpty
+    public String beginTime;
+    @NotEmpty
+    public String endTime;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.homepage.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class HomePageSummaryReqVO {
+    @NotEmpty
+    public String beginTime;
+    @NotEmpty
+    public String endTime;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.homepage.vo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class MaintainProportionReqVO {
+    @NotNull
+    private Integer taskStatus;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.hotline;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.hotline.HotlineCaseDO;
+import com.zteits.urbanops.module.garden.service.hotline.HotlineCaseService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+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 = "管理后台 - 12345案件信息")
+@RestController
+@RequestMapping("/business/hotlinecase")
+public class HotlineCaseAdminController {
+
+    @Resource
+    private HotlineCaseService service;
+
+    @GetMapping("/list")
+    @Operation(summary = "查询列表")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:list')")
+    public CommonResult<PageResult<HotlineCaseDO>> list(HotlineCaseDO where,
+                                                        @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                        @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        return success(service.selectPage(page, where));
+    }
+
+    @PostMapping("export")
+    @Operation(summary = "导出列表")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void export(HotlineCaseDO where, HttpServletResponse response) throws IOException {
+        List<HotlineCaseDO> list = service.selectPage(new PageParam(), where).getList();
+        ExcelUtils.write(response, "12345案件信息.xls", "数据", HotlineCaseDO.class, list);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "详情")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:query')")
+    public CommonResult<HotlineCaseDO> getInfo(@PathVariable("id") String id) {
+        return success(service.selectById(id));
+    }
+
+    @GetMapping("/getInfoMore/{id}")
+    @Operation(summary = "详情(含附件与照片)")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:query')")
+    public CommonResult<com.zteits.urbanops.module.garden.controller.admin.hotline.vo.HotlineCaseDetailResp> getInfoMore(@PathVariable("id") String id) {
+        return success(service.getDetail(id));
+    }
+
+    @PostMapping
+    @Operation(summary = "新增")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:add')")
+    public CommonResult<Boolean> add(@RequestBody HotlineCaseDO entity) {
+        return success(service.insert(entity));
+    }
+
+    @PutMapping
+    @Operation(summary = "修改")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:edit')")
+    public CommonResult<Boolean> edit(@RequestBody HotlineCaseDO entity) {
+        return success(service.update(entity));
+    }
+
+    @DeleteMapping("/{ids}")
+    @Operation(summary = "删除")
+    @PreAuthorize("@ss.hasPermission('business:hotlinecase:remove')")
+    public CommonResult<Boolean> remove(@PathVariable List<String> ids) {
+        return success(service.deleteByIds(ids));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.hotline;
+
+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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 热线工单")
+@RestController
+@RequestMapping("/business/hotlinecase-compat")
+public class HotlineCaseController {
+
+    @GetMapping("/list")
+    @Operation(summary = "热线工单-列表")
+    public CommonResult<PageResult<Map<String, Object>>> list(@RequestParam(value = "page", required = false) Integer page,
+                                                              @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        List<Map<String, Object>> records = Collections.emptyList();
+        long total = 0L;
+        return success(new PageResult<>(records, total));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.hotline;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.hotline.HotlineFileDO;
+import com.zteits.urbanops.module.garden.service.hotline.HotlineFileService;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 12345案件-文件")
+@RestController
+@RequestMapping("/business/file")
+public class HotlineFileController {
+
+    @Resource
+    private HotlineFileService hotlineFileService;
+
+    @PostMapping("/parseFile")
+    @Operation(summary = "解析word文档")
+    public CommonResult<Object> parseFile(@RequestParam("file") MultipartFile file) throws Exception {
+        return success(hotlineFileService.parseFile(file));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "文件-列表")
+    public CommonResult<List<HotlineFileDO>> list(HotlineFileDO where) {
+        return success(hotlineFileService.selectList(where));
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "文件-导出")
+    public void export(HotlineFileDO where, jakarta.servlet.http.HttpServletResponse response) throws IOException {
+        List<HotlineFileDO> list = hotlineFileService.selectList(where);
+        ExcelUtils.write(response, "file.xls", "数据", HotlineFileDO.class, list);
+    }
+
+    @GetMapping("/{caseid}")
+    @Operation(summary = "文件-详情")
+    public CommonResult<HotlineFileDO> getInfo(@PathVariable("caseid") String caseid) {
+        return success(hotlineFileService.selectById(caseid));
+    }
+
+    @PostMapping
+    @Operation(summary = "文件-新增")
+    public CommonResult<Boolean> add(@RequestBody HotlineFileDO entity) {
+        return success(hotlineFileService.insert(entity));
+    }
+
+    @PutMapping
+    @Operation(summary = "文件-修改")
+    public CommonResult<Boolean> edit(@RequestBody HotlineFileDO entity) {
+        return success(hotlineFileService.update(entity));
+    }
+
+    @DeleteMapping("/{caseids}")
+    @Operation(summary = "文件-删除")
+    public CommonResult<Boolean> remove(@PathVariable String[] caseids) {
+        return success(hotlineFileService.deleteByIds(Arrays.asList(caseids)));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.hotline.vo;
+
+import com.zteits.urbanops.module.garden.dal.dataobject.hotline.HotlineCaseDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.hotline.HotlineFileDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.photo.SysPhotoDO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HotlineCaseDetailResp {
+    private HotlineCaseDO caseInfo;
+    private List<HotlineFileDO> files;
+    private List<SysPhotoDO> photos;
+}
 \ No newline at end of file
+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 jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 养护计划")
+@RestController
+@RequestMapping("/maintain/plan")
+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<PageResult<MaintainPlanDO>> listForPage(@Valid @RequestBody MaintainPlanForPageReqVO reqVO) {
+        return success(maintainPlanService.selectPage(reqVO));
+    }
+
+    @GetMapping("/detail")
+    @Operation(summary = "养护计划-对象明细")
+    @Parameter(name = "plan_no", description = "编码", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
+    public CommonResult<MaintainPlanDO> detail(@RequestParam("plan_no") String planNo) {
+        return success(maintainPlanService.selectByPlanNo(planNo));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "养护计划-添加")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')")
+    public CommonResult<Boolean> add(@Valid @RequestBody MaintainPlanAddReqVO reqVO) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return success(maintainPlanService.insert(reqVO, companyId, deptId));
+    }
+
+    @GetMapping("/deleteById")
+    @Operation(summary = "养护计划-删除")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan:delete')")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(maintainPlanService.deleteById(id));
+    }
+
+    @PostMapping("/yh/listForPage")
+    @Operation(summary = "PC养护计划提交记录-分页查询")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
+    public CommonResult<com.zteits.urbanops.framework.common.pojo.PageResult<com.zteits.urbanops.module.garden.controller.app.vo.PlanTaskCommitDetailPageRespVO>> 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));
+    }
+}
 \ No newline at end of file
+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
+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
+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
+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<PageResult<MaintainRateDO>> listForPage(@Valid @RequestBody MaintainRatePageReqVO reqVO) {
+        return success(maintainRateService.selectPage(reqVO));
+    }
+
+    @PostMapping("/getMaintainRateValue")
+    @Operation(summary = "养护频次-获取养护频次值")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')")
+    public CommonResult<MaintainRateRespVO> getMaintainRateValue(@Valid @RequestBody MaintainRateReqVO reqVO) {
+        return success(maintainRateService.getMaintainRateValue(reqVO));
+    }
+
+    @GetMapping("/selectMaintainRateByLevel")
+    @Operation(summary = "通过植物类型获取养护频次值")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-rate:query')")
+    public CommonResult<MaintainRateRespVO> 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<MaintainRateDO> 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<MaintainRateDO> getInfo(@PathVariable("id") Long id) {
+        return success(maintainRateService.selectById(id));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "养护频次-添加")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-rate:create')")
+    public CommonResult<Boolean> 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<Boolean> edit(@Valid @RequestBody MaintainRateDO entity) {
+        return success(maintainRateService.update(entity));
+    }
+
+    @GetMapping("/delete/byId")
+    @Operation(summary = "养护频次-删除")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-rate:delete')")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(maintainRateService.deleteById(id));
+    }
+}
 \ No newline at end of file
+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
+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
+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
+package com.zteits.urbanops.module.garden.controller.admin.material;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialInventoryDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialInventoryInDO;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialInventoryInMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialInventoryMapper;
+import com.zteits.urbanops.module.garden.service.material.MaterialService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 物料入库")
+@RestController
+@RequestMapping("/material/in")
+public class MaterialInController {
+
+    @Resource
+    private MaterialInventoryInMapper inMapper;
+    @Resource
+    private MaterialInventoryMapper inventoryMapper;
+    @Resource
+    private MaterialService materialService;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "物料入库-分页")
+    @PreAuthorize("@ss.hasPermission('material:material/in:list')")
+    public CommonResult<PageResult<MaterialInventoryInDO>> listForPage(@RequestBody MaterialInventoryInDO where,
+                                                                       @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        PageResult<MaterialInventoryInDO> result = inMapper.selectPage(page, null,
+                new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<MaterialInventoryInDO>()
+                        .eqIfPresent(MaterialInventoryInDO::getMaterialId, where.getMaterialId())
+                        .likeIfPresent(MaterialInventoryInDO::getMaterialName, where.getMaterialName())
+                        .eqIfPresent(MaterialInventoryInDO::getBelongCompanyId, where.getBelongCompanyId())
+                        .orderByDesc(MaterialInventoryInDO::getCreateTime));
+        return success(result);
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "物料入库-导出")
+    @PreAuthorize("@ss.hasPermission('material:material/in:export')")
+    public void export(MaterialInventoryInDO where, HttpServletResponse response) throws IOException {
+        List<MaterialInventoryInDO> list = inMapper.selectList(new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<MaterialInventoryInDO>()
+                .eqIfPresent(MaterialInventoryInDO::getMaterialId, where.getMaterialId()));
+        ExcelUtils.write(response, "物料入库.xls", "数据", MaterialInventoryInDO.class, list);
+    }
+
+    @GetMapping("/select/by/inventoryInNo")
+    @Operation(summary = "物料入库-详情")
+    @PreAuthorize("@ss.hasPermission('material:material/in:query')")
+    public CommonResult<MaterialInventoryInDO> getInfo(@RequestParam("inventoryIn_no") String inventoryInNo) {
+        return success(inMapper.selectByNo(inventoryInNo));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "物料入库-添加")
+    @PreAuthorize("@ss.hasPermission('material:material/in:add')")
+    @Transactional(rollbackFor = Throwable.class)
+    public CommonResult<Boolean> add(@RequestBody MaterialInventoryInDO req) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        MaterialDO material = materialService.selectById(req.getMaterialId());
+        if (material == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "无效参数-materialId");
+        }
+        req.setCreator(String.valueOf(userId));
+        req.setUpdater(String.valueOf(userId));
+        boolean inserted = inMapper.insert(req) > 0;
+
+        MaterialInventoryDO inventory = new MaterialInventoryDO();
+        inventory.setMaterialId(req.getMaterialId());
+        inventory.setMaterialName(req.getMaterialName());
+        inventory.setMaterialTypeId(req.getMaterialTypeId());
+        inventory.setMaterialTypeName(req.getMaterialTypeName());
+        inventory.setTypeId(material.getTypeId());
+        inventory.setTypeName(material.getTypeName());
+        inventory.setTypeDetailId(material.getTypeDetailId());
+        inventory.setTypeDetailName(material.getTypeDetailName());
+        inventory.setSpecifications(req.getSpecifications());
+        inventory.setBelongCompanyId(req.getBelongCompanyId());
+        inventory.setBelongCompanyName(req.getBelongCompanyName());
+        inventory.setUnitId(req.getUnitId());
+        inventory.setUnitName(req.getUnitName());
+        inventory.setCurrentNum(req.getInInventoryNum());
+        inventory.setOutTotalNum(0L);
+        inventory.setInventoryTotalNum(req.getInInventoryNum());
+        inventory.setStatus("0");
+        inventory.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+
+        MaterialInventoryDO existed = inventoryMapper.selectByTypeDetailId(inventory.getTypeDetailId(), inventory.getBelongCompanyId());
+        if (existed != null) {
+            MaterialInventoryDO upd = new MaterialInventoryDO();
+            upd.setInventoryId(existed.getInventoryId());
+            upd.setInventoryTotalNum((existed.getInventoryTotalNum() == null ? 0 : existed.getInventoryTotalNum()) + inventory.getCurrentNum());
+            upd.setCurrentNum((existed.getCurrentNum() == null ? 0 : existed.getCurrentNum()) + inventory.getCurrentNum());
+            inventoryMapper.updateById(upd);
+        } else {
+            inventoryMapper.insert(inventory);
+        }
+
+        return success(inserted);
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "物料入库-修改")
+    @PreAuthorize("@ss.hasPermission('material:material/in:edit')")
+    public CommonResult<Boolean> edit(@RequestBody MaterialInventoryInDO req) {
+        return success(inMapper.updateById(req) > 0);
+    }
+
+    @GetMapping("/delete/by/id")
+    @Operation(summary = "物料入库-删除")
+    @PreAuthorize("@ss.hasPermission('material:material/in:remove')")
+    @Transactional(rollbackFor = Throwable.class)
+    public CommonResult<Boolean> remove(@RequestParam("id") Long id) {
+        MaterialInventoryInDO in = inMapper.selectById(id);
+        if (in == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "参数错误");
+        }
+        MaterialInventoryDO inv = inventoryMapper.selectByMaterialId(in.getMaterialId());
+        if (inv == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "参数错误");
+        }
+        if (inv.getCurrentNum() < in.getInInventoryNum()) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(409, "库存已使用");
+        }
+        MaterialInventoryDO upd = new MaterialInventoryDO();
+        upd.setInventoryId(inv.getInventoryId());
+        upd.setCurrentNum(inv.getCurrentNum() - in.getInInventoryNum());
+        upd.setInventoryTotalNum(inv.getInventoryTotalNum() - in.getInInventoryNum());
+        inventoryMapper.updateById(upd);
+        return success(inMapper.deleteById(id) > 0);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.material;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialInventoryDO;
+import com.zteits.urbanops.module.garden.service.material.MaterialInventoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+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;
+
+@Tag(name = "管理后台 - 物料库存")
+@RestController
+@RequestMapping("/material/inventory")
+public class MaterialInventoryController {
+
+    @Resource
+    private MaterialInventoryService inventoryService;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "物料库存-分页查询")
+    @PreAuthorize("@ss.hasPermission('material:inventory:list')")
+    public CommonResult<PageResult<MaterialInventoryDO>> listForPage(@RequestBody MaterialInventoryDO where,
+                                                                     @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                     @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        return success(inventoryService.selectPage(page, where));
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "物料库存-导出")
+    @PreAuthorize("@ss.hasPermission('material:inventory:export')")
+    public void export(MaterialInventoryDO where, HttpServletResponse response) throws IOException {
+        List<MaterialInventoryDO> list = inventoryService.selectPage(new PageParam(), where).getList();
+        ExcelUtils.write(response, "物料库存.xls", "数据", MaterialInventoryDO.class, list);
+    }
+
+    @GetMapping("/updateByAlermNum")
+    @Operation(summary = "物料库存-阈值更新")
+    @PreAuthorize("@ss.hasPermission('material:inventory:export')")
+    public CommonResult<Boolean> updateInventoryAlermNum(@RequestParam("material_id") Long materialId,
+                                                         @RequestParam("alerm_num") Long alermNum) {
+        return success(inventoryService.updateInventoryAlarmNum(materialId, alermNum));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.material;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialManagerDO;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialManagerMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 物料管理")
+@RestController
+@RequestMapping("/material/manager")
+public class MaterialManagerController {
+
+    @Resource
+    private MaterialManagerMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "物料管理-分页")
+    @PreAuthorize("@ss.hasPermission('material:manager:list')")
+    public CommonResult<PageResult<MaterialManagerDO>> listForPage(@RequestBody MaterialManagerDO where,
+                                                                   @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                   @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "物料管理-列表")
+    @PreAuthorize("@ss.hasPermission('material:manager:list')")
+    public CommonResult<List<MaterialManagerDO>> list() {
+        MaterialManagerDO where = new MaterialManagerDO();
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectList(where));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "物料管理-添加")
+    @PreAuthorize("@ss.hasPermission('material:manager:add')")
+    public CommonResult<Boolean> add(@RequestBody MaterialManagerDO entity) {
+        entity.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        entity.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.setUpdater(entity.getCreator());
+        entity.clean();
+        return success(mapper.insert(entity) > 0);
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "物料管理-修改")
+    @PreAuthorize("@ss.hasPermission('material:manager:edit')")
+    public CommonResult<Boolean> edit(@RequestBody MaterialManagerDO entity) {
+        entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.clean();
+        return success(mapper.updateById(entity) > 0);
+    }
+
+    @GetMapping("/deleteById")
+    @Operation(summary = "物料管理-删除")
+    @PreAuthorize("@ss.hasPermission('material:manager:delete')")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(mapper.deleteById(id) > 0);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.material;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialInventoryDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialInventoryOutDO;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialInventoryMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialInventoryOutMapper;
+import com.zteits.urbanops.module.garden.service.material.MaterialService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 物料出库")
+@RestController
+@RequestMapping("/material/out")
+public class MaterialOutController {
+
+    @Resource
+    private MaterialInventoryOutMapper outMapper;
+    @Resource
+    private MaterialInventoryMapper inventoryMapper;
+    @Resource
+    private MaterialService materialService;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "物料出库-分页")
+    @PreAuthorize("@ss.hasPermission('material:out:list')")
+    public CommonResult<PageResult<MaterialInventoryOutDO>> listForPage(@RequestBody MaterialInventoryOutDO where,
+                                                                        @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                        @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        PageResult<MaterialInventoryOutDO> result = outMapper.selectPage(page, null,
+                new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<MaterialInventoryOutDO>()
+                        .eqIfPresent(MaterialInventoryOutDO::getMaterialId, where.getMaterialId())
+                        .likeIfPresent(MaterialInventoryOutDO::getMaterialName, where.getMaterialName())
+                        .eqIfPresent(MaterialInventoryOutDO::getBelongCompanyId, where.getBelongCompanyId())
+                        .orderByDesc(MaterialInventoryOutDO::getCreateTime));
+        return success(result);
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "物料出库-导出")
+    @PreAuthorize("@ss.hasPermission('material:out:export')")
+    public void export(MaterialInventoryOutDO where, HttpServletResponse response) throws IOException {
+        List<MaterialInventoryOutDO> list = outMapper.selectList(new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<MaterialInventoryOutDO>()
+                .eqIfPresent(MaterialInventoryOutDO::getMaterialId, where.getMaterialId()));
+        ExcelUtils.write(response, "物料出库.xls", "数据", MaterialInventoryOutDO.class, list);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "物料出库-详情")
+    @PreAuthorize("@ss.hasPermission('material:out:query')")
+    public CommonResult<MaterialInventoryOutDO> getInfo(@RequestParam("id") Long id) {
+        return success(outMapper.selectById(id));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "物料出库-添加")
+    @PreAuthorize("@ss.hasPermission('material:out:add')")
+    @Transactional(rollbackFor = Throwable.class)
+    public CommonResult<Boolean> add(@RequestBody MaterialInventoryOutDO req) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        MaterialDO material = materialService.selectById(req.getMaterialId());
+        if (material == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "无效参数");
+        }
+        MaterialInventoryDO inventory = inventoryMapper.selectByTypeDetailId(material.getTypeDetailId(), SecurityFrameworkUtils.getLoginUserDeptId());
+        if (inventory == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, req.getMaterialName() + "没有库存");
+        }
+        if (inventory.getCurrentNum() < req.getOutInventoryNum()) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(409, "当前库存不足，无法出库");
+        }
+        req.setCreator(String.valueOf(userId));
+        boolean inserted = outMapper.insert(req) > 0;
+        inventoryMapper.updateInventoryByMaterialId(inventory.getInventoryId(), req.getOutInventoryNum());
+        return success(inserted);
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "物料出库-修改")
+    @PreAuthorize("@ss.hasPermission('material:out:edit')")
+    public CommonResult<Boolean> edit(@RequestBody MaterialInventoryOutDO req) {
+        return success(outMapper.updateById(req) > 0);
+    }
+
+    @GetMapping("/delete/ById")
+    @Operation(summary = "物料出库-删除")
+    @PreAuthorize("@ss.hasPermission('material:out:remove')")
+    public CommonResult<Boolean> remove(@RequestParam("id") Long id) {
+        MaterialInventoryOutDO out = outMapper.selectById(id);
+        if (out == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "参数错误");
+        }
+        MaterialInventoryDO inv = inventoryMapper.selectByMaterialId(out.getMaterialId());
+        if (inv == null) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "参数错误");
+        }
+        if (inv.getCurrentNum() < out.getOutInventoryNum()) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(409, "库存已使用");
+        }
+        MaterialInventoryDO upd = new MaterialInventoryDO();
+        upd.setInventoryId(inv.getInventoryId());
+        upd.setCurrentNum(inv.getCurrentNum() + out.getOutInventoryNum());
+        upd.setInventoryTotalNum(inv.getInventoryTotalNum() + out.getOutInventoryNum());
+        upd.setOutTotalNum(inv.getOutTotalNum() - out.getOutInventoryNum());
+        inventoryMapper.updateById(upd);
+        return success(outMapper.deleteById(id) > 0);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialtype;
+
+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.dal.dataobject.material.MaterialTypeDO;
+import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialTypeMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 物料类型")
+@RestController
+@RequestMapping("/materialType/type")
+public class MaterialTypeAdminController {
+
+    @Resource
+    private MaterialTypeMapper mapper;
+
+    @GetMapping("/getMaterialBigTypeList")
+    @Operation(summary = "物料类型-大类列表")
+    @PreAuthorize("@ss.hasPermission('material:type:list')")
+    public CommonResult<List<MaterialTypeDO>> getMaterialBigTypeList() {
+        return success(mapper.selectBigTypeList());
+    }
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "物料类型-分页")
+    @PreAuthorize("@ss.hasPermission('material:type:list')")
+    public CommonResult<PageResult<MaterialTypeDO>> listForPage(@RequestBody MaterialTypeDO where,
+                                                                @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        return success(mapper.selectPage(page, where));
+    }
+}
 \ No newline at end of file
@@ -36,7 +36,7 @@ import com.zteits.urbanops.module.garden.service.mechanicalcost.MechanicalCostSe
 @Tag(name = "管理后台 - 自有机械费用录入")
 @RestController
-@RequestMapping("/garden/mechanical-cost")
+@RequestMapping({"/garden/mechanical-cost", "/costfee/mechanicalcost"})
 @Validated
 public class MechanicalCostController {
@@ -112,6 +112,14 @@ public class MechanicalCostController {
         return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "自有机械费用录入-列表(兼容旧路径)")
+    @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:query')")
+    public CommonResult<PageResult<MechanicalCostRespVO>> list(@Valid MechanicalCostPageReqVO pageReqVO) {
+        PageResult<MechanicalCostDO> pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出自有机械费用录入 Excel")
     @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:export')")
+package com.zteits.urbanops.module.garden.controller.admin.pc;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.problem.MaintainProblemManagerDO;
+import com.zteits.urbanops.module.garden.service.problem.MaintainProblemManagerService;
+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.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 问题管理")
+@RestController
+@RequestMapping("/pc/problem/manager")
+public class PcProblemManagerController {
+
+    @Resource
+    private MaintainProblemManagerService service;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "问题管理-分页查询")
+    public CommonResult<PageResult<MaintainProblemManagerDO>> listForPage(@RequestBody MaintainProblemManagerDO where,
+                                                                          @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                          @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(service.selectPage(page, where));
+    }
+
+    @GetMapping("/queryById")
+    @Operation(summary = "问题管理-详情")
+    public CommonResult<MaintainProblemManagerDO> queryById(@RequestParam("id") Long id) {
+        return success(service.selectById(id));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.pc;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.problem.MaintainTaskManagerDO;
+import com.zteits.urbanops.module.garden.dal.mysql.problem.MaintainTaskManagerMapper;
+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.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 问题任务")
+@RestController
+@RequestMapping("/pc/problem/task")
+public class PcProblemTaskController {
+
+    @Resource
+    private MaintainTaskManagerMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "养护任务管理-分页")
+    public CommonResult<PageResult<MaintainTaskManagerDO>> listForPage(@RequestBody MaintainTaskManagerDO where,
+                                                                       @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+
+    @GetMapping("/queryByProblemNo")
+    @Operation(summary = "养护任务处理-详情")
+    public CommonResult<MaintainTaskManagerDO> queryByProblemNo(@RequestParam("problem_no") String problemNo) {
+        MaintainTaskManagerDO where = new MaintainTaskManagerDO();
+        where.setProblemNo(problemNo);
+        PageResult<MaintainTaskManagerDO> result = mapper.selectPage(new PageParam(), where);
+        return success(result.getList().isEmpty() ? null : result.getList().get(0));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.performance;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.performance.PerformanceExpertsDO;
+import com.zteits.urbanops.module.garden.dal.mysql.performance.PerformanceExpertsMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 绩效专家")
+@RestController
+@RequestMapping("/performance/experts")
+public class PerformanceExpertsController {
+
+    @Resource
+    private PerformanceExpertsMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "绩效专家-分页")
+    @PreAuthorize("@ss.hasPermission('performance:experts:list')")
+    public CommonResult<PageResult<PerformanceExpertsDO>> listForPage(@RequestBody PerformanceExpertsDO where,
+                                                                      @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                      @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.performance;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.performance.PerformanceIndexDO;
+import com.zteits.urbanops.module.garden.dal.mysql.performance.PerformanceIndexMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 绩效指标")
+@RestController
+@RequestMapping("/performance/index")
+public class PerformanceIndexController {
+
+    @Resource
+    private PerformanceIndexMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "绩效指标-分页")
+    @PreAuthorize("@ss.hasPermission('performance:index:list')")
+    public CommonResult<PageResult<PerformanceIndexDO>> listForPage(@RequestBody PerformanceIndexDO where,
+                                                                    @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.performance;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.performance.PerformanceWriteDO;
+import com.zteits.urbanops.module.garden.dal.mysql.performance.PerformanceWriteMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 绩效填报")
+@RestController
+@RequestMapping("/performance/write")
+public class PerformanceWriteController {
+
+    @Resource
+    private PerformanceWriteMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "绩效填报-分页")
+    @PreAuthorize("@ss.hasPermission('performance:write:list')")
+    public CommonResult<PageResult<PerformanceWriteDO>> listForPage(@RequestBody PerformanceWriteDO where,
+                                                                    @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.photo;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.photo.SysPhotoDO;
+import com.zteits.urbanops.module.garden.service.photo.SysPhotoService;
+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.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 所有照片信息")
+@RestController
+@RequestMapping("/business/sysphoto")
+public class SysPhotoController {
+
+    @Resource
+    private SysPhotoService sysPhotoService;
+
+    @GetMapping("/list")
+    @Operation(summary = "照片-列表")
+    public CommonResult<List<SysPhotoDO>> list(SysPhotoDO where) {
+        return success(sysPhotoService.selectList(where));
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "照片-导出")
+    public void export(SysPhotoDO where, jakarta.servlet.http.HttpServletResponse response) throws IOException {
+        List<SysPhotoDO> list = sysPhotoService.selectList(where);
+        ExcelUtils.write(response, "photo.xls", "数据", SysPhotoDO.class, list);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "照片-详情")
+    public CommonResult<SysPhotoDO> getInfo(@PathVariable("id") String id) {
+        return success(sysPhotoService.selectById(id));
+    }
+
+    @PostMapping
+    @Operation(summary = "照片-新增")
+    public CommonResult<Boolean> add(@RequestBody SysPhotoDO entity) {
+        return success(sysPhotoService.insert(entity));
+    }
+
+    @PutMapping
+    @Operation(summary = "照片-修改")
+    public CommonResult<Boolean> edit(@RequestBody SysPhotoDO entity) {
+        return success(sysPhotoService.update(entity));
+    }
+
+    @DeleteMapping("/{ids}")
+    @Operation(summary = "照片-删除")
+    public CommonResult<Boolean> remove(@PathVariable String[] ids) {
+        return success(sysPhotoService.deleteByIds(Arrays.asList(ids)));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.project;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.project.ProjectManagerDO;
+import com.zteits.urbanops.module.garden.dal.mysql.project.ProjectManagerMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 项目管理")
+@RestController
+@RequestMapping("/project/manager")
+public class ProjectManagerController {
+
+    @Resource
+    private ProjectManagerMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "项目管理-分页")
+    @PreAuthorize("@ss.hasPermission('project:manager:list')")
+    public CommonResult<PageResult<ProjectManagerDO>> listForPage(@RequestBody ProjectManagerDO where,
+                                                                  @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                  @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+
+    @GetMapping("/selectProjectManagerForList")
+    @Operation(summary = "项目管理-列表")
+    @PreAuthorize("@ss.hasPermission('project:manager:list')")
+    public CommonResult<List<ProjectManagerDO>> selectProjectManagerForList() {
+        ProjectManagerDO where = new ProjectManagerDO();
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectList(where));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "项目管理-添加")
+    @PreAuthorize("@ss.hasPermission('project:manager:add')")
+    public CommonResult<Boolean> add(@RequestBody ProjectManagerDO entity) {
+        entity.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        entity.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.setUpdater(entity.getCreator());
+        entity.clean();
+        return success(mapper.insert(entity) > 0);
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "项目管理-修改")
+    @PreAuthorize("@ss.hasPermission('project:manager:edit')")
+    public CommonResult<Boolean> edit(@RequestBody ProjectManagerDO entity) {
+        entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.clean();
+        return success(mapper.updateById(entity) > 0);
+    }
+
+    @GetMapping("/deleteById")
+    @Operation(summary = "项目管理-删除")
+    @PreAuthorize("@ss.hasPermission('project:manager:delete')")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(mapper.deleteById(id) > 0);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.project;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.project.SubProjectManagerDO;
+import com.zteits.urbanops.module.garden.dal.mysql.project.SubProjectManagerMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 子项目管理")
+@RestController
+@RequestMapping("/subProject/manager")
+public class SubProjectManagerController {
+
+    @Resource
+    private SubProjectManagerMapper mapper;
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "子项目管理-分页")
+    @PreAuthorize("@ss.hasPermission('project:subproject:list')")
+    public CommonResult<PageResult<SubProjectManagerDO>> listForPage(@RequestBody SubProjectManagerDO where,
+                                                                     @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                                     @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(mapper.selectPage(page, where));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "子项目管理-添加")
+    @PreAuthorize("@ss.hasPermission('project:subproject:add')")
+    public CommonResult<Boolean> add(@RequestBody SubProjectManagerDO entity) {
+        entity.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        entity.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.setUpdater(entity.getCreator());
+        entity.clean();
+        return success(mapper.insert(entity) > 0);
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "子项目管理-修改")
+    @PreAuthorize("@ss.hasPermission('project:subproject:edit')")
+    public CommonResult<Boolean> edit(@RequestBody SubProjectManagerDO entity) {
+        entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.clean();
+        return success(mapper.updateById(entity) > 0);
+    }
+
+    @GetMapping("/deleteById")
+    @Operation(summary = "子项目管理-删除")
+    @PreAuthorize("@ss.hasPermission('project:subproject:delete')")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(mapper.deleteById(id) > 0);
+    }
+}
 \ No newline at end of file
@@ -36,7 +36,7 @@ import com.zteits.urbanops.module.garden.service.rentalmechanicalcost.RentalMech
 @Tag(name = "管理后台 - 租赁机械费用录入")
 @RestController
-@RequestMapping("/garden/rental-mechanical-cost")
+@RequestMapping({"/garden/rental-mechanical-cost", "/costfee/rentalmechanicalcost"})
 @Validated
 public class RentalMechanicalCostController {
@@ -104,6 +104,14 @@ public class RentalMechanicalCostController {
         return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "租赁机械费用录入-列表(兼容旧路径)")
+    @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:query')")
+    public CommonResult<PageResult<RentalMechanicalCostRespVO>> list(@Valid RentalMechanicalCostPageReqVO pageReqVO) {
+        PageResult<RentalMechanicalCostDO> pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出租赁机械费用录入 Excel")
     @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:export')")
+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<PageResult<RoadManagerDO>> 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<RoadManagerDO> 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<RoadManagerDO> getById(@RequestParam("id") Long id) {
+        return success(roadManagerService.selectById(id));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "道路数据管理-添加")
+    @PreAuthorize("@ss.hasPermission('garden:road-manager:create')")
+    public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(roadManagerService.deleteById(id));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "道路数据管理-列表")
+    @PreAuthorize("@ss.hasPermission('garden:road-manager:query')")
+    public CommonResult<List<RoadManagerDO>> 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<List<RoadManagerDO>> 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
+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
+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
+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<PageResult<StandingBookDO>> 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
+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
+package com.zteits.urbanops.module.garden.controller.admin.system;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
+import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO;
+import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import com.zteits.urbanops.module.system.service.dept.DeptService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 系统部门桥接")
+@RestController
+@RequestMapping("/bridge/system/dept")
+public class SystemDeptBridgeController {
+
+    @Resource
+    private DeptService deptService;
+
+    @GetMapping("/list")
+    @Operation(summary = "获取部门列表")
+    public CommonResult<List<DeptRespVO>> list() {
+        List<DeptDO> list = deptService.getDeptList(new DeptListReqVO());
+        return success(BeanUtils.toBean(list, DeptRespVO.class));
+    }
+
+    @GetMapping("/treeselect")
+    @Operation(summary = "部门树精简列表")
+    public CommonResult<List<DeptSimpleRespVO>> treeSelect() {
+        List<DeptDO> list = deptService.getDeptList(new DeptListReqVO());
+        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+    }
+
+    @GetMapping("/treeselectBycompanyId")
+    @Operation(summary = "部门树精简列表(按公司)")
+    public CommonResult<List<DeptSimpleRespVO>> treeSelectByCompany(@RequestParam("belong_company_id") Long companyId) {
+        List<DeptDO> list = deptService.getDeptList(new DeptListReqVO());
+        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+    }
+
+    @GetMapping("/selectPatrolUsersByDeptId")
+    @Operation(summary = "按部门选择巡查用户")
+    public CommonResult<List<DeptSimpleRespVO>> selectPatrolUsersByDeptId(@RequestParam("dept_id") Long deptId) {
+        List<DeptDO> list = deptService.getDeptList(new DeptListReqVO());
+        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.system;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
+import com.zteits.urbanops.module.system.controller.admin.user.UserProfileController;
+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.GetMapping;
+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("/bridge/system/user/profile")
+public class SystemUserBridgeController {
+
+    @Resource
+    private UserProfileController userProfileController;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得登录用户信息")
+    public CommonResult<UserProfileRespVO> getUserProfile() {
+        return userProfileController.getUserProfile();
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.treerecord;
+
+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.module.garden.dal.dataobject.treerecord.GardenTreeDO;
+import com.zteits.urbanops.module.garden.service.treerecord.GardenTreeService;
+import com.zteits.urbanops.module.garden.controller.admin.treerecord.vo.CompanyDeptRoadVO;
+import com.zteits.urbanops.module.garden.controller.admin.treerecord.vo.RoadTreeVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+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("/business/tree")
+public class GardenTreeController {
+
+    @Resource
+    private GardenTreeService gardenTreeService;
+
+    @GetMapping("/list")
+    @Operation(summary = "一树一档案-列表")
+    @PreAuthorize("@ss.hasPermission('business:tree:list')")
+    public CommonResult<PageResult<GardenTreeDO>> list(@RequestParam(required = false) Integer pageNum,
+                                                       @RequestParam(required = false) Integer pageSize,
+                                                       GardenTreeDO where) {
+        int pn = pageNum == null ? 1 : pageNum;
+        int ps = pageSize == null ? 10 : pageSize;
+        return success(gardenTreeService.selectPage(where, pn, ps));
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "一树一档案-导出")
+    @PreAuthorize("@ss.hasPermission('business:tree:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void export(GardenTreeDO where, HttpServletResponse response) throws IOException {
+        List<GardenTreeDO> list = gardenTreeService.selectPage(where, 1, Integer.MAX_VALUE).getList();
+        ExcelUtils.write(response, "树木信息.xls", "数据", GardenTreeDO.class, list);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "一树一档案-详情")
+    @PreAuthorize("@ss.hasPermission('business:tree:query')")
+    public CommonResult<GardenTreeDO> getInfo(@PathVariable("id") Long id) {
+        return success(gardenTreeService.selectById(id));
+    }
+
+    @PostMapping
+    @Operation(summary = "一树一档案-新增")
+    @PreAuthorize("@ss.hasPermission('business:tree:add')")
+    public CommonResult<Boolean> add(@RequestBody GardenTreeDO entity) {
+        entity.setDeleted(false);
+        return success(gardenTreeService.insert(entity));
+    }
+
+    @PutMapping
+    @Operation(summary = "一树一档案-修改")
+    @PreAuthorize("@ss.hasPermission('business:tree:edit')")
+    public CommonResult<Boolean> edit(@RequestBody GardenTreeDO entity) {
+        return success(gardenTreeService.update(entity));
+    }
+
+    @DeleteMapping("/{ids}")
+    @Operation(summary = "一树一档案-删除")
+    @PreAuthorize("@ss.hasPermission('business:tree:remove')")
+    public CommonResult<Boolean> remove(@PathVariable List<Long> ids) {
+        return success(gardenTreeService.deleteByIds(ids));
+    }
+
+    @GetMapping("/dept/list")
+    @Operation(summary = "一树一档案-公司部门道路树结构")
+    @PreAuthorize("@ss.hasPermission('business:tree:list')")
+    public CommonResult<List<CompanyDeptRoadVO>> deptList(@RequestParam Long companyId,
+                                                          @RequestParam(required = false) String roadName,
+                                                          @RequestParam(required = false) Long deptId) {
+        return success(gardenTreeService.getCompanyDeptRoadTreeData(companyId, roadName, deptId));
+    }
+
+    @GetMapping("/road/list")
+    @Operation(summary = "一树一档案-按道路查询树列表")
+    @PreAuthorize("@ss.hasPermission('business:tree:list')")
+    public CommonResult<List<RoadTreeVO>> listTreesByRoad(@RequestParam Long road) {
+        return success(gardenTreeService.getTreesByRoadId(road));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.treerecord;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.dal.dataobject.treerecord.GardenOldtreesDO;
+import com.zteits.urbanops.module.garden.service.treerecord.GardenOldtreesService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+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;
+
+@Tag(name = "管理后台 - 古树名木")
+@RestController
+@RequestMapping("/treerecord/oldtrees")
+public class OldTreesController {
+
+    @Resource
+    private GardenOldtreesService service;
+
+    @GetMapping("/list")
+    @Operation(summary = "古树台账-列表")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:list')")
+    public CommonResult<PageResult<GardenOldtreesDO>> list(GardenOldtreesDO where,
+                                                           @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                           @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        PageParam page = new PageParam();
+        page.setPageNo(pageNum == null ? 1 : pageNum);
+        page.setPageSize(pageSize == null ? 10 : pageSize);
+        return success(service.selectPage(page, where));
+    }
+
+    @GetMapping("/export")
+    @Operation(summary = "古树台账-导出")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:export')")
+    public void export(GardenOldtreesDO where, HttpServletResponse response) throws IOException {
+        where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        List<GardenOldtreesDO> list = service.selectList(where);
+        ExcelUtils.write(response, "古树信息.xls", "数据", GardenOldtreesDO.class, list);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "古树台账-详情")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:query')")
+    public CommonResult<GardenOldtreesDO> getInfo(@PathVariable("id") String id) {
+        return success(service.selectById(id));
+    }
+
+    @PostMapping
+    @Operation(summary = "古树台账-新增")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:add')")
+    public CommonResult<Boolean> add(@RequestBody GardenOldtreesDO entity) {
+        entity.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        entity.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
+        return success(service.insert(entity));
+    }
+
+    @PutMapping
+    @Operation(summary = "古树台账-修改")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:edit')")
+    public CommonResult<Boolean> edit(@RequestBody GardenOldtreesDO entity) {
+        entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        return success(service.update(entity));
+    }
+
+    @DeleteMapping("/{ids}")
+    @Operation(summary = "古树台账-删除")
+    @PreAuthorize("@ss.hasPermission('treerecord:oldtrees:remove')")
+    public CommonResult<Boolean> remove(@PathVariable List<String> ids) {
+        return success(service.deleteByIds(ids));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.treerecord.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompanyDeptRoadVO {
+    private String companyId;
+    private String companyName;
+    private List<DeptVO> depts;
+
+    @Data
+    public static class DeptVO {
+        private Long deptId;
+        private String deptName;
+        private List<RoadVO> roads;
+    }
+
+    @Data
+    public static class RoadVO {
+        private Long roadId;
+        private String roadName;
+        private Long treeCount;
+        private Long recordedCount;
+        private String startRemark;
+        private String endRemark;
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.treerecord.vo;
+
+import lombok.Data;
+
+@Data
+public class RoadTreeVO {
+    private Long id;
+    private String treetype;
+    private String treeheight;
+    private String dbh;
+    private String treenumber;
+    private String treephoto;
+}
 \ No newline at end of file
@@ -31,7 +31,7 @@ import com.zteits.urbanops.module.garden.service.wasterecord.WasteRecordService;
 @Tag(name = "管理后台 - 园林废弃物录入")
 @RestController
-@RequestMapping("/garden/waste-record")
+@RequestMapping({"/garden/waste-record", "/costfee/gardenwasterecord"})
 @Validated
 public class WasteRecordController {
@@ -88,6 +88,14 @@ public class WasteRecordController {
         return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "园林废弃物录入-列表(兼容旧路径)")
+    @PreAuthorize("@ss.hasPermission('garden:waste-record:query')")
+    public CommonResult<PageResult<WasteRecordRespVO>> list(@Valid WasteRecordPageReqVO pageReqVO) {
+        PageResult<WasteRecordDO> pageResult = wasteRecordService.getWasteRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出园林废弃物录入 Excel")
     @PreAuthorize("@ss.hasPermission('garden:waste-record:export')")
+package com.zteits.urbanops.module.garden.controller.app;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.vo.DictTypeRespVO;
+import com.zteits.urbanops.module.system.dal.dataobject.dict.DictDataDO;
+import com.zteits.urbanops.module.system.service.dict.DictDataService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "APP - 公共查询")
+@RestController
+@RequestMapping("/app/common")
+public class AppCommonController {
+
+    @Resource
+    private DictDataService dictDataService;
+
+    @GetMapping("/type")
+    @Operation(summary = "根据字典类型查询字典数据信息")
+    public CommonResult<List<DictTypeRespVO>> dictType(@RequestParam("dict_type") String dictType) {
+        List<DictTypeRespVO> respList = new ArrayList<>();
+        List<DictDataDO> list = dictDataService.getDictDataListByDictType(dictType);
+        if (list == null || list.isEmpty()) {
+            return success(respList);
+        }
+        for (DictDataDO e : list) {
+            DictTypeRespVO resp = new DictTypeRespVO();
+            resp.setValue(e.getValue());
+            resp.setLabel(e.getLabel());
+            respList.add(resp);
+        }
+        return success(respList);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.business.vo.MaterialTypeManagerRespVO;
+import com.zteits.urbanops.module.garden.service.material.MaterialTypeService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "APP - 物料类型")
+@RestController
+@RequestMapping("/app/materialType/type")
+public class AppMaterialTypeController {
+
+    @Resource
+    private MaterialTypeService materialTypeService;
+
+    @GetMapping("/getMaterialBigTypeList")
+    @Operation(summary = "物料类型基础表-耗材类型List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialBigTypeList() {
+        return success(materialTypeService.queryMaterialBigType(30000L));
+    }
+
+    @GetMapping("/getMaterialMidTypeList")
+    @Operation(summary = "物料类型基础表-类别List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialMidTypeList(@RequestParam("material_type_id") Long materialTypeId) {
+        return success(materialTypeService.queryMaterialMidType(materialTypeId));
+    }
+
+    @GetMapping("/getMaterialDetailTypeList")
+    @Operation(summary = "物料类型基础表-类别明细List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialDetailTypeList(@RequestParam("parent_type_id") Long parentTypeId) {
+        return success(materialTypeService.queryMaterialDetailType(parentTypeId));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.vo.UserGpsAddReqVO;
+import com.zteits.urbanops.module.garden.controller.app.vo.UserGpsRespVO;
+import com.zteits.urbanops.module.garden.service.usergps.UserGpsService;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "APP - 用户经纬度")
+@RestController
+@RequestMapping("/app/user/gps")
+public class AppUserGpsController {
+
+    @Resource
+    private UserGpsService userGpsService;
+
+    
+
+    @GetMapping("/list")
+    @Operation(summary = "用户经纬度-查询列表")
+    public CommonResult<List<UserGpsRespVO>> list(@RequestParam("user_id") Long userId,
+                                                  @RequestParam("commit_time") String commitTime) {
+        return success(userGpsService.selectUserGpsList(userId, commitTime));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "用户经纬度-添加")
+    public CommonResult<Boolean> add(@Valid @RequestBody UserGpsAddReqVO reqVO) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        String nickname = SecurityFrameworkUtils.getLoginUserNickname();
+        return success(userGpsService.insertUserGps(userId, nickname, reqVO));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.plan;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.controller.app.vo.PlanCommitDetailPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.vo.PlanTaskCommitDetailPageRespVO;
+import com.zteits.urbanops.module.garden.service.plancommit.MaintainPlanCommitDetailService;
+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 = "APP - 养护、巡检计划提交记录")
+@RestController
+@RequestMapping("/app/plan/commit")
+public class AppMaintainPlanCommitController {
+
+    @Resource
+    private MaintainPlanCommitDetailService service;
+
+    @PostMapping("/xc/listForPage")
+    @Operation(summary = "巡检计划提交记录-分页查询")
+    public CommonResult<PageResult<PlanTaskCommitDetailPageRespVO>> listForPage(@RequestBody PlanCommitDetailPageReqVO reqVO) {
+        PageParam page = new PageParam();
+        page.setPageNo(reqVO.getPageNo());
+        page.setPageSize(reqVO.getPageSize());
+        return success(service.pageListXC(page, reqVO));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "巡检计划-add")
+    public CommonResult<Boolean> add(@RequestBody com.zteits.urbanops.module.garden.controller.app.vo.PlanCommitDetailAddReqVO reqVO) {
+        Long userId = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+        String nickname = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname();
+        java.time.LocalDate today = java.time.LocalDate.now();
+        Integer count = service.selectByPlanNoAndCommitDate(reqVO.planNo, today);
+        if (count != null && count > 0) {
+            return com.zteits.urbanops.framework.common.pojo.CommonResult.error(409, "记录已存在,请勿重复提交");
+        }
+        return success(service.insertXC(userId, nickname, reqVO));
+    }
+
+    @PostMapping("/yh/listForPage")
+    @Operation(summary = "养护计划提交记录-分页查询")
+    public CommonResult<PageResult<PlanTaskCommitDetailPageRespVO>> yhListForPage(@RequestBody com.zteits.urbanops.module.garden.controller.app.vo.PlanYhCommitDetailPageReqVO reqVO) {
+        PageParam page = new PageParam();
+        page.setPageNo(reqVO.getPageNo());
+        page.setPageSize(reqVO.getPageSize());
+        return success(service.pageListYH(page, reqVO));
+    }
+
+    @PostMapping("/yh/add")
+    @Operation(summary = "养护计划-add")
+    public CommonResult<Boolean> yhAdd(@RequestBody com.zteits.urbanops.module.garden.controller.app.vo.PlanCommitDetailYhAddReqVO reqVO) {
+        Long userId = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+        String nickname = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname();
+        return success(service.insertYH(userId, nickname, reqVO));
+    }
+
+    @RequestMapping(value = "/yh/getById", method = org.springframework.web.bind.annotation.RequestMethod.GET)
+    @Operation(summary = "养护计划提交记录-提交明细")
+    public CommonResult<PlanTaskCommitDetailPageRespVO> yhGetById(@org.springframework.web.bind.annotation.RequestParam("id") Long id,
+                                                                  @org.springframework.web.bind.annotation.RequestParam(value = "is_add_url", required = false) Boolean isAddUrl) {
+        return success(service.getById(id));
+    }
+
+    @RequestMapping(value = "/yh/getMaintainNo", method = org.springframework.web.bind.annotation.RequestMethod.GET)
+    @Operation(summary = "养护任务提交记录-提交明细")
+    public CommonResult<PlanTaskCommitDetailPageRespVO> yhGetByProblemNo(@org.springframework.web.bind.annotation.RequestParam("problem_no") String problemNo,
+                                                                         @org.springframework.web.bind.annotation.RequestParam(value = "is_add_url", required = false) Boolean isAddUrl) {
+        return success(service.getByProblemNo(problemNo, isAddUrl));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import lombok.Data;
+
+@Data
+public class DictTypeRespVO {
+    private String value;
+    private String label;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class PlanCommitDetailAddReqVO {
+    @NotEmpty
+    public String planNo;
+    public String content;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import lombok.Data;
+
+@Data
+public class PlanCommitDetailPageReqVO extends PageParam {
+    private String planNo;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class PlanCommitDetailYhAddReqVO {
+    @NotEmpty
+    private String planNo;
+    private String problemNo;
+    @NotEmpty
+    private String content;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import lombok.Data;
+
+@Data
+public class PlanTaskCommitDetailPageRespVO {
+    private Long id;
+    private String planNo;
+    private String commitDate;
+    private String content;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import lombok.Data;
+
+@Data
+public class PlanYhCommitDetailPageReqVO extends PageParam {
+    private Long companyId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UserGpsAddReqVO {
+    private Integer type;
+    @NotNull
+    private BigDecimal lat;
+    @NotNull
+    private BigDecimal lon;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Data
+public class UserGpsAppReqVO {
+    @NotEmpty
+    private String commitTime;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class UserGpsRespVO {
+    private Long id;
+    private LocalDateTime commitDate;
+    private Integer type;
+    private Long userId;
+    private String userName;
+    private BigDecimal lat;
+    private BigDecimal lon;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.business;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.business.vo.MaterialTypeAddReqVO;
+import com.zteits.urbanops.module.garden.controller.business.vo.MaterialTypeEditReqVO;
+import com.zteits.urbanops.module.garden.controller.business.vo.MaterialTypeManagerRespVO;
+import com.zteits.urbanops.module.garden.controller.business.vo.MaterialTypePageReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeDO;
+import com.zteits.urbanops.module.garden.service.material.MaterialTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "园林养护 - 物料类型")
+@RestController
+@RequestMapping("/materialType/type")
+public class MaterialTypeController {
+
+    @Resource
+    private MaterialTypeService materialTypeService;
+
+    @GetMapping("/getMaterialBigTypeList")
+    @Operation(summary = "物料类型基础表-耗材类型List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialBigTypeList() {
+        return success(materialTypeService.queryMaterialBigType(null));
+    }
+
+    @GetMapping("/getMaterialMidTypeList")
+    @Operation(summary = "物料类型基础表-类别List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialMidTypeList(@RequestParam("material_type_id") Long materialTypeId) {
+        return success(materialTypeService.queryMaterialMidType(materialTypeId));
+    }
+
+    @GetMapping("/getMaterialDetailTypeList")
+    @Operation(summary = "物料类型基础表-类别明细List")
+    public CommonResult<List<MaterialTypeManagerRespVO>> getMaterialDetailTypeList(@RequestParam("parent_type_id") Long parentTypeId) {
+        return success(materialTypeService.queryMaterialDetailType(parentTypeId));
+    }
+
+    @PostMapping("/listForPage")
+    @Operation(summary = "耗材基础-分页")
+    public CommonResult<PageResult<MaterialTypeDO>> listForPage(@Valid @RequestBody MaterialTypePageReqVO reqVO) {
+        MaterialTypeDO where = new MaterialTypeDO();
+        String keyword = reqVO.getTypeName();
+        if (keyword == null || keyword.isEmpty()) {
+            keyword = reqVO.getMaterialTypeName();
+        }
+        if (keyword == null || keyword.isEmpty()) {
+            keyword = reqVO.getTypeDetailName();
+        }
+        where.setTypeName(keyword);
+        Page<MaterialTypeDO> page = materialTypeService.selectPage(new Page<>(reqVO.getPageNum(), reqVO.getPageSize()), where);
+        return success(new PageResult<>(page.getRecords(), page.getTotal()));
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "耗材基础-添加")
+    public CommonResult<Boolean> add(@Valid @RequestBody MaterialTypeAddReqVO reqVO) {
+        MaterialTypeDO entity = new MaterialTypeDO();
+        entity.setTypeName(reqVO.getTypeDetailName());
+        entity.setParentId(reqVO.getTypeId());
+        entity.setLevel(3);
+        entity.setCreator("system");
+        entity.setUpdater("system");
+        return success(materialTypeService.insert(entity));
+    }
+
+    @PostMapping("/edit")
+    @Operation(summary = "耗材基础-修改")
+    public CommonResult<Boolean> edit(@Valid @RequestBody MaterialTypeEditReqVO reqVO) {
+        MaterialTypeDO entity = new MaterialTypeDO();
+        BeanUtil.copyProperties(reqVO, entity, true);
+        return success(materialTypeService.update(entity));
+    }
+
+    @GetMapping("/deleteById")
+    @Operation(summary = "耗材基础-删除")
+    public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
+        return success(materialTypeService.deleteById(id));
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.business.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 MaterialTypeAddReqVO {
+    @Schema(description = "物料类型ID")
+    @NotNull
+    private Long materialTypeId;
+
+    @Schema(description = "耗材类型名称")
+    @NotEmpty
+    private String materialTypeName;
+
+    @Schema(description = "类别ID")
+    @NotNull
+    private Long typeId;
+
+    @Schema(description = "类别名称")
+    @NotEmpty
+    private String typeName;
+
+    @Schema(description = "类别明细")
+    @NotEmpty
+    private String typeDetailName;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.business.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class MaterialTypeEditReqVO {
+    @NotNull
+    private Long id;
+
+    @Schema(description = "物料类型ID")
+    private Long materialTypeId;
+
+    @Schema(description = "耗材类型名称")
+    private String materialTypeName;
+
+    @Schema(description = "类别ID")
+    private Long typeId;
+
+    @Schema(description = "类别名称")
+    private String typeName;
+
+    @Schema(description = "类别明细ID")
+    private Long typeDetailId;
+
+    @Schema(description = "类别明细")
+    private String typeDetailName;
+
+    private Long materialParentTypeId;
+
+    private Long parentTypeId;
+
+    private String status;
+
+    private String remark;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.business.vo;
+
+import lombok.Data;
+
+@Data
+public class MaterialTypeManagerRespVO {
+    private Long value;
+    private String label;
+    private Long materialParentTypeId;
+    private Long parentTypeId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.business.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class MaterialTypePageReqVO {
+
+    @Schema(description = "页码")
+    private Integer pageNum = 1;
+
+    @Schema(description = "每页数量")
+    private Integer pageSize = 10;
+
+    private String materialTypeName;
+    private String typeName;
+    private String typeDetailName;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.device;
+
+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_device_company")
+@Data
+public class DeviceCompanyDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String name;
+    private Long parentId;
+    private Long belongCompanyId;
+    private String enterLoginName;
+    private String passWord;
+    private String status;
+    private String remark;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.hotline;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import lombok.Data;
+
+import java.util.Date;
+
+@TableName("garden_hotline_case")
+@Data
+public class HotlineCaseDO extends BaseDO {
+    @TableId
+    private String id;
+    private String hotlinenumber;
+    private String casefile;
+    private String title;
+    private String content;
+    private String department;
+    private String taskstate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date replayTime;
+    private String street;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.hotline;
+
+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_hotline_file")
+@Data
+public class HotlineFileDO extends BaseDO {
+    @TableId
+    private String caseid;
+    private String casefile;
+    private String title;
+    private String content;
+}
 \ No newline at end of file
+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 com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import lombok.Data;
+
+@TableName("garden_maintain_plan")
+@KeySequence("garden_maintain_plan_seq")
+@Data
+public class MaintainPlanDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String planNo;
+    private String planName;
+    private Integer type;
+    private Long deptId;
+    private Long companyId;
+    private String status;
+}
 \ No newline at end of file
+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
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+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_material")
+@Data
+public class MaterialDO extends BaseDO {
+    @TableId
+    private Long materialId;
+    private String fullCode;
+    private String materialCode;
+    private String materialName;
+    private Long materialTypeId;
+    private String materialTypeName;
+    private Long typeId;
+    private String typeName;
+    private Long typeDetailId;
+    private String typeDetailName;
+    private String specCode;
+    private String specifications;
+    private Long unitId;
+    private String unitName;
+    private Long belongCompanyId;
+    private String belongCompanyName;
+    private String status;
+    private Integer isAssociatedOrder;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+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_material_inventory")
+@Data
+public class MaterialInventoryDO extends BaseDO {
+    @TableId
+    private Long inventoryId;
+    private Long materialId;
+    private String materialName;
+    private Long materialTypeId;
+    private String materialTypeName;
+    private Long typeId;
+    private String typeName;
+    private Long typeDetailId;
+    private String typeDetailName;
+    private String specifications;
+    private Long belongCompanyId;
+    private String belongCompanyName;
+    private Long unitId;
+    private String unitName;
+    private Long currentNum;
+    private Long outTotalNum;
+    private Long inventoryTotalNum;
+    private String status;
+    private Long inventoryAlermNum;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@TableName("garden_material_inventory_in")
+@Data
+public class MaterialInventoryInDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String inventoryInNo;
+    private Long materialId;
+    private String materialName;
+    private Long materialTypeId;
+    private String materialTypeName;
+    private Long typeId;
+    private String typeName;
+    private Long typeDetailId;
+    private String typeDetailName;
+    private String specifications;
+    private Long belongCompanyId;
+    private String belongCompanyName;
+    private Long inInventoryNum;
+    private BigDecimal materialPrice;
+    private Long unitId;
+    private String unitName;
+    private Date buyDate;
+    private String supplierName;
+    private String contactsName;
+    private String contactsPhone;
+    private String status;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import lombok.Data;
+
+import java.util.Date;
+
+@TableName("garden_material_inventory_out")
+@Data
+public class MaterialInventoryOutDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String inventoryOutNo;
+    private Long materialId;
+    private String materialName;
+    private Long materialTypeId;
+    private String materialTypeName;
+    private Long typeId;
+    private String typeName;
+    private Long typeDetailId;
+    private String typeDetailName;
+    private String specifications;
+    private Long belongCompanyId;
+    private String belongCompanyName;
+    private Long outInventoryNum;
+    private Long unitId;
+    private String unitName;
+    private Date outDate;
+    private String status;
+    private Integer type;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+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_material_manager")
+@Data
+public class MaterialManagerDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String name;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.material;
+
+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_material_type")
+@Data
+public class MaterialTypeDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String typeName;
+    private Long parentId;
+    private Integer level;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.performance;
+
+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_performance_experts")
+@Data
+public class PerformanceExpertsDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String name;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.performance;
+
+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_performance_index")
+@Data
+public class PerformanceIndexDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String title;
+    private String deptName;
+    private Long deptId;
+    private String status;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.performance;
+
+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_performance_write")
+@Data
+public class PerformanceWriteDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String title;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.photo;
+
+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_sys_photo")
+@Data
+public class SysPhotoDO extends BaseDO {
+    @TableId
+    private String id;
+    private String url;
+    private String title;
+    private String remark;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.plancommit;
+
+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_maintain_plan_commit_detail")
+@Data
+public class MaintainPlanCommitDetailDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String planNo;
+    private String problemNo;
+    private String commitDate;
+    private String content;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.problem;
+
+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_problem_manager")
+@Data
+public class MaintainProblemManagerDO extends BaseDO {
+    @TableId
+    private Long id;
+    private Integer distributeStatus;
+    private Integer leaderConfrimStatus;
+    private Integer userConfrimStatus;
+    private String status;
+    private String title;
+    private String content;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.problem;
+
+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_problem_task")
+@Data
+public class MaintainTaskManagerDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String problemNo;
+    private Long deptId;
+    private String title;
+    private String content;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.project;
+
+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_project_manager")
+@Data
+public class ProjectManagerDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String projectName;
+    private Long deptId;
+    private String status;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.project;
+
+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_sub_project_manager")
+@Data
+public class SubProjectManagerDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String name;
+    private Long deptId;
+}
 \ No newline at end of file
+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
+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
+package com.zteits.urbanops.module.garden.dal.dataobject.treerecord;
+
+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_oldtrees")
+@Data
+public class GardenOldtreesDO extends BaseDO {
+    @TableId
+    private String id;
+    private String treenumber;
+    private String latinname;
+    private String treetype;
+    private String treeheight;
+    private String canopy;
+    private String dbh;
+    private String growthvigor;
+    private String treelevel;
+    private String longitude;
+    private String latitude;
+    private String location;
+    private String maintainunit;
+    private String managedutyunit;
+    private Long road;
+    private String street;
+    private String oldtreeownership;
+    private String datastate;
+    private String estimationtreeage;
+    private String canopyeastwest;
+    private String canopysouthnorth;
+    private String weekday;
+    private String growlocation;
+    private String growthenvironment;
+    private String treephotoone;
+    private String treephototwo;
+    private String treephotothree;
+    private String treephotofour;
+    private String treephotofive;
+    private Long deptId;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.treerecord;
+
+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;
+import lombok.experimental.Accessors;
+
+@TableName("garden_tree")
+@KeySequence("garden_tree_seq")
+@Data
+@Accessors(chain = false)
+public class GardenTreeDO extends BaseDO {
+    @TableId
+    private Long id;
+    private String treenumber;
+    private String latinname;
+    private String treetype;
+    private String treeheight;
+    private String canopy;
+    private String dbh;
+    private String growthvigor;
+    private String treelevel;
+    private String longitude;
+    private String latitude;
+    private String location;
+    private String maintainunit;
+    private String managedutyunit;
+    private Long road;
+    private String street;
+    private String oldtreeownership;
+    private String datastate;
+    private String estimationtreeage;
+    private String canopyeastwest;
+    private String canopysouthnorth;
+    private String weekday;
+    private String growlocation;
+    private String growthenvironment;
+    private String treephotoone;
+    private String treephototwo;
+    private String treephotothree;
+    private String treephotofour;
+    private String treephotofive;
+    private String createby;
+    private String updateby;
+    private Long deptId;
+    private String remark;
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.dal.dataobject.usergps;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class UserGpsDO {
+    private Long id;
+    private LocalDateTime commitDate;
+    private Long userId;
+    private String userName;
+    private Integer type;
+    private BigDecimal lat;
+    private BigDecimal lon;
+    private String status;
+}
 \ No newline at end of file