fix (farm): 包路径调整

- 提升代码可阅读性

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput;
+package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput;
 
-import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputRespVO.java

@@ -1,88 +1,88 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 种植中心-农事基地-农事记录-投入品 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class FarmingRecordInputRespVO {
-
-    @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16612")
-    @ExcelProperty("基础id")
-    private String id;
-
-    @Schema(description = "农事记录ID", example = "11421")
-    @ExcelProperty("农事记录ID")
-    private String farmRecordId;
-
-    @Schema(description = "投入品-父类")
-    @ExcelProperty("投入品-父类")
-    private String inputParentCategory;
-
-    @Schema(description = "投入品-子类")
-    @ExcelProperty("投入品-子类")
-    private String inputChildCategory;
-
-    @Schema(description = "稀释倍液 (如为: 药物时需展示输入框)")
-    @ExcelProperty("稀释倍液 (如为: 药物时需展示输入框)")
-    private String dilutionRatio;
-
-    @Schema(description = "单用用量 (如为: 肥料选项时)")
-    @ExcelProperty("单用用量 (如为: 肥料选项时)")
-    private String singleUseOption;
-
-    @Schema(description = "单用用量-值")
-    @ExcelProperty("单用用量-值")
-    private BigDecimal singleUseValue;
-
-    @Schema(description = "单用用量-单位")
-    @ExcelProperty("单用用量-单位")
-    private String singleUseUnit;
-
-    @Schema(description = "施用范围")
-    @ExcelProperty("施用范围")
-    private String applicationScope;
-
-    @Schema(description = "用量")
-    @ExcelProperty("用量")
-    private BigDecimal dosage;
-
-    @Schema(description = "用法")
-    @ExcelProperty("用法")
-    private String usage;
-
-    @Schema(description = "逻辑删除标识符", example = "1")
-    @ExcelProperty("逻辑删除标识符")
-    private Boolean delStatus;
-
-    @Schema(description = "基地id", example = "17710")
-    @ExcelProperty("基地id")
-    private String baseId;
-
-    @Schema(description = "基地", example = "芋艿")
-    @ExcelProperty("基地")
-    private String baseName;
-
-    @Schema(description = "地块ID", example = "10042")
-    @ExcelProperty("地块ID")
-    private String plotId;
-
-    @Schema(description = "地块", example = "赵六")
-    @ExcelProperty("地块")
-    private String plotName;
-
-    @Schema(description = "租户id", example = "1677")
-    @ExcelProperty("租户id")
-    private String tenantId;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}
+package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 种植中心-农事基地-农事记录-投入品 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class FarmingRecordInputRespVO {
+
+    @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16612")
+    @ExcelProperty("基础id")
+    private String id;
+
+    @Schema(description = "农事记录ID", example = "11421")
+    @ExcelProperty("农事记录ID")
+    private String farmRecordId;
+
+    @Schema(description = "投入品-父类")
+    @ExcelProperty("投入品-父类")
+    private String inputParentCategory;
+
+    @Schema(description = "投入品-子类")
+    @ExcelProperty("投入品-子类")
+    private String inputChildCategory;
+
+    @Schema(description = "稀释倍液 (如为: 药物时需展示输入框)")
+    @ExcelProperty("稀释倍液 (如为: 药物时需展示输入框)")
+    private String dilutionRatio;
+
+    @Schema(description = "单用用量 (如为: 肥料选项时)")
+    @ExcelProperty("单用用量 (如为: 肥料选项时)")
+    private String singleUseOption;
+
+    @Schema(description = "单用用量-值")
+    @ExcelProperty("单用用量-值")
+    private BigDecimal singleUseValue;
+
+    @Schema(description = "单用用量-单位")
+    @ExcelProperty("单用用量-单位")
+    private String singleUseUnit;
+
+    @Schema(description = "施用范围")
+    @ExcelProperty("施用范围")
+    private String applicationScope;
+
+    @Schema(description = "用量")
+    @ExcelProperty("用量")
+    private BigDecimal dosage;
+
+    @Schema(description = "用法")
+    @ExcelProperty("用法")
+    private String usage;
+
+    @Schema(description = "逻辑删除标识符", example = "1")
+    @ExcelProperty("逻辑删除标识符")
+    private Boolean delStatus;
+
+    @Schema(description = "基地id", example = "17710")
+    @ExcelProperty("基地id")
+    private String baseId;
+
+    @Schema(description = "基地", example = "芋艿")
+    @ExcelProperty("基地")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "10042")
+    @ExcelProperty("地块ID")
+    private String plotId;
+
+    @Schema(description = "地块", example = "赵六")
+    @ExcelProperty("地块")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "1677")
+    @ExcelProperty("租户id")
+    private String tenantId;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java

