From 842b423012223f0720b41d33c14c79c91bfd384a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Tue, 23 Sep 2025 21:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=8C=85=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 提升代码可阅读性 --- Readme.md | 42 +- .../FarmingRecordInputController.java | 10 +- .../vo/FarmingRecordInputPageReqVO.java | 2 +- .../vo/FarmingRecordInputRespVO.java | 176 ++++----- .../vo/FarmingRecordInputSaveReqVO.java | 2 +- .../DevicePlotRelationController.java | 124 +++--- .../devicestatus/DeviceStatusController.java | 358 +++++++++--------- .../controller/admin/dict/DictController.java | 13 +- .../DeviceClassifyController.java | 4 +- .../vo/DeviceClassifyPageReqVO.java | 2 +- .../vo/DeviceClassifyRespVO.java | 2 +- .../vo/DeviceClassifySaveReqVO.java | 2 +- .../deviceclassify/vo/DeviceModelRespVO.java | 2 +- .../deviceclassify/vo/DeviceTypeRespVO.java | 2 +- .../disasterdata/DisasterDataController.java | 10 +- .../vo/DisasterDataPageReqVO.java | 2 +- .../disasterdata/vo/DisasterDataReqVO.java | 2 +- .../disasterdata/vo/DisasterDataRespVO.java | 2 +- .../vo/DisasterDataSaveReqVO.java | 2 +- .../EnvironmentIndicatorsController.java | 8 +- .../vo/EnvironmentIndicatorsPageReqVO.java | 2 +- .../vo/EnvironmentIndicatorsRespVO.java | 2 +- .../vo/EnvironmentIndicatorsSaveReqVO.java | 2 +- .../FarmingNameMaintenanceController.java | 12 +- .../vo/FarmingNameMaintenancePageReqVO.java | 2 +- .../vo/FarmingNameMaintenanceRespVO.java | 2 +- .../vo/FarmingNameMaintenanceSaveReqVO.java | 2 +- .../vo/FarmingNameMaintenanceTreeRespVO.java | 2 +- .../FarmingTypeMaintenanceController.java | 8 +- .../vo/FarmingTypeMaintenancePageReqVO.java | 2 +- .../vo/FarmingTypeMaintenanceRespVO.java | 2 +- .../vo/FarmingTypeMaintenanceSaveReqVO.java | 2 +- .../inputlibrary/InputLibraryController.java | 10 +- .../vo/InputLibraryPageReqVO.java | 2 +- .../inputlibrary/vo/InputLibraryRespVO.java | 2 +- .../vo/InputLibrarySaveReqVO.java | 2 +- .../SpeciesLibraryController.java | 4 +- .../specieslibrary/TwoDictController.java | 10 +- .../vo/SpeciesAndModelTreeRespVO.java | 2 +- .../vo/SpeciesLibraryPageReqVO.java | 2 +- .../vo/SpeciesLibraryRespVO.java | 2 +- .../vo/SpeciesLibrarySaveReqVO.java | 2 +- .../vo/SpeciesThreeLevelTreeRespVO.java | 2 +- .../vo/SpeciesTwoLevelTreeDetailsRespVO.java | 2 +- .../vo/SpeciesTwoLevelTreeReqVO.java | 2 +- .../vo/SpeciesTwoLevelTreeRespVO.java | 2 +- .../vo/SpeciesTwoLevelTreeSaveReqVO.java | 2 +- .../specieslibrary/vo/TwoDictPageReqVO.java | 2 +- .../specieslibrary/vo/TwoDictRespVO.java | 2 +- .../specieslibrary/vo/TwoDictSaveReqVO.java | 2 +- .../specieslibrary/vo/TwoDictTreeRespVO.java | 2 +- .../FertilizerIndexController.java | 8 +- .../vo/FertilizerIndexPageReqVO.java | 2 +- .../vo/FertilizerIndexRespVO.java | 118 +++--- .../vo/FertilizerIndexSaveReqVO.java | 2 +- .../FoundationInfoController.java | 8 +- .../vo/FoundationInfoPageReqVO.java | 2 +- .../vo/FoundationInfoRespVO.java | 2 +- .../vo/FoundationInfoSaveReqVO.java | 2 +- .../PesticideResidueIndexController.java | 10 +- .../vo/PesticideResidueIndexPageReqVO.java | 2 +- .../vo/PesticideResidueIndexRespVO.java | 2 +- .../vo/PesticideResidueIndexSaveReqVO.java | 2 +- .../ScreenDisasterDataController.java | 7 +- .../vo/ScreenDisasterDataPageReqVO.java | 2 +- .../vo/ScreenDisasterDataRespVO.java | 102 ++--- .../vo/ScreenDisasterDataSaveReqVO.java | 2 +- .../varietydata/VarietyDataController.java | 10 +- .../varietydata/vo/VarietyDataPageReqVO.java | 2 +- .../varietydata/vo/VarietyDataRespVO.java | 2 +- .../varietydata/vo/VarietyDataSaveReqVO.java | 2 +- .../EnvironmentIndexConfigController.java | 10 +- .../vo/EnvironmentIndexConfigPageReqVO.java | 2 +- .../vo/EnvironmentIndexConfigRespVO.java | 118 +++--- .../vo/EnvironmentIndexConfigSaveReqVO.java | 2 +- .../ProductManagementController.java | 10 +- .../vo/ProductManagementPageReqVO.java | 2 +- .../vo/ProductManagementRespVO.java | 2 +- .../vo/ProductManagementSaveReqVO.java | 2 +- .../TraceabilityCodeController.java | 11 +- .../vo/TraceabilityCodePageReqVO.java | 2 +- .../TraceabilityCodePageWithStatsRespVO.java | 2 +- .../vo/TraceabilityCodeRespVO.java | 2 +- .../vo/TraceabilityCodeSaveReqVO.java | 2 +- .../APPTraceabilityCodeController.java | 2 +- .../deviceclassify/DeviceClassifyMapper.java | 2 +- .../disasterdata/DisasterDataMapper.java | 2 +- .../EnvironmentIndexConfigMapper.java | 2 +- .../EnvironmentIndicatorsMapper.java | 4 +- .../FarmingNameMaintenanceMapper.java | 2 +- .../FarmingRecordInputMapper.java | 2 +- .../FarmingTypeMaintenanceMapper.java | 4 +- .../FertilizerIndexMapper.java | 2 +- .../foundationinfo/FoundationInfoMapper.java | 2 +- .../inputlibrary/InputLibraryMapper.java | 2 +- .../PesticideResidueIndexMapper.java | 2 +- .../ProductManagementMapper.java | 2 +- .../ScreenDisasterDataMapper.java | 4 +- .../specieslibrary/SpeciesLibraryMapper.java | 2 +- .../TraceabilityCodeMapper.java | 2 +- .../farm/dal/mysql/twodict/TwoDictMapper.java | 2 +- .../mysql/varietydata/VarietyDataMapper.java | 2 +- .../util/TraceabilityDataConverter.java | 2 +- .../CropFarmingCenterServiceImpl.java | 2 +- .../deviceclassify/DeviceClassifyService.java | 7 +- .../DeviceClassifyServiceImpl.java | 8 +- .../disasterdata/DisasterDataService.java | 5 +- .../disasterdata/DisasterDataServiceImpl.java | 4 +- .../EnvironmentIndexConfigService.java | 5 +- .../EnvironmentIndexConfigServiceImpl.java | 4 +- .../EnvironmentIndicatorsService.java | 4 +- .../EnvironmentIndicatorsServiceImpl.java | 5 +- .../FarmingNameMaintenanceService.java | 7 +- .../FarmingNameMaintenanceServiceImpl.java | 6 +- .../FarmingRecordInputService.java | 5 +- .../FarmingRecordInputServiceImpl.java | 8 +- .../FarmingTypeMaintenanceService.java | 4 +- .../FarmingTypeMaintenanceServiceImpl.java | 5 +- .../FertilizerIndexService.java | 5 +- .../FertilizerIndexServiceImpl.java | 4 +- .../foundationinfo/FoundationInfoService.java | 4 +- .../FoundationInfoServiceImpl.java | 4 +- .../inputlibrary/InputLibraryService.java | 5 +- .../inputlibrary/InputLibraryServiceImpl.java | 6 +- .../PesticideResidueIndexService.java | 5 +- .../PesticideResidueIndexServiceImpl.java | 8 +- .../ProductManagementService.java | 5 +- .../ProductManagementServiceImpl.java | 4 +- .../ScreenDisasterDataService.java | 5 +- .../ScreenDisasterDataServiceImpl.java | 5 +- .../specieslibrary/SpeciesLibraryService.java | 2 +- .../SpeciesLibraryServiceImpl.java | 3 +- .../farm/service/sysDict/SysDictService.java | 10 +- .../service/sysDict/SysDictServiceImpl.java | 10 +- .../TraceabilityCodeService.java | 6 +- .../TraceabilityCodeServiceImpl.java | 8 +- .../farm/service/twodict/TwoDictService.java | 6 +- .../service/twodict/TwoDictServiceImpl.java | 6 +- .../varietydata/VarietyDataService.java | 4 +- .../varietydata/VarietyDataServiceImpl.java | 4 +- .../module/farm/utils/TreeStructureUtil.java | 2 +- .../disasterdata/DisasterDataMapper.xml | 2 +- .../FarmingTypeMaintenanceMapper.xml | 2 +- 143 files changed, 767 insertions(+), 800 deletions(-) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => cropfarmingcenter}/farmingrecordinput/FarmingRecordInputController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => cropfarmingcenter}/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => cropfarmingcenter}/farmingrecordinput/vo/FarmingRecordInputRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => cropfarmingcenter}/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/DeviceClassifyController.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/vo/DeviceClassifyPageReqVO.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/vo/DeviceClassifyRespVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/vo/DeviceClassifySaveReqVO.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/vo/DeviceModelRespVO.java (81%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/deviceclassify/vo/DeviceTypeRespVO.java (85%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/disasterdata/DisasterDataController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/disasterdata/vo/DisasterDataPageReqVO.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/disasterdata/vo/DisasterDataReqVO.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/disasterdata/vo/DisasterDataRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/disasterdata/vo/DisasterDataSaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/environmentindicators/EnvironmentIndicatorsController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/environmentindicators/vo/EnvironmentIndicatorsRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingnamemaintenance/FarmingNameMaintenanceController.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java (83%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingtypemaintenance/FarmingTypeMaintenanceController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java (86%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/inputlibrary/InputLibraryController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/inputlibrary/vo/InputLibraryPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/inputlibrary/vo/InputLibraryRespVO.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/inputlibrary/vo/InputLibrarySaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/SpeciesLibraryController.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/TwoDictController.java (88%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesAndModelTreeRespVO.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesLibraryPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesLibraryRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesLibrarySaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java (79%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java (81%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java (88%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java (87%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/TwoDictPageReqVO.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/TwoDictRespVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/TwoDictSaveReqVO.java (88%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/basicdatamanagement}/specieslibrary/vo/TwoDictTreeRespVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/fertilizerindex/FertilizerIndexController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/fertilizerindex/vo/FertilizerIndexPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/fertilizerindex/vo/FertilizerIndexRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/fertilizerindex/vo/FertilizerIndexSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/foundationinfo/FoundationInfoController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/foundationinfo/vo/FoundationInfoPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/foundationinfo/vo/FoundationInfoRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/foundationinfo/vo/FoundationInfoSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/pesticideresidueindex/PesticideResidueIndexController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/screendisasterdata/ScreenDisasterDataController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/screendisasterdata/vo/ScreenDisasterDataRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/varietydata/VarietyDataController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/varietydata/vo/VarietyDataPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/varietydata/vo/VarietyDataRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/largescreen}/varietydata/vo/VarietyDataSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/environmentindexconfig/EnvironmentIndexConfigController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/productmanagement/ProductManagementController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/productmanagement/vo/ProductManagementPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/productmanagement/vo/ProductManagementRespVO.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/productmanagement/vo/ProductManagementSaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/traceabilitycode/TraceabilityCodeController.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/traceabilitycode/vo/TraceabilityCodePageReqVO.java (99%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java (98%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/traceabilitycode/vo/TraceabilityCodeRespVO.java (99%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => traceability}/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java (99%) diff --git a/Readme.md b/Readme.md index a30f7979..45201fcb 100644 --- a/Readme.md +++ b/Readme.md @@ -5,6 +5,9 @@ cn.iocoder.yudao.module.farm.controller.admin ├── cropfarmingcenter // 种植中心 ├── deviceinfo // 设备中心 ├── xxx // 溯源 +│ ├── productmanagement // 商品管理 +│ ├── environmentindexconfig // 环境指标配置 +│ └── traceabilitycode // 溯源码管理 & 溯源码查询 & 溯源统计 ├── digitalcockpit // 大屏 ├── managementcenter // 管理中心 │ ├── baseinfo // 基地规划 @@ -12,28 +15,31 @@ cn.iocoder.yudao.module.farm.controller.admin │ ├── messagecenter // 消息中心 │ ├── personnelmanagement // 人员管理 │ ├── modelmanagement // 模型管理 -│ ├── models // 模型 -│ ├── modelcycle // 管理周期 -│ ├── modelenvironmentindex // 环境指标 -│ ├── modelfarmingoperation // 农事操作 -│ ├── modelfarmingoperationinput // 农事操作-投入品 -│ ├── modelpestdiseaseweed // 病虫草害 -│ ├── modelweatherdisaster // 气象灾害 +│ │ ├── models // 模型 +│ │ ├── modelcycle // 管理周期 +│ │ ├── modelenvironmentindex // 环境指标 +│ │ ├── modelfarmingoperation // 农事操作 +│ │ ├── modelfarmingoperationinput // 农事操作-投入品 +│ │ ├── modelpestdiseaseweed // 病虫草害 +│ │ └── modelweatherdisaster // 气象灾害 │ ├── basicdatamanagement // 基础数据管理 -│ ├── xxx // 农事类型维护 -│ ├── xxx // 农事名称维护 -│ ├── xxx // 物种类型维护 -│ ├── xxx // 物种库维护 -│ ├── xxx // 投入品维护 -│ ├── xxx // 灾害库维护 -│ ├── xxx // 气象灾害库维护 -│ ├── xxx // 设备类型维护 -│ ├── xxx // 设备环境指标维护 -│ ├── largescreen // 大屏数据维护 +│ │ ├── farmingtypemaintenance // 农事类型维护 +│ │ ├── farmingnamemaintenance // 农事名称维护 +│ │ ├── specieslibrary // 物种类型维护 & 物种库维护 +│ │ ├── inputlibrary // 投入品维护 +│ │ ├── disasterdata // 灾害库维护 & 气象灾害库维护 +│ │ ├── deviceclassify // 设备类型维护 +│ │ └── environmentindicators // 设备环境指标维护 +│ └── largescreen // 大屏数据维护 +│ ├── foundationinfo // 基础信息 +│ ├── varietydata // 品种数据 +│ ├── screendisasterdata // 灾害数据 +│ ├── pesticideresidueindex // 农残指标 +│ └── fertilizerindex // 化肥指标 └── xxx // 系统管理 ├── xxx // 租户管理 ├── xxx // 用户管理 ├── xxx // 角色管理 ├── xxx // 菜单管理 - ├── xxx // 字典管理 + └── xxx // 字典管理 ```` \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java index 08ed504c..c7072f71 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java index 8c5f2984..d8d07823 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputRespVO.java index 433e9018..eb7ea2d7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java +++ b/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; - -} \ No newline at end of file +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; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java index 32a6268a..5c0c1cfa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java index 1b7a080f..2fc9fc4f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java +++ b/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 createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) { - return success(devicePlotRelationService.createDevicePlotRelation(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新设备与地块关联") - public CommonResult updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) { - devicePlotRelationService.updateDevicePlotRelation(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除设备与地块关联") - @Parameter(name = "id", description = "编号", required = true) - public CommonResult deleteDevicePlotRelation(@RequestParam("id") String id) { - devicePlotRelationService.deleteDevicePlotRelation(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除设备与地块关联") - public CommonResult deleteDevicePlotRelationList(@RequestParam("ids") List ids) { - devicePlotRelationService.deleteDevicePlotRelationListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得设备与地块关联") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult getDevicePlotRelation(@RequestParam("id") String id) { - DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id); - return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得设备与地块关联分页") - public CommonResult> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) { - PageResult 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 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 createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) { +// return success(devicePlotRelationService.createDevicePlotRelation(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新设备与地块关联") +// public CommonResult updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) { +// devicePlotRelationService.updateDevicePlotRelation(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除设备与地块关联") +// @Parameter(name = "id", description = "编号", required = true) +// public CommonResult deleteDevicePlotRelation(@RequestParam("id") String id) { +// devicePlotRelationService.deleteDevicePlotRelation(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除设备与地块关联") +// public CommonResult deleteDevicePlotRelationList(@RequestParam("ids") List ids) { +// devicePlotRelationService.deleteDevicePlotRelationListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得设备与地块关联") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// public CommonResult getDevicePlotRelation(@RequestParam("id") String id) { +// DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id); +// return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得设备与地块关联分页") +// public CommonResult> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) { +// PageResult 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 list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class, +// BeanUtils.toBean(list, DevicePlotRelationRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/devicestatus/DeviceStatusController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/devicestatus/DeviceStatusController.java index ed0e16ef..2adbe661 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/devicestatus/DeviceStatusController.java +++ b/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 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 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> getOnlineDevices() { - List devices = deviceStatusService.getOnlineDevices(); - List 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> getOfflineDevices() { - List devices = deviceStatusService.getOfflineDevices(); - List 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> getTimeoutDevices( - @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) { - List devices = deviceStatusService.getTimeoutDevices(timeoutMinutes); - List 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 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 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 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 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 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 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 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> getOnlineDevices() { +// List devices = deviceStatusService.getOnlineDevices(); +// List 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> getOfflineDevices() { +// List devices = deviceStatusService.getOfflineDevices(); +// List 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> getTimeoutDevices( +// @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) { +// List devices = deviceStatusService.getTimeoutDevices(timeoutMinutes); +// List 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 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 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 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 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 checkOfflineDevices( +// @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) { +// int count = deviceStatusService.checkAndUpdateOfflineDevices(timeoutMinutes); +// return success(count); +// } } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java index 0922d4eb..83772093 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java +++ b/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> getBaseNameAndPlanList() { -// List res = productionPlanService.getBaseNameAndPlanList(); -// return success(res); -// } + @GetMapping("/list/base-name-plan") + @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动") + public CommonResult> getBaseNameAndPlanList() { + List res = productionPlanService.getBaseNameAndPlanList(); + return success(res); + } // // @GetMapping("/list/invest-goods") // @Operation(summary = "字典数据维护-下拉框列表-投入品") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/DeviceClassifyController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/DeviceClassifyController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java index 66cf06df..43c3a451 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/DeviceClassifyController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyPageReqVO.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyPageReqVO.java index 74197a5f..13e4b1e6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyPageReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyRespVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyRespVO.java index 65513fa9..cdff7ce0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifySaveReqVO.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifySaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifySaveReqVO.java index d8f20aaf..2ef20541 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifySaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceModelRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java similarity index 81% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceModelRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java index 072df085..f055d1a5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceModelRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceTypeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java similarity index 85% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceTypeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java index 2e8add7b..7f2e51e5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceTypeRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java index 07241cfe..36014436 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataPageReqVO.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataPageReqVO.java index e4596083..ce8eb578 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataReqVO.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataReqVO.java index 108710d7..6bbf9b2d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataRespVO.java index 4d486371..75aab349 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataSaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataSaveReqVO.java index 085b2b2c..0746df47 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/EnvironmentIndicatorsController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/EnvironmentIndicatorsController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java index 503d1258..404a04d5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/EnvironmentIndicatorsController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java index 11c2844c..c39ba8c9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsRespVO.java index 8fb62fab..ee8a8516 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java index 9efde774..56e8a424 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java index 43a97780..d5c47664 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java index de33a7d3..10be6d39 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java index 61b4b898..4649cb2d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java similarity index 83% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java index 18f84a29..e88fb94a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java index 52ae5034..301bd411 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java index 9f98caca..aafc335c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java similarity index 86% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java index ca026afd..1f6aa22e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java index 0f0c825e..59e2d7b1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java index ad343c37..25a5e16e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java index 2422487a..f2590bae 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryPageReqVO.java index 5e60fdfc..b0603416 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryRespVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryRespVO.java index b0fe5e24..19c297dd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibrarySaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibrarySaveReqVO.java index cacdd731..bcfb25eb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java index 8d7de23e..ddde13a4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java similarity index 88% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java index 62fdf206..931a2f9d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesAndModelTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesAndModelTreeRespVO.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesAndModelTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesAndModelTreeRespVO.java index 539cb69a..81d3533a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesAndModelTreeRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryPageReqVO.java index 61d54a01..43cade1f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryRespVO.java index 81d90f68..03a3cc14 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibrarySaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibrarySaveReqVO.java index 0229762b..8c97982d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java similarity index 79% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java index bb674089..034a93d7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java index 2ddf00f2..664ab44f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java similarity index 81% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java index 8db94245..1ad9f252 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java similarity index 88% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java index 8a3f8a96..5a43bccd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java similarity index 87% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java index 867c9c36..08c1bc75 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictPageReqVO.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictPageReqVO.java index 560229c9..a975d7a2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictRespVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictRespVO.java index b06a72ec..0414e2b9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictSaveReqVO.java similarity index 88% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictSaveReqVO.java index 2101749d..0b935637 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictTreeRespVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictTreeRespVO.java index ca7a0e99..2b86308a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java index fc9362b3..56379b7f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexPageReqVO.java index 42996077..d0fd0c85 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexRespVO.java index 9efbbeb9..b58007d1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java +++ b/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; - -} \ No newline at end of file +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; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexSaveReqVO.java index a1065fad..ddde7537 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java index d502d2f0..0789d4b7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoPageReqVO.java index 12c18f1a..fd1954ad 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoRespVO.java index 448c5502..500fa090 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoSaveReqVO.java index 2a08e2d4..c0522ef9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java index d031cfa6..b0c1b61e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java index d985bc7b..fc3616d9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java index a8d09840..f9f1b1d2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java index e4cc58a8..13513cab 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/ScreenDisasterDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/ScreenDisasterDataController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java index 177ba45d..aeeded90 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/ScreenDisasterDataController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java index e5f67acc..02fcb813 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataRespVO.java index d00844df..aaf69de2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataRespVO.java +++ b/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; - -} \ No newline at end of file +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; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java index baf7c1f6..e3c32ea4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java index 1983efa8..2216b39b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataPageReqVO.java index 4ea3668b..35aa60ad 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataRespVO.java index d23f9af7..1d5c9167 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataSaveReqVO.java index 9ac7c4ec..913a8fd0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java index 5135aaf3..945a5d49 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java index 2407b4b2..a6f916bc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java index 673ce3aa..572628a2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java +++ b/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; - -} \ No newline at end of file +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; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java index 0a814865..ac410b89 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java index ac55a9d5..d69e6996 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementPageReqVO.java index d430bc7b..986cf524 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementRespVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementRespVO.java index 781ef1a3..e12cbd2d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementSaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementSaveReqVO.java index 2659992c..718d7844 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/TraceabilityCodeController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/TraceabilityCodeController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java index 5d5260fe..a1164be2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/TraceabilityCodeController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageReqVO.java similarity index 99% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageReqVO.java index 8a4be02d..cf83f996 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java similarity index 98% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java index 191b274f..025abbc7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeRespVO.java similarity index 99% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeRespVO.java index 02d7d4dc..fdb06adc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeRespVO.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java similarity index 99% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java index 11484ee8..e6c29132 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java +++ b/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.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/app/traceabilitycode/APPTraceabilityCodeController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/app/traceabilitycode/APPTraceabilityCodeController.java index 06c44325..54d3a327 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/app/traceabilitycode/APPTraceabilityCodeController.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceclassify/DeviceClassifyMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceclassify/DeviceClassifyMapper.java index 4b271d20..d6b9e2a5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceclassify/DeviceClassifyMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java index 28cf464d..bbea801a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java index 2767544e..5f3ed894 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindicators/EnvironmentIndicatorsMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindicators/EnvironmentIndicatorsMapper.java index b0bd3d2d..56d48f96 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindicators/EnvironmentIndicatorsMapper.java +++ b/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 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java index 93ac3d44..d9036862 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java index 0b575a5c..95646ed9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java index d579b523..aba77334 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java index f0fcfb26..45567c80 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java index 4c5c2609..b3759848 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java index 6a9a93ae..acc2602c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java index 75532e87..9050cc8d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java index 1d834dd4..2154f0dc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/screendisasterdata/ScreenDisasterDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/screendisasterdata/ScreenDisasterDataMapper.java index 063b8b0f..7ff9445e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/screendisasterdata/ScreenDisasterDataMapper.java +++ b/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 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java index f7fa29c7..64bf52a2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java index 1f570a1c..1163457a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/twodict/TwoDictMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/twodict/TwoDictMapper.java index bdf0b85d..d41db7df 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/twodict/TwoDictMapper.java +++ b/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; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java index df800534..be660dc3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.varietydata; 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.varietydata.vo.VarietyDataPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/TraceabilityDataConverter.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/TraceabilityDataConverter.java index 314de513..9cb9dc4a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/TraceabilityDataConverter.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/TraceabilityDataConverter.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.framework.util; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -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 java.util.Arrays; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java index a47f4472..39a0453b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyService.java index 42c190ff..bd02e29e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyService.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.farm.service.deviceclassify; import java.util.*; + +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifyPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifySaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceModelRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceTypeRespVO; import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 设备分类 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java index 8574b6ea..ef524faa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java @@ -4,10 +4,10 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 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.deviceclassify.vo.DeviceClassifySaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.DeviceModelRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.DeviceTypeRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifyPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifySaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceModelRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceTypeRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; import cn.iocoder.yudao.module.farm.dal.mysql.deviceclassify.DeviceClassifyMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java index c6be1dec..b23f8b7e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.farm.service.disasterdata; 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.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.DisasterDataSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java index ce9e0e53..e792093d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java @@ -5,8 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; -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.DisasterDataSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java index 503c4db7..155ff907 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.environmentindexconfig; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; -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.EnvironmentIndexConfigSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java index 7994203d..b1f55520 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; -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.EnvironmentIndexConfigSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; import org.springframework.stereotype.Service; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsService.java index 729314bf..fc0c394a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsService.java @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.farm.service.environmentindicators; import java.util.*; +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.EnvironmentIndicatorsSaveReqVO; import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 环境指标维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsServiceImpl.java index e8d77b41..42cd1831 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindicators/EnvironmentIndicatorsServiceImpl.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.farm.service.environmentindicators; -import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsPageReqVO; -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.EnvironmentIndicatorsSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.module.farm.dal.mysql.environmentindicators.EnvironmentIndicatorsMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java index 586c5808..35f5c6e9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.farm.service.farmingnamemaintenance; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; -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.FarmingNameMaintenanceSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java index c0d903db..a12a02a4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceServiceImpl.java @@ -4,9 +4,9 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; -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.FarmingNameMaintenanceSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance.FarmingNameMaintenanceMapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java index 6c6df5ab..9ecd3014 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.farmingrecordinput; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; -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.FarmingRecordInputSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java index bd06cf27..9c6781b2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java @@ -1,17 +1,14 @@ package cn.iocoder.yudao.module.farm.service.farmingrecordinput; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; -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.FarmingRecordInputSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; @@ -21,7 +18,6 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_RECORD_INPUT_NOT_EXISTS; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java index d6e3ec3b..21cae00e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.service.farmingtypemaintenance; -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.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java index acbd896d..8527d255 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java @@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.farm.service.farmingtypemaintenance; import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.security.core.LoginUser; -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.enums.CommonConstants; +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.FarmingTypeMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.utils.StrHelperUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java index 0a58ec78..5228d56c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.fertilizerindex; -import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; -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.FertilizerIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java index 23898612..05947fc0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; -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.FertilizerIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.module.farm.dal.mysql.fertilizerindex.FertilizerIndexMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java index 3f5a63a1..f86b74d5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.farm.service.foundationinfo; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; -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.FoundationInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java index 86617c7e..b6f492b8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; -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.FoundationInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.FoundationInfoMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java index 75b8dee6..bbfab0cd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.inputlibrary; -import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; -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.InputLibrarySaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java index b19f5888..44e7de24 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java @@ -2,12 +2,10 @@ package cn.iocoder.yudao.module.farm.service.inputlibrary; import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; -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.InputLibrarySaveReqVO; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictMapper; -import cn.iocoder.yudao.module.farm.enums.CommonConstants; -import cn.iocoder.yudao.module.farm.utils.StrHelperUtil; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java index aed3c4fc..fa978906 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.pesticideresidueindex; -import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; -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.PesticideResidueIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java index 3002913e..14cffc27 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java @@ -1,17 +1,14 @@ package cn.iocoder.yudao.module.farm.service.pesticideresidueindex; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; -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.PesticideResidueIndexSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; @@ -21,7 +18,6 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PESTICIDE_RESIDUE_INDEX_NOT_EXISTS; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java index 6ac2dd8b..7c2974a9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.productmanagement; -import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; -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.ProductManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java index 9701afaf..11ac965c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.farm.service.productmanagement; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; -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.ProductManagementSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataService.java index 5302f040..30eedf6e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.screendisasterdata; import java.util.*; + +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.ScreenDisasterDataSaveReqVO; import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 大屏数据-灾害数据 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataServiceImpl.java index 8b496035..7a220e58 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/screendisasterdata/ScreenDisasterDataServiceImpl.java @@ -3,10 +3,9 @@ package cn.iocoder.yudao.module.farm.service.screendisasterdata; import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.ScreenDisasterDataPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.ScreenDisasterDataSaveReqVO; +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.ScreenDisasterDataSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO; -import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.screendisasterdata.ScreenDisasterDataMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java index dd9c72c9..a6aae93b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryService.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.service.specieslibrary; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; -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 jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java index c7346cde..8c5a7f1e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java @@ -6,8 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictTreeRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java index a8196d8f..61c866a6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java @@ -5,11 +5,11 @@ import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibr import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictThreeLvRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; -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.inputlibrary.vo.InputLibraryRespVO; +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.FarmingNameMaintenanceSaveReqVO; +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.FarmingTypeMaintenanceSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java index acca397b..7a6eb1cd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java @@ -7,11 +7,11 @@ import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibr import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictThreeLvRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; -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.inputlibrary.vo.InputLibraryRespVO; +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.FarmingNameMaintenanceSaveReqVO; +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.FarmingTypeMaintenanceSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeService.java index 20023e6a..2ba5d304 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.farm.service.traceabilitycode; import cn.iocoder.yudao.framework.common.pojo.PageResult; -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.TraceabilityCodeSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeServiceImpl.java index e3d4b3a1..255e2582 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/traceabilitycode/TraceabilityCodeServiceImpl.java @@ -7,10 +7,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -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.TraceabilityCodePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO; +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.dal.mysql.traceabilitycode.TraceabilityCodeMapper; import cn.iocoder.yudao.module.farm.framework.util.TraceabilityDataConverter; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictService.java index 663089f5..fe5e87bb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictService.java @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.farm.service.twodict; import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO; -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.TwoDictPageReqVO; +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 jakarta.validation.*; import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictServiceImpl.java index f34c10e6..1e72247b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictServiceImpl.java @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.farm.service.twodict; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO; -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.TwoDictPageReqVO; +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.dal.mysql.twodict.TwoDictMapper; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java index c03bc8b8..287b1760 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.farm.service.varietydata; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO; -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.dal.dataobject.varietydata.VarietyDataDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java index f6093233..ed11e5f2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO; -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.dal.dataobject.varietydata.VarietyDataDO; import cn.iocoder.yudao.module.farm.dal.mysql.varietydata.VarietyDataMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/utils/TreeStructureUtil.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/utils/TreeStructureUtil.java index ba1409b6..45a2d290 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/utils/TreeStructureUtil.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/utils/TreeStructureUtil.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.utils; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibraryRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictTreeRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictTreeRespVO; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; import java.util.*; diff --git a/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml b/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml index 994c1e06..8c0f5868 100644 --- a/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml @@ -54,7 +54,7 @@ SELECT FROM farm_farming_type_maintenance