@@ -33,69 +33,69 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO;
 import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService;
 
-@Tag(name = "管理后台 - 设备与地块关联")
-@RestController
-@RequestMapping("/farm/device-plot-relation")
-@Validated
+//@Tag(name = "管理后台 - 设备与地块关联")
+//@RestController
+//@RequestMapping("/farm/device-plot-relation")
+//@Validated
 public class DevicePlotRelationController {
 
-    @Resource
-    private DevicePlotRelationService devicePlotRelationService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建设备与地块关联")
-    public CommonResult<String> createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) {
-        return success(devicePlotRelationService.createDevicePlotRelation(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新设备与地块关联")
-    public CommonResult<Boolean> updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) {
-        devicePlotRelationService.updateDevicePlotRelation(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除设备与地块关联")
-    @Parameter(name = "id", description = "编号", required = true)
-    public CommonResult<Boolean> deleteDevicePlotRelation(@RequestParam("id") String id) {
-        devicePlotRelationService.deleteDevicePlotRelation(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete-list")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除设备与地块关联")
-    public CommonResult<Boolean> deleteDevicePlotRelationList(@RequestParam("ids") List<String> ids) {
-        devicePlotRelationService.deleteDevicePlotRelationListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得设备与地块关联")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<DevicePlotRelationRespVO> getDevicePlotRelation(@RequestParam("id") String id) {
-        DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id);
-        return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得设备与地块关联分页")
-    public CommonResult<PageResult<DevicePlotRelationRespVO>> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) {
-        PageResult<DevicePlotRelationDO> pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出设备与地块关联 Excel")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DevicePlotRelationDO> list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class,
-                        BeanUtils.toBean(list, DevicePlotRelationRespVO.class));
-    }
+//    @Resource
+//    private DevicePlotRelationService devicePlotRelationService;
+//
+//    @PostMapping("/create")
+//    @Operation(summary = "创建设备与地块关联")
+//    public CommonResult<String> createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) {
+//        return success(devicePlotRelationService.createDevicePlotRelation(createReqVO));
+//    }
+//
+//    @PutMapping("/update")
+//    @Operation(summary = "更新设备与地块关联")
+//    public CommonResult<Boolean> updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) {
+//        devicePlotRelationService.updateDevicePlotRelation(updateReqVO);
+//        return success(true);
+//    }
+//
+//    @DeleteMapping("/delete")
+//    @Operation(summary = "删除设备与地块关联")
+//    @Parameter(name = "id", description = "编号", required = true)
+//    public CommonResult<Boolean> deleteDevicePlotRelation(@RequestParam("id") String id) {
+//        devicePlotRelationService.deleteDevicePlotRelation(id);
+//        return success(true);
+//    }
+//
+//    @DeleteMapping("/delete-list")
+//    @Parameter(name = "ids", description = "编号", required = true)
+//    @Operation(summary = "批量删除设备与地块关联")
+//    public CommonResult<Boolean> deleteDevicePlotRelationList(@RequestParam("ids") List<String> ids) {
+//        devicePlotRelationService.deleteDevicePlotRelationListByIds(ids);
+//        return success(true);
+//    }
+//
+//    @GetMapping("/get")
+//    @Operation(summary = "获得设备与地块关联")
+//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    public CommonResult<DevicePlotRelationRespVO> getDevicePlotRelation(@RequestParam("id") String id) {
+//        DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id);
+//        return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class));
+//    }
+//
+//    @GetMapping("/page")
+//    @Operation(summary = "获得设备与地块关联分页")
+//    public CommonResult<PageResult<DevicePlotRelationRespVO>> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) {
+//        PageResult<DevicePlotRelationDO> pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO);
+//        return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class));
+//    }
+//
+//    @GetMapping("/export-excel")
+//    @Operation(summary = "导出设备与地块关联 Excel")
+//    @ApiAccessLog(operateType = EXPORT)
+//    public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO,
+//              HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<DevicePlotRelationDO> list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class,
+//                        BeanUtils.toBean(list, DevicePlotRelationRespVO.class));
+//    }
 
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/devicestatus/DeviceStatusController.java

@@ -21,184 +21,184 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-@Tag(name = "管理后台 - 设备状态管理")
-@RestController
-@RequestMapping("/farm/device-status")
-@Validated
-@Slf4j
+//@Tag(name = "管理后台 - 设备状态管理")
+//@RestController
+//@RequestMapping("/farm/device-status")
+//@Validated
+//@Slf4j
 public class DeviceStatusController {
-
-    @Resource
-    private DeviceStatusService deviceStatusService;
-
-    @Resource
-    private DeviceInfoMapper deviceInfoMapper;
-
-    @GetMapping("/check/{deviceUniqueId}")
-    @Operation(summary = "检查设备是否在线")
-    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<Boolean> checkDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
-        boolean online = deviceStatusService.isDeviceOnline(deviceUniqueId);
-        return success(online);
-    }
-
-    @GetMapping("/state/{deviceUniqueId}")
-    @Operation(summary = "获取设备状态")
-    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<DeviceStatusRespVO> getDeviceStatus(@PathVariable("deviceUniqueId") String deviceUniqueId) {
-        DeviceInfoDO device = deviceInfoMapper.selectOne(DeviceInfoDO::getDeviceUniqueId, deviceUniqueId);
-        if (device == null) {
-            return success(null);
-        }
-
-        DeviceStatusRespVO respVO = BeanUtils.toBean(device, DeviceStatusRespVO.class);
-        if (device.getDeviceState() != null) {
-            DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(device.getDeviceState());
-            if (stateEnum != null) {
-                respVO.setStateName(stateEnum.getName());
-                respVO.setOnline(DeviceStateEnum.isOnline(device.getDeviceState()));
-            }
-        }
-        return success(respVO);
-    }
-
-    @GetMapping("/online-devices")
-    @Operation(summary = "获取在线设备列表")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<List<DeviceStatusRespVO>> getOnlineDevices() {
-        List<DeviceInfoDO> devices = deviceStatusService.getOnlineDevices();
-        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
-
-        // 填充状态信息
-        respList.forEach(resp -> {
-            if (resp.getState() != null) {
-                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
-                if (stateEnum != null) {
-                    resp.setStateName(stateEnum.getName());
-                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
-                }
-            }
-        });
-
-        return success(respList);
-    }
-
-    @GetMapping("/offline-devices")
-    @Operation(summary = "获取离线设备列表")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<List<DeviceStatusRespVO>> getOfflineDevices() {
-        List<DeviceInfoDO> devices = deviceStatusService.getOfflineDevices();
-        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
-
-        // 填充状态信息
-        respList.forEach(resp -> {
-            if (resp.getState() != null) {
-                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
-                if (stateEnum != null) {
-                    resp.setStateName(stateEnum.getName());
-                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
-                }
-            }
-        });
-
-        return success(respList);
-    }
-
-    @GetMapping("/timeout-devices")
-    @Operation(summary = "获取超时未上报的设备列表")
-    @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<List<DeviceStatusRespVO>> getTimeoutDevices(
-            @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
-        List<DeviceInfoDO> devices = deviceStatusService.getTimeoutDevices(timeoutMinutes);
-        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
-
-        // 填充状态信息
-        respList.forEach(resp -> {
-            if (resp.getState() != null) {
-                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
-                if (stateEnum != null) {
-                    resp.setStateName(stateEnum.getName());
-                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
-                }
-            }
-        });
-
-        return success(respList);
-    }
-
-    @GetMapping("/statistics")
-    @Operation(summary = "获取设备状态统计")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
-    public CommonResult<DeviceStatusStatisticsRespVO> getDeviceStatusStatistics() {
-        DeviceStatusStatisticsRespVO statistics = new DeviceStatusStatisticsRespVO();
-
-        // 统计各状态设备数量
-        Long totalCount = deviceInfoMapper.selectCount();
-        Long onlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.ONLINE.getState());
-        Long offlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.OFFLINE.getState());
-        Long inactiveCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.INACTIVE.getState());
-        Long maintenanceCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.MAINTENANCE.getState());
-        Long faultCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.FAULT.getState());
-
-        statistics.setTotalCount(totalCount);
-        statistics.setOnlineCount(onlineCount != null ? onlineCount : 0L);
-        statistics.setOfflineCount(offlineCount != null ? offlineCount : 0L);
-        statistics.setInactiveCount(inactiveCount != null ? inactiveCount : 0L);
-        statistics.setMaintenanceCount(maintenanceCount != null ? maintenanceCount : 0L);
-        statistics.setFaultCount(faultCount != null ? faultCount : 0L);
-
-        // 计算在线率和离线率
-        if (totalCount > 0) {
-            statistics.setOnlineRate((double) statistics.getOnlineCount() / totalCount * 100);
-            statistics.setOfflineRate((double) statistics.getOfflineCount() / totalCount * 100);
-        } else {
-            statistics.setOnlineRate(0.0);
-            statistics.setOfflineRate(0.0);
-        }
-
-        return success(statistics);
-    }
-
-    @PostMapping("/update-state/{deviceUniqueId}")
-    @Operation(summary = "手动更新设备状态")
-    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
-    @Parameter(name = "state", description = "设备状态", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
-    public CommonResult<Boolean> updateDeviceState(
-            @PathVariable("deviceUniqueId") String deviceUniqueId,
-            @RequestParam("state") Integer state) {
-        deviceStatusService.updateDeviceState(deviceUniqueId, state);
-        return success(true);
-    }
-
-    @PostMapping("/set-online/{deviceUniqueId}")
-    @Operation(summary = "手动设置设备上线")
-    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
-    public CommonResult<Boolean> setDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
-        deviceStatusService.deviceOnline(deviceUniqueId);
-        return success(true);
-    }
-
-    @PostMapping("/set-offline/{deviceUniqueId}")
-    @Operation(summary = "手动设置设备离线")
-    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
-    public CommonResult<Boolean> setDeviceOffline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
-        deviceStatusService.deviceOffline(deviceUniqueId);
-        return success(true);
-    }
-
-    @PostMapping("/check-offline")
-    @Operation(summary = "手动检查离线设备")
-    @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
-    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
-    public CommonResult<Integer> checkOfflineDevices(
-            @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
-        int count = deviceStatusService.checkAndUpdateOfflineDevices(timeoutMinutes);
-        return success(count);
-    }
+//
+//    @Resource
+//    private DeviceStatusService deviceStatusService;
+//
+//    @Resource
+//    private DeviceInfoMapper deviceInfoMapper;
+//
+//    @GetMapping("/check/{deviceUniqueId}")
+//    @Operation(summary = "检查设备是否在线")
+//    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<Boolean> checkDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
+//        boolean online = deviceStatusService.isDeviceOnline(deviceUniqueId);
+//        return success(online);
+//    }
+//
+//    @GetMapping("/state/{deviceUniqueId}")
+//    @Operation(summary = "获取设备状态")
+//    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<DeviceStatusRespVO> getDeviceStatus(@PathVariable("deviceUniqueId") String deviceUniqueId) {
+//        DeviceInfoDO device = deviceInfoMapper.selectOne(DeviceInfoDO::getDeviceUniqueId, deviceUniqueId);
+//        if (device == null) {
+//            return success(null);
+//        }
+//
+//        DeviceStatusRespVO respVO = BeanUtils.toBean(device, DeviceStatusRespVO.class);
+//        if (device.getDeviceState() != null) {
+//            DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(device.getDeviceState());
+//            if (stateEnum != null) {
+//                respVO.setStateName(stateEnum.getName());
+//                respVO.setOnline(DeviceStateEnum.isOnline(device.getDeviceState()));
+//            }
+//        }
+//        return success(respVO);
+//    }
+//
+//    @GetMapping("/online-devices")
+//    @Operation(summary = "获取在线设备列表")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<List<DeviceStatusRespVO>> getOnlineDevices() {
+//        List<DeviceInfoDO> devices = deviceStatusService.getOnlineDevices();
+//        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
+//
+//        // 填充状态信息
+//        respList.forEach(resp -> {
+//            if (resp.getState() != null) {
+//                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
+//                if (stateEnum != null) {
+//                    resp.setStateName(stateEnum.getName());
+//                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
+//                }
+//            }
+//        });
+//
+//        return success(respList);
+//    }
+//
+//    @GetMapping("/offline-devices")
+//    @Operation(summary = "获取离线设备列表")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<List<DeviceStatusRespVO>> getOfflineDevices() {
+//        List<DeviceInfoDO> devices = deviceStatusService.getOfflineDevices();
+//        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
+//
+//        // 填充状态信息
+//        respList.forEach(resp -> {
+//            if (resp.getState() != null) {
+//                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
+//                if (stateEnum != null) {
+//                    resp.setStateName(stateEnum.getName());
+//                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
+//                }
+//            }
+//        });
+//
+//        return success(respList);
+//    }
+//
+//    @GetMapping("/timeout-devices")
+//    @Operation(summary = "获取超时未上报的设备列表")
+//    @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<List<DeviceStatusRespVO>> getTimeoutDevices(
+//            @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
+//        List<DeviceInfoDO> devices = deviceStatusService.getTimeoutDevices(timeoutMinutes);
+//        List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
+//
+//        // 填充状态信息
+//        respList.forEach(resp -> {
+//            if (resp.getState() != null) {
+//                DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
+//                if (stateEnum != null) {
+//                    resp.setStateName(stateEnum.getName());
+//                    resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
+//                }
+//            }
+//        });
+//
+//        return success(respList);
+//    }
+//
+//    @GetMapping("/statistics")
+//    @Operation(summary = "获取设备状态统计")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
+//    public CommonResult<DeviceStatusStatisticsRespVO> getDeviceStatusStatistics() {
+//        DeviceStatusStatisticsRespVO statistics = new DeviceStatusStatisticsRespVO();
+//
+//        // 统计各状态设备数量
+//        Long totalCount = deviceInfoMapper.selectCount();
+//        Long onlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.ONLINE.getState());
+//        Long offlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.OFFLINE.getState());
+//        Long inactiveCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.INACTIVE.getState());
+//        Long maintenanceCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.MAINTENANCE.getState());
+//        Long faultCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.FAULT.getState());
+//
+//        statistics.setTotalCount(totalCount);
+//        statistics.setOnlineCount(onlineCount != null ? onlineCount : 0L);
+//        statistics.setOfflineCount(offlineCount != null ? offlineCount : 0L);
+//        statistics.setInactiveCount(inactiveCount != null ? inactiveCount : 0L);
+//        statistics.setMaintenanceCount(maintenanceCount != null ? maintenanceCount : 0L);
+//        statistics.setFaultCount(faultCount != null ? faultCount : 0L);
+//
+//        // 计算在线率和离线率
+//        if (totalCount > 0) {
+//            statistics.setOnlineRate((double) statistics.getOnlineCount() / totalCount * 100);
+//            statistics.setOfflineRate((double) statistics.getOfflineCount() / totalCount * 100);
+//        } else {
+//            statistics.setOnlineRate(0.0);
+//            statistics.setOfflineRate(0.0);
+//        }
+//
+//        return success(statistics);
+//    }
+//
+//    @PostMapping("/update-state/{deviceUniqueId}")
+//    @Operation(summary = "手动更新设备状态")
+//    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
+//    @Parameter(name = "state", description = "设备状态", required = true, example = "1")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
+//    public CommonResult<Boolean> updateDeviceState(
+//            @PathVariable("deviceUniqueId") String deviceUniqueId,
+//            @RequestParam("state") Integer state) {
+//        deviceStatusService.updateDeviceState(deviceUniqueId, state);
+//        return success(true);
+//    }
+//
+//    @PostMapping("/set-online/{deviceUniqueId}")
+//    @Operation(summary = "手动设置设备上线")
+//    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
+//    public CommonResult<Boolean> setDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
+//        deviceStatusService.deviceOnline(deviceUniqueId);
+//        return success(true);
+//    }
+//
+//    @PostMapping("/set-offline/{deviceUniqueId}")
+//    @Operation(summary = "手动设置设备离线")
+//    @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
+//    public CommonResult<Boolean> setDeviceOffline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
+//        deviceStatusService.deviceOffline(deviceUniqueId);
+//        return success(true);
+//    }
+//
+//    @PostMapping("/check-offline")
+//    @Operation(summary = "手动检查离线设备")
+//    @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
+//    @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
+//    public CommonResult<Integer> checkOfflineDevices(
+//            @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
+//        int count = deviceStatusService.checkAndUpdateOfflineDevices(timeoutMinutes);
+//        return success(count);
+//    }
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.dict;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNameRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictTypeCodeRespVO;
@@ -305,12 +306,12 @@ public class DictController {
         return success(res);
     }
 //
-//    @GetMapping("/list/base-name-plan")
-//    @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动")
-//    public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() {
-//        List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
-//        return success(res);
-//    }
+    @GetMapping("/list/base-name-plan")
+    @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动")
+    public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() {
+        List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
+        return success(res);
+    }
 //
 //    @GetMapping("/list/invest-goods")
 //    @Operation(summary = "字典数据维护-下拉框列表-投入品")

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.*;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.*;
 import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO;
 import cn.iocoder.yudao.module.farm.service.deviceclassify.DeviceClassifyService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifySaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java

@@ -1,13 +1,11 @@
-package cn.iocoder.yudao.module.farm.controller.admin.disasterdata;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata;
 
-import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataSaveReqVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO;
 import cn.iocoder.yudao.module.farm.service.environmentindicators.EnvironmentIndicatorsService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
 
 import lombok.*;
 import java.util.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java

@@ -1,13 +1,11 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance;
 
-import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenanceRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
 import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMaintenanceService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary;
 
-import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibrarySaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import io.swagger.v3.oas.annotations.media.Schema;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibrarySaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.*;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
 import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java

@@ -1,5 +1,7 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary;
 
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictRespVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -24,10 +26,8 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictSaveReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictTreeRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictTreeRespVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO;
 import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesAndModelTreeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibrarySaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import lombok.*;
 import java.util.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictTreeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 
-import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexSaveReqVO;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexRespVO.java

@@ -1,59 +1,59 @@
-package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 化肥指标 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class FertilizerIndexRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27638")
-    @ExcelProperty("id")
-    private String id;
-
-    @Schema(description = "基础id", example = "26503")
-    @ExcelProperty("基础id")
-    private String foundationId;
-
-    @Schema(description = "项目名称", example = "张三")
-    @ExcelProperty("项目名称")
-    private String name;
-
-    @Schema(description = "国家标准")
-    @ExcelProperty("国家标准")
-    private String standard;
-
-    @Schema(description = "检验结果")
-    @ExcelProperty("检验结果")
-    private String checkResults;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "基地id", example = "19443")
-    @ExcelProperty("基地id")
-    private String baseId;
-
-    @Schema(description = "基地", example = "李四")
-    @ExcelProperty("基地")
-    private String baseName;
-
-    @Schema(description = "地块ID", example = "25475")
-    @ExcelProperty("地块ID")
-    private String plotId;
-
-    @Schema(description = "地块", example = "张三")
-    @ExcelProperty("地块")
-    private String plotName;
-
-    @Schema(description = "租户id", example = "8699")
-    @ExcelProperty("租户id")
-    private String tenantId;
-
-}
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 化肥指标 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class FertilizerIndexRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27638")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "基础id", example = "26503")
+    @ExcelProperty("基础id")
+    private String foundationId;
+
+    @Schema(description = "项目名称", example = "张三")
+    @ExcelProperty("项目名称")
+    private String name;
+
+    @Schema(description = "国家标准")
+    @ExcelProperty("国家标准")
+    private String standard;
+
+    @Schema(description = "检验结果")
+    @ExcelProperty("检验结果")
+    private String checkResults;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "基地id", example = "19443")
+    @ExcelProperty("基地id")
+    private String baseId;
+
+    @Schema(description = "基地", example = "李四")
+    @ExcelProperty("基地")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "25475")
+    @ExcelProperty("地块ID")
+    private String plotId;
+
+    @Schema(description = "地块", example = "张三")
+    @ExcelProperty("地块")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "8699")
+    @ExcelProperty("租户id")
+    private String tenantId;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
 import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex;
 
-import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java

@@ -1,5 +1,8 @@
-package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata;
 
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -8,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -25,7 +27,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.*;
 import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO;
 import cn.iocoder.yudao.module.farm.service.screendisasterdata.ScreenDisasterDataService;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
 
 import lombok.*;
 import java.util.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataRespVO.java

@@ -1,51 +1,51 @@
-package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 大屏数据-灾害数据 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class ScreenDisasterDataRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5690")
-    @ExcelProperty("id")
-    private String id;
-
-    @Schema(description = "基地id", example = "13308")
-    @ExcelProperty("基地id")
-    private String baseId;
-
-    @Schema(description = "基地", example = "赵六")
-    @ExcelProperty("基地")
-    private String baseName;
-
-    @Schema(description = "灾害名称", example = "张三")
-    @ExcelProperty("灾害名称")
-    private String name;
-
-    @Schema(description = "灾害类型")
-    @ExcelProperty("灾害类型")
-    private String category;
-
-    @Schema(description = "发生次数", example = "22355")
-    @ExcelProperty("发生次数")
-    private Integer disasterCount;
-
-    @Schema(description = "发生月份")
-    @ExcelProperty("发生月份")
-    private String disasterTime;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "使用状态 （1：启用； 0： 停用）", example = "1")
-    @ExcelProperty("使用状态 （1：启用； 0： 停用）")
-    private Integer useStatus;
-
-}
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 大屏数据-灾害数据 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ScreenDisasterDataRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5690")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "基地id", example = "13308")
+    @ExcelProperty("基地id")
+    private String baseId;
+
+    @Schema(description = "基地", example = "赵六")
+    @ExcelProperty("基地")
+    private String baseName;
+
+    @Schema(description = "灾害名称", example = "张三")
+    @ExcelProperty("灾害名称")
+    private String name;
+
+    @Schema(description = "灾害类型")
+    @ExcelProperty("灾害类型")
+    private String category;
+
+    @Schema(description = "发生次数", example = "22355")
+    @ExcelProperty("发生次数")
+    private Integer disasterCount;
+
+    @Schema(description = "发生月份")
+    @ExcelProperty("发生月份")
+    private String disasterTime;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "使用状态 （1：启用； 0： 停用）", example = "1")
+    @ExcelProperty("使用状态 （1：启用； 0： 停用）")
+    private Integer useStatus;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.varietydata;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata;
 
-import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataRespVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig;
 
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java

@@ -1,59 +1,59 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 环境指标配置 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class EnvironmentIndexConfigRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14247")
-    @ExcelProperty("id")
-    private String id;
-
-    @Schema(description = "物种名称", example = "赵六")
-    @ExcelProperty("物种名称")
-    private String cultivarName;
-
-    @Schema(description = "物种分类", example = "张三")
-    @ExcelProperty("物种分类")
-    private String speciesName;
-
-    @Schema(description = "指标名称", example = "张三")
-    @ExcelProperty("指标名称")
-    private String name;
-
-    @Schema(description = "指标描述", example = "你说的对")
-    @ExcelProperty("指标描述")
-    private String description;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "基地id", example = "17727")
-    @ExcelProperty("基地id")
-    private String baseId;
-
-    @Schema(description = "基地", example = "芋艿")
-    @ExcelProperty("基地")
-    private String baseName;
-
-    @Schema(description = "地块ID", example = "22327")
-    @ExcelProperty("地块ID")
-    private String plotId;
-
-    @Schema(description = "地块", example = "赵六")
-    @ExcelProperty("地块")
-    private String plotName;
-
-    @Schema(description = "租户id", example = "7829")
-    @ExcelProperty("租户id")
-    private String tenantId;
-
-}
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 环境指标配置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EnvironmentIndexConfigRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14247")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "物种名称", example = "赵六")
+    @ExcelProperty("物种名称")
+    private String cultivarName;
+
+    @Schema(description = "物种分类", example = "张三")
+    @ExcelProperty("物种分类")
+    private String speciesName;
+
+    @Schema(description = "指标名称", example = "张三")
+    @ExcelProperty("指标名称")
+    private String name;
+
+    @Schema(description = "指标描述", example = "你说的对")
+    @ExcelProperty("指标描述")
+    private String description;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "基地id", example = "17727")
+    @ExcelProperty("基地id")
+    private String baseId;
+
+    @Schema(description = "基地", example = "芋艿")
+    @ExcelProperty("基地")
+    private String baseName;
+
+    @Schema(description = "地块ID", example = "22327")
+    @ExcelProperty("地块ID")
+    private String plotId;
+
+    @Schema(description = "地块", example = "赵六")
+    @ExcelProperty("地块")
+    private String plotName;
+
+    @Schema(description = "租户id", example = "7829")
+    @ExcelProperty("租户id")
+    private String tenantId;
+
+}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.farm.controller.admin.productmanagement;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement;
 
-import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
-import jakarta.validation.Valid;
-import jakarta.validation.Valid;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
 
 import lombok.*;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java

@@ -1,15 +1,14 @@
-package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
 import cn.iocoder.yudao.module.farm.framework.util.TraceabilityDataConverter;
 import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
 
 import lombok.*;
 import java.util.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import io.swagger.v3.oas.annotations.media.Schema;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo;
+package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/app/traceabilitycode/APPTraceabilityCodeController.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.app.traceabilitycode;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeRespVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeRespVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
 import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService;
 import io.swagger.v3.oas.annotations.Operation;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceclassify/DeviceClassifyMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.deviceclassify;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.DeviceClassifyPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifyPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.environmentindexconfig;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindicators/EnvironmentIndicatorsMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.farm.dal.mysql.environmentindicators;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.*;
 
 /**
  * 环境指标维护 Mapper

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java

@@ -3,11 +3,9 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
-import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.fertilizerindex;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.pesticideresidueindex;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.productmanagement;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/screendisasterdata/ScreenDisasterDataMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.farm.dal.mysql.screendisasterdata;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.*;
 
 /**
  * 大屏数据-灾害数据 Mapper

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.SpeciesLibraryPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.traceabilitycode;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/twodict/TwoDictMapper.java

@@ -5,7 +5,7 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO;
+import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictPageReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO;
 import org.apache.ibatis.annotations.Mapper;