From c894b04ebf654272b9d791ed5131b67cf421de8c 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 20:46:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=A4=A7=E5=B1=8F-=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改package结构 - 修复bug --- Readme.md | 57 +- .../CropFarmingCenterController.java | 33 +- .../vo/BasePlanOverviewRespVO.java | 2 +- .../vo/FarmRecordOverviewRespVO.java | 2 +- .../vo/ProductionPlanPage2ReqVO.java | 7 +- .../vo/ProductionPlanPageRespVO.java | 2 +- .../vo/ProductionPlanResp2VO.java | 2 +- .../vo/ProductionPlanRespVO.java | 4 +- .../vo/ProductionPlanSaveReqVO.java | 2 +- .../vo/ProductionPlanUpdateReqVO.java | 2 +- .../CultivationAreaController.java | 124 ++--- .../deviceinfo/DeviceInfoController.java | 60 ++- .../deviceinfo/vo/DeviceInfoSaveReqVO.java | 4 + .../vo/v2/DeviceInfoDetailV2RespVO.java | 12 +- .../vo/v2/DeviceInfoPageV2ReqVO.java | 4 +- .../vo/v2/DeviceInfoPageV2RespVO.java | 10 +- .../controller/admin/dict/DictController.java | 497 +++++++++--------- .../admin/digitalcockpit/DigitalCockpit.java | 157 ++++++ .../digitalcockpit/vo/BaseNameRespVO.java | 21 + .../digitalcockpit/vo/BasePointRespVO.java | 43 ++ .../vo/BaseStatisticsInfoRespVO.java | 23 + .../digitalcockpit/vo/CompanyInfoRespVO.java | 24 + .../vo/FarmingNameMaintenanceSaveReqVO.java | 15 - .../FarmingRecordController.java | 151 +++--- .../farmingrecord/vo/FarmingRecordRespVO.java | 27 +- .../baseinfo/BaseInfoController.java | 6 +- .../baseinfo}/GridInfoController.java | 7 +- .../baseinfo}/PlotInfoController.java | 10 +- .../baseinfo/vo/BaseAndPlotNamesRespVO.java | 2 +- .../baseinfo/vo/BaseInfoPageReqVO.java | 2 +- .../baseinfo/vo/BaseInfoRespVO.java | 2 +- .../baseinfo/vo/BaseInfoSaveReqVO.java | 2 +- .../baseinfo/vo/BaseNamePlanRespVO.java | 2 +- .../baseinfo/vo/BaseNameRespVO.java | 2 +- .../baseinfo/vo/BaseNamesRespVO.java | 2 +- .../baseinfo/vo/BaseOverviewRespVO.java | 2 +- .../baseinfo}/vo/GridInfoPageReqVO.java | 2 +- .../baseinfo}/vo/GridInfoRespVO.java | 2 +- .../baseinfo}/vo/GridInfoSaveReqVO.java | 2 +- .../baseinfo}/vo/PlotInfoPageReqVO.java | 2 +- .../baseinfo}/vo/PlotInfoRespVO.java | 2 +- .../baseinfo}/vo/PlotInfoSaveReqVO.java | 2 +- .../baseinfo/vo/TenantInfoRespVO.java | 2 +- .../baseinfo/vo/wx/BaseInfoForWxRespVO.java | 2 +- .../vo/wx/RegularPlotInfoRespVO.java | 2 +- .../companyinfo/CompanyInfoController.java | 10 +- .../companyinfo/vo/CompanyInfoPageReqVO.java | 2 +- .../companyinfo/vo/CompanyInfoRespVO.java | 2 +- .../companyinfo/vo/CompanyInfoSaveReqVO.java | 2 +- .../MessageCenterController.java | 10 +- .../vo/MessageCenterPageReqVO.java | 2 +- .../messagecenter/vo/MessageCenterRespVO.java | 2 +- .../vo/MessageCenterSaveReqVO.java | 2 +- .../vo/MessageStatisticsRespVO.java | 2 +- .../modelcycle/ModelCycleController.java | 10 +- .../modelcycle/vo/ModelCyclePageReqVO.java | 2 +- .../modelcycle/vo/ModelCycleRespVO.java | 6 +- .../modelcycle/vo/ModelCycleSaveReqVO.java | 2 +- .../ModelEnvironmentIndexController.java | 10 +- .../vo/ModelEnvironmentIndexPageReqVO.java | 2 +- .../vo/ModelEnvironmentIndexRespVO.java | 2 +- .../vo/ModelEnvironmentIndexSaveReqVO.java | 2 +- .../ModelFarmingOperationController.java | 10 +- .../vo/ModelFarmingOperationPageReqVO.java | 2 +- .../vo/ModelFarmingOperationRespVO.java | 2 +- .../vo/ModelFarmingOperationSaveReqVO.java | 2 +- .../ModelFarmingOperationInputController.java | 10 +- .../ModelFarmingOperationInputPageReqVO.java | 2 +- .../vo/ModelFarmingOperationInputRespVO.java | 2 +- .../ModelFarmingOperationInputSaveReqVO.java | 2 +- .../ModelPestDiseaseWeedController.java | 10 +- .../vo/ModelPestDiseaseWeedPageReqVO.java | 2 +- .../vo/ModelPestDiseaseWeedRespVO.java | 2 +- .../vo/ModelPestDiseaseWeedSaveReqVO.java | 2 +- .../models}/ModelManagementController.java | 10 +- .../vo/ModelManagementForPlanRespVO.java | 2 +- .../models}/vo/ModelManagementPageReqVO.java | 2 +- .../models}/vo/ModelManagementRespVO.java | 4 +- .../models}/vo/ModelManagementSaveReqVO.java | 2 +- .../ModelWeatherDisasterController.java | 10 +- .../vo/ModelWeatherDisasterPageReqVO.java | 2 +- .../vo/ModelWeatherDisasterRespVO.java | 2 +- .../vo/ModelWeatherDisasterSaveReqVO.java | 2 +- .../PersonnelManagementController.java | 8 +- .../vo/PersonnelManagementPageReqVO.java | 2 +- .../vo/PersonnelManagementRespVO.java | 2 +- .../vo/PersonnelManagementSaveReqVO.java | 2 +- .../PestDiseaseWeedLibraryController.java | 138 ++--- .../ProductionPlanController.java | 136 ++--- .../TwoDictController.java | 11 +- .../vo/TwoDictPageReqVO.java | 2 +- .../vo/TwoDictRespVO.java | 2 +- .../vo/TwoDictSaveReqVO.java | 2 +- .../vo/TwoDictTreeRespVO.java | 2 +- .../WeatherDisasterLibraryController.java | 138 ++--- .../dal/mysql/baseinfo/BaseInfoMapper.java | 4 +- .../mysql/companyinfo/CompanyInfoMapper.java | 2 +- .../farmingrecord/FarmingRecordMapper.java | 2 +- .../dal/mysql/gridinfo/GridInfoMapper.java | 2 +- .../messagecenter/MessageCenterMapper.java | 2 +- .../mysql/modelcycle/ModelCycleMapper.java | 2 +- .../ModelEnvironmentIndexMapper.java | 2 +- .../ModelFarmingOperationMapper.java | 2 +- .../ModelFarmingOperationInputMapper.java | 2 +- .../ModelManagementMapper.java | 5 +- .../ModelPestDiseaseWeedMapper.java | 2 +- .../ModelWeatherDisasterMapper.java | 2 +- .../PersonnelManagementMapper.java | 2 +- .../dal/mysql/plotinfo/PlotInfoMapper.java | 2 +- .../productionplan/ProductionPlanMapper.java | 4 +- .../farm/dal/mysql/twodict/TwoDictMapper.java | 2 +- .../module/farm/enums/CommonConstants.java | 23 +- .../util/ModelManagementConvertUtil.java | 2 +- .../farm/manager/devices/DeviceManager.java | 47 ++ .../manager/devices/soil/SoilService.java | 11 +- .../soil/dto/HistoryDataListPageReqVO.java | 63 +++ .../service/baseinfo/BaseInfoService.java | 7 +- .../service/baseinfo/BaseInfoServiceImpl.java | 10 +- .../companyinfo/CompanyInfoService.java | 4 +- .../companyinfo/CompanyInfoServiceImpl.java | 4 +- .../CropFarmingCenterService.java | 19 +- .../CropFarmingCenterServiceImpl.java | 63 ++- .../service/deviceinfo/DeviceInfoService.java | 8 + .../deviceinfo/DeviceInfoServiceImpl.java | 33 +- .../FarmingNameMaintenanceServiceImpl.java | 4 + .../FarmingRecordServiceImpl.java | 6 + .../service/gridinfo/GridInfoService.java | 5 +- .../service/gridinfo/GridInfoServiceImpl.java | 7 +- .../messagecenter/MessageCenterService.java | 6 +- .../MessageCenterServiceImpl.java | 6 +- .../FarmMessagePushServiceImpl.java | 2 +- .../service/modelcycle/ModelCycleService.java | 4 +- .../modelcycle/ModelCycleServiceImpl.java | 8 +- .../ModelEnvironmentIndexService.java | 5 +- .../ModelEnvironmentIndexServiceImpl.java | 4 +- .../ModelFarmingOperationService.java | 7 +- .../ModelFarmingOperationServiceImpl.java | 6 +- .../ModelFarmingOperationInputService.java | 5 +- ...ModelFarmingOperationInputServiceImpl.java | 4 +- .../ModelManagementService.java | 8 +- .../ModelManagementServiceImpl.java | 13 +- .../ModelPestDiseaseWeedService.java | 5 +- .../ModelPestDiseaseWeedServiceImpl.java | 4 +- .../ModelWeatherDisasterService.java | 5 +- .../ModelWeatherDisasterServiceImpl.java | 4 +- .../PersonnelManagementService.java | 4 +- .../PersonnelManagementServiceImpl.java | 4 +- .../service/plotinfo/PlotInfoService.java | 6 +- .../service/plotinfo/PlotInfoServiceImpl.java | 10 +- .../productionplan/ProductionPlanService.java | 2 +- .../ProductionPlanServiceImpl.java | 2 +- .../SpeciesLibraryServiceImpl.java | 6 +- .../farm/service/twodict/TwoDictService.java | 6 +- .../service/twodict/TwoDictServiceImpl.java | 6 +- .../module/farm/utils/TreeStructureUtil.java | 2 +- .../mapper/baseinfo/BaseInfoMapper.xml | 16 + .../productionplan/ProductionPlanMapper.xml | 2 +- 157 files changed, 1516 insertions(+), 942 deletions(-) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/CropFarmingCenterController.java (88%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/BasePlanOverviewRespVO.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/FarmRecordOverviewRespVO.java (86%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanPage2ReqVO.java (75%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanPageRespVO.java (88%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanResp2VO.java (98%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanSaveReqVO.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{cropFarmingCenter => cropfarmingcenter}/vo/ProductionPlanUpdateReqVO.java (96%) create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpit.java create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseNameRespVO.java create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BasePointRespVO.java create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseStatisticsInfoRespVO.java create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/CompanyInfoRespVO.java rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/BaseInfoController.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{gridinfo => managementcenter/baseinfo}/GridInfoController.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{plotinfo => managementcenter/baseinfo}/PlotInfoController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseAndPlotNamesRespVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseInfoPageReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseInfoRespVO.java (97%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseInfoSaveReqVO.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseNamePlanRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseNameRespVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseNamesRespVO.java (77%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/BaseOverviewRespVO.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{gridinfo => managementcenter/baseinfo}/vo/GridInfoPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{gridinfo => managementcenter/baseinfo}/vo/GridInfoRespVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{gridinfo => managementcenter/baseinfo}/vo/GridInfoSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{plotinfo => managementcenter/baseinfo}/vo/PlotInfoPageReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{plotinfo => managementcenter/baseinfo}/vo/PlotInfoRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{plotinfo => managementcenter/baseinfo}/vo/PlotInfoSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/TenantInfoRespVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/baseinfo/vo/wx/BaseInfoForWxRespVO.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{plotinfo => managementcenter/baseinfo}/vo/wx/RegularPlotInfoRespVO.java (86%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/companyinfo/CompanyInfoController.java (90%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/companyinfo/vo/CompanyInfoPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/companyinfo/vo/CompanyInfoRespVO.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/companyinfo/vo/CompanyInfoSaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/messagecenter/MessageCenterController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/messagecenter/vo/MessageCenterPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/messagecenter/vo/MessageCenterRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/messagecenter/vo/MessageCenterSaveReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/messagecenter/vo/MessageStatisticsRespVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelcycle/ModelCycleController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelcycle/vo/ModelCyclePageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelcycle/vo/ModelCycleRespVO.java (86%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelcycle/vo/ModelCycleSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelenvironmentindex/ModelEnvironmentIndexController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperation/ModelFarmingOperationController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperationinput/ModelFarmingOperationInputController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelpestdiseaseweed/ModelPestDiseaseWeedController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{modelmanagement => managementcenter/modelmanagement/models}/ModelManagementController.java (92%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{modelmanagement => managementcenter/modelmanagement/models}/vo/ModelManagementForPlanRespVO.java (86%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{modelmanagement => managementcenter/modelmanagement/models}/vo/ModelManagementPageReqVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{modelmanagement => managementcenter/modelmanagement/models}/vo/ModelManagementRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{modelmanagement => managementcenter/modelmanagement/models}/vo/ModelManagementSaveReqVO.java (96%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelweatherdisaster/ModelWeatherDisasterController.java (89%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter/modelmanagement}/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/personnelmanagement/PersonnelManagementController.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/personnelmanagement/vo/PersonnelManagementPageReqVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/personnelmanagement/vo/PersonnelManagementRespVO.java (95%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{ => managementcenter}/personnelmanagement/vo/PersonnelManagementSaveReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{twodict => specieslibrary}/TwoDictController.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{twodict => specieslibrary}/vo/TwoDictPageReqVO.java (93%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{twodict => specieslibrary}/vo/TwoDictRespVO.java (94%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{twodict => specieslibrary}/vo/TwoDictSaveReqVO.java (91%) rename yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/{twodict => specieslibrary}/vo/TwoDictTreeRespVO.java (94%) diff --git a/Readme.md b/Readme.md index 990ae2b3..a30f7979 100644 --- a/Readme.md +++ b/Readme.md @@ -1,18 +1,39 @@ -# 小程序参数 -- wx508d9a9ab84f67d0 -- be01dc0e8ebfcb9d93b816c41a0a2460 - -# mysql -- 223.83.129.121:3360 -- farming-platform -- wCM7fBMhFP3zNdJ3 - -# mongo express -- http://223.83.129.121:8081 -- mongo-express -- mongo-express_3TZ55T - -# mongo -- 223.83.129.121:27017 -- mongo_BiKBdR -- mongo_KaShrX \ No newline at end of file +# 包目录结构 +```` +cn.iocoder.yudao.module.farm.controller.admin +├── home // 农场首页 +├── cropfarmingcenter // 种植中心 +├── deviceinfo // 设备中心 +├── xxx // 溯源 +├── digitalcockpit // 大屏 +├── managementcenter // 管理中心 +│ ├── baseinfo // 基地规划 +│ ├── companyinfo // 企业信息管理 +│ ├── messagecenter // 消息中心 +│ ├── personnelmanagement // 人员管理 +│ ├── modelmanagement // 模型管理 +│ ├── models // 模型 +│ ├── modelcycle // 管理周期 +│ ├── modelenvironmentindex // 环境指标 +│ ├── modelfarmingoperation // 农事操作 +│ ├── modelfarmingoperationinput // 农事操作-投入品 +│ ├── modelpestdiseaseweed // 病虫草害 +│ ├── modelweatherdisaster // 气象灾害 +│ ├── basicdatamanagement // 基础数据管理 +│ ├── xxx // 农事类型维护 +│ ├── xxx // 农事名称维护 +│ ├── xxx // 物种类型维护 +│ ├── xxx // 物种库维护 +│ ├── xxx // 投入品维护 +│ ├── xxx // 灾害库维护 +│ ├── xxx // 气象灾害库维护 +│ ├── xxx // 设备类型维护 +│ ├── xxx // 设备环境指标维护 +│ ├── largescreen // 大屏数据维护 +└── 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/cropFarmingCenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java similarity index 88% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/CropFarmingCenterController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java index f932660d..a47edfaf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/CropFarmingCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter; import cn.iocoder.yudao.framework.common.pojo.CommonResult; 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.cropFarmingCenter.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*; 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; @@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.service.cropFarmingCenter.CropFarmingCenterService; -import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -31,14 +30,11 @@ import java.util.Objects; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; /** - * @description: 种植中心 - * 种植区域： farm_cultivation_area - * 模型： farm_model_management - * 生产计划： farm_production_plan - * 农事记录： farm_farming_record + * @description: 生产中心 + * 生产计划： /farm/farming-center/production-plan/** + * 农事计划： /farm/farming-center/farming-record/** * @author: binda * @date: 2025/8/19 10:39 */ @@ -50,12 +46,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; public class CropFarmingCenterController { private final CropFarmingCenterService cropFarmingCenterService; - private final FarmingRecordService farmingRecordService; - public CropFarmingCenterController(CropFarmingCenterService cropFarmingCenterService, - FarmingRecordService farmingRecordService) { + public CropFarmingCenterController(CropFarmingCenterService cropFarmingCenterService) { this.cropFarmingCenterService = cropFarmingCenterService; - this.farmingRecordService = farmingRecordService; } // // 生产计划 @@ -125,7 +118,7 @@ public class CropFarmingCenterController { @PostMapping("/production-plan/create") @Operation(summary = "生产计划-创建") - public CommonResult createProductionPlan(@Valid @RequestBody cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.ProductionPlanSaveReqVO createReqVO) { + public CommonResult createProductionPlan(@Valid @RequestBody cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanSaveReqVO createReqVO) { cropFarmingCenterService.createProductionPlan(createReqVO); return success(true); } @@ -199,34 +192,34 @@ public class CropFarmingCenterController { @GetMapping("/farming-record/page") @Operation(summary = "农事记录-分页") public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { - PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); + PageResult pageResult = cropFarmingCenterService.getFarmingRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); } @GetMapping("/farming-record/get/{id}") @Operation(summary = "农事记录-查看") public CommonResult getFarmingRecord(@PathVariable("id") String id) { - FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); - return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class)); + FarmingRecordRespVO res = cropFarmingCenterService.getFarmingRecord(id); + return success(res); } @PostMapping("/farming-record/create") @Operation(summary = "农事记录-新增") public CommonResult createFarmingRecord(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) { - return success(farmingRecordService.createFarmingRecordNew(createReqVO)); + return success(cropFarmingCenterService.createFarmingRecordNew(createReqVO)); } @PutMapping("/farming-record/update") @Operation(summary = "农事记录-编辑") public CommonResult updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { - farmingRecordService.updateFarmingRecord(updateReqVO); + cropFarmingCenterService.updateFarmingRecord(updateReqVO); return success(true); } @DeleteMapping("/farming-record/delete/{id}") @Operation(summary = "农事记录-删除") public CommonResult deleteFarmingRecord(@PathVariable("id") String id) { - farmingRecordService.deleteFarmingRecord(id); + cropFarmingCenterService.deleteFarmingRecord(id); return success(true); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/BasePlanOverviewRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/BasePlanOverviewRespVO.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/BasePlanOverviewRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/BasePlanOverviewRespVO.java index aaf61da9..61a6e357 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/BasePlanOverviewRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/BasePlanOverviewRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.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/cropFarmingCenter/vo/FarmRecordOverviewRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmRecordOverviewRespVO.java similarity index 86% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/FarmRecordOverviewRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmRecordOverviewRespVO.java index ddd1c92b..a81a2bda 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/FarmRecordOverviewRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmRecordOverviewRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.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/cropFarmingCenter/vo/ProductionPlanPage2ReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPage2ReqVO.java similarity index 75% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPage2ReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPage2ReqVO.java index 6f0f9b21..9bcc48ea 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPage2ReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPage2ReqVO.java @@ -1,13 +1,8 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDate; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * @description: 分页请求实体 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPageRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPageRespVO.java similarity index 88% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPageRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPageRespVO.java index fa4e8576..f80cc9c3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPageRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPageRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.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/cropFarmingCenter/vo/ProductionPlanResp2VO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanResp2VO.java similarity index 98% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanResp2VO.java index 2f3e8ca3..f5fbd846 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanResp2VO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanRespVO.java index d1fd4642..1db384cb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; import com.fasterxml.jackson.annotation.JsonFormat; 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/cropFarmingCenter/vo/ProductionPlanSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanSaveReqVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanSaveReqVO.java index a24af757..66dbc9fe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.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/cropFarmingCenter/vo/ProductionPlanUpdateReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanUpdateReqVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanUpdateReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanUpdateReqVO.java index 7c68170f..086b6abe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanUpdateReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.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/cultivationarea/CultivationAreaController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java index 08de290f..513e6362 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java @@ -33,69 +33,69 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; import cn.iocoder.yudao.module.farm.service.cultivationarea.CultivationAreaService; -@Tag(name = "管理后台 - 种植区域") -@RestController -@RequestMapping("/farm/cultivation-area") -@Validated +//@Tag(name = "管理后台 - 种植区域") +//@RestController +//@RequestMapping("/farm/cultivation-area") +//@Validated public class CultivationAreaController { - @Resource - private CultivationAreaService cultivationAreaService; - - @PostMapping("/create") - @Operation(summary = "创建种植区域") - public CommonResult createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) { - return success(cultivationAreaService.createCultivationArea(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新种植区域") - public CommonResult updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) { - cultivationAreaService.updateCultivationArea(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除种植区域") - @Parameter(name = "id", description = "编号", required = true) - public CommonResult deleteCultivationArea(@RequestParam("id") String id) { - cultivationAreaService.deleteCultivationArea(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除种植区域") - public CommonResult deleteCultivationAreaList(@RequestParam("ids") List ids) { - cultivationAreaService.deleteCultivationAreaListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得种植区域") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult getCultivationArea(@RequestParam("id") String id) { - CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id); - return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得种植区域分页") - public CommonResult> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) { - PageResult pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出种植区域 Excel") - @ApiAccessLog(operateType = EXPORT) - public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = cultivationAreaService.getCultivationAreaPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "种植区域.xls", "数据", CultivationAreaRespVO.class, - BeanUtils.toBean(list, CultivationAreaRespVO.class)); - } +// @Resource +// private CultivationAreaService cultivationAreaService; +// +// @PostMapping("/create") +// @Operation(summary = "创建种植区域") +// public CommonResult createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) { +// return success(cultivationAreaService.createCultivationArea(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新种植区域") +// public CommonResult updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) { +// cultivationAreaService.updateCultivationArea(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除种植区域") +// @Parameter(name = "id", description = "编号", required = true) +// public CommonResult deleteCultivationArea(@RequestParam("id") String id) { +// cultivationAreaService.deleteCultivationArea(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除种植区域") +// public CommonResult deleteCultivationAreaList(@RequestParam("ids") List ids) { +// cultivationAreaService.deleteCultivationAreaListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得种植区域") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// public CommonResult getCultivationArea(@RequestParam("id") String id) { +// CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id); +// return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得种植区域分页") +// public CommonResult> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) { +// PageResult pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class)); +// } +// +// @GetMapping("/export-excel") +// @Operation(summary = "导出种植区域 Excel") +// @ApiAccessLog(operateType = EXPORT) +// public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = cultivationAreaService.getCultivationAreaPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "种植区域.xls", "数据", CultivationAreaRespVO.class, +// BeanUtils.toBean(list, CultivationAreaRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java index 6619c485..52e3b774 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java @@ -10,16 +10,22 @@ import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPag import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoRespVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.*; +import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.mqtt.MqttConnectionDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; +import cn.iocoder.yudao.module.farm.enums.CommonConstants; +import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService; import cn.iocoder.yudao.module.farm.service.deviceinfo.DeviceInfoService; import cn.iocoder.yudao.module.farm.service.mqtt.DeviceMqttService; +import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.MqttException; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,8 +36,10 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.BINDING_STATE_MAP; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.DEVICE_STATE_MAP; -@Tag(name = "管理后台 - 设备信息") +@Tag(name = "设备中心") @RestController @RequestMapping("/farm/device-info") @Validated @@ -41,6 +49,10 @@ public class DeviceInfoController { private DeviceInfoService deviceInfoService; @Resource private DeviceMqttService deviceMqttService; + @Resource + private BaseInfoService baseInfoService; + @Resource + private PlotInfoService plotInfoService; @PostMapping("/create") @Operation(summary = "创建设备信息") @@ -53,6 +65,33 @@ public class DeviceInfoController { @Operation(summary = "更新设备信息") public CommonResult updateDeviceInfo(@Valid @RequestBody DeviceInfoSaveV2ReqVO updateReqVO) { DeviceInfoSaveReqVO targetObj = BeanUtils.toBean(updateReqVO, DeviceInfoSaveReqVO.class); + + targetObj.setBindingState(CommonConstants.YES_CODE); + if (!StringUtils.isEmpty(targetObj.getBaseId()) && !StringUtils.isEmpty(targetObj.getBaseId())) { + BaseInfoDO b = baseInfoService.getBaseInfo(targetObj.getBaseId()); + PlotInfoDO p = plotInfoService.getPlotInfo(targetObj.getPlotId()); + targetObj.setBaseName(b.getName()); + targetObj.setPlotName(p.getPlotName()); + } + + deviceInfoService.updateDeviceInfo(targetObj); + return success(true); + } + + @PutMapping("/un-bundle") + @Operation(summary = "解绑设备信息") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult unBundle(@RequestParam("id") String id) { + DeviceInfoSaveReqVO targetObj = new DeviceInfoSaveReqVO(); + targetObj.setId(id); + targetObj.setBindingState(CommonConstants.NO_CODE); + targetObj.setDeviceState(CommonConstants.DEVICE_STATE_0); + targetObj.setBaseId(""); + targetObj.setBaseName(""); + targetObj.setPlotId(""); + targetObj.setPlotName(""); + targetObj.setPoint(null); + deviceInfoService.updateDeviceInfo(targetObj); return success(true); } @@ -77,8 +116,8 @@ public class DeviceInfoController { @Operation(summary = "获得设备信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getDeviceInfo(@RequestParam("id") String id) { - DeviceInfoDO deviceInfo = deviceInfoService.getDeviceInfo(id); - return success(BeanUtils.toBean(deviceInfo, DeviceInfoDetailV2RespVO.class)); + DeviceInfoDetailV2RespVO res = deviceInfoService.getDeviceRealTimeInfo(id); + return success(res); } @GetMapping("/page") @@ -86,12 +125,27 @@ public class DeviceInfoController { public CommonResult> getDeviceInfoPage(@Valid DeviceInfoPageV2ReqVO pageReqVO) { DeviceInfoPageReqVO targetObj = new DeviceInfoPageReqVO(); + targetObj.setPageSize(100); targetObj.setBaseId(pageReqVO.getBaseId()); targetObj.setDeviceType(pageReqVO.getDeviceTypeId()); targetObj.setDeviceName(pageReqVO.getDeviceName()); + targetObj.setDeviceState(pageReqVO.getDeviceState()); + targetObj.setBindingState(pageReqVO.getBindingState()); PageResult pageResult = deviceInfoService.getDeviceInfoPage(targetObj); PageResult deviceInfoRespVOPageResult = BeanUtils.toBean(pageResult, DeviceInfoPageV2RespVO.class); + for (DeviceInfoPageV2RespVO d : deviceInfoRespVOPageResult.getList()) { + + if (!StringUtils.isEmpty(d.getBaseId()) && !StringUtils.isEmpty(d.getBaseId())) { + BaseInfoDO b = baseInfoService.getBaseInfo(d.getBaseId()); + PlotInfoDO p = plotInfoService.getPlotInfo(d.getPlotId()); + d.setBasePoint(b.getPoint()); + d.setPlotPoint(p.getPoint()); + } + + d.setDeviceStateName(DEVICE_STATE_MAP.get(d.getDeviceState())); + d.setBindingStateName(BINDING_STATE_MAP.get(d.getBindingState())); + } return success(deviceInfoRespVOPageResult); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java index a0af35db..d0eb2293 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java @@ -112,5 +112,9 @@ public class DeviceInfoSaveReqVO { @Schema(description = "租户id", example = "11502") private String tenantId; + + @Schema(description = "设备坐标") private String point; + @Schema(description = "负责人") + private String managerId; } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java index 0730be68..3fc1fa13 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java @@ -24,6 +24,8 @@ public class DeviceInfoDetailV2RespVO { @Schema(description = "设备类型 (设备类型ID)") private String deviceType; + @Schema(description = "设备类型 (设备类型-名称)") + private String deviceTypeName; @Schema(description = "设备分类名称 (设备型号,字符拼接)") private String deviceCategoryName; @@ -33,8 +35,8 @@ public class DeviceInfoDetailV2RespVO { @Schema(description = "负责人") private String managerId; - @Schema(description = "是否存在物联网卡 (1:有;2:无;)") - private Boolean isIotCardExisted; + @Schema(description = "是否存在物联网卡 (1:有;0:无;)") + private Integer isIotCardExisted; @Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障") private Integer deviceState; @Schema(description = "绑定状态：1: 绑定; 0: 未绑定") @@ -76,5 +78,9 @@ public class DeviceInfoDetailV2RespVO { private String deviceUniqueId; } - + public DeviceInfoDetailV2RespVO(String deviceUniqueId, SoilInfo soilInfo, WfInfo wfInfo) { + this.deviceUniqueId = deviceUniqueId; + this.soilInfo = soilInfo; + this.wfInfo = wfInfo; + } } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2ReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2ReqVO.java index 72461fab..1d1e93e3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2ReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2ReqVO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class DeviceInfoPageV2ReqVO { +public class DeviceInfoPageV2ReqVO extends PageParam{ @Schema(description = "基地ID") private String baseId; @@ -24,5 +24,7 @@ public class DeviceInfoPageV2ReqVO { private String deviceName; @Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障") private Integer deviceState; + @Schema(description = "绑定状态：0-未绑定; 1:已绑定") + private Integer bindingState; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2RespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2RespVO.java index 8d3d001c..e4428639 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2RespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2RespVO.java @@ -12,7 +12,7 @@ import java.util.List; * @date: 2025/9/19 14:22 */ @Data -public class DeviceInfoPageV2RespVO extends PageParam { +public class DeviceInfoPageV2RespVO { private String id; @@ -30,12 +30,14 @@ public class DeviceInfoPageV2RespVO extends PageParam { @Schema(description = "负责人") private String managerId; - @Schema(description = "是否存在物联网卡 (1:有;2:无;)") - private Boolean isIotCardExisted; + @Schema(description = "是否存在物联网卡 (1:有;0:无;)") + private Integer isIotCardExisted; @Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障") private Integer deviceState; + private String deviceStateName; @Schema(description = "绑定状态：1: 绑定; 0: 未绑定") private Integer bindingState; + private String bindingStateName; @Schema(description = "设备坐标") private String point; @@ -44,10 +46,12 @@ public class DeviceInfoPageV2RespVO extends PageParam { @Schema(description = "基地iD") private String baseId; + private String baseName; @Schema(description = "基地坐标") private String basePoint; @Schema(description = "地块ID") private String plotId; + private String plotName; @Schema(description = "地块坐标") private String plotPoint; 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 cb3d4baa..0922d4eb 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 @@ -1,36 +1,10 @@ package cn.iocoder.yudao.module.farm.controller.admin.dict; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -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.baseinfo.vo.BaseNamePlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNameRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.FarmingTypeRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibraryRespVO; +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; -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.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.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.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.specieslibrary.vo.SpeciesLibraryPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibrarySaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesThreeLevelTreeRespVO; -import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; -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; -import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService; import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService; @@ -43,12 +17,10 @@ import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService; import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -94,250 +66,259 @@ public class DictController { } // 农事类型 - @Operation(summary = "字典数据维护-农事类型-分页") - @GetMapping("/farming-type/page") - public CommonResult> getFarmingTypePage(FarmingTypeMaintenancePageReqVO reqVO) { - PageResult result = sysDictService.getFarmingTypeMaintenancePage(reqVO); - return success(BeanUtils.toBean(result, FarmingTypeMaintenanceRespVO.class)); - } - - @Operation(summary = "字典数据维护-农事类型-查看") - @GetMapping("/farming-type/get/{id}") - public CommonResult getFarmingTypeMaintenance(@PathVariable("id") String id) { - FarmingTypeMaintenanceDO aDo = sysDictService.getFarmingTypeMaintenance(id); - return success(BeanUtils.toBean(aDo, FarmingTypeMaintenanceRespVO.class)); - } - - @Operation(summary = "字典数据维护-农事类型-新增") - @PostMapping("/farming-type/create") - public CommonResult createFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO saveVO) { - sysDictService.createFarmingTypeMaintenance(saveVO); - return success(true); - } - - @Operation(summary = "字典数据维护-农事类型-编辑") - @PutMapping("/farming-type/update") - public CommonResult updateFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO updateVO) { - sysDictService.updateFarmingTypeMaintenance(updateVO); - return success(true); - } - - @Operation(summary = "字典数据维护-农事类型-删除") - @DeleteMapping("/farming-type/delete/{id}") - public CommonResult delFarmingType(@PathVariable("id") String id) { - sysDictService.deleteFarmingTypeMaintenance(id); - return success(true); - } - - // 农事名称 - @Operation(summary = "字典数据维护-农事名称-分页") - @GetMapping("/farming-name/page") - public CommonResult> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) { - PageResult pageResult = sysDictService.getFarmingNameMaintenancePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, FarmingNameMaintenanceRespVO.class)); - } - - @Operation(summary = "字典数据维护-农事名称-查看") - @GetMapping("/farming-name/get/{id}") - public CommonResult getFarmingNameMaintenance(@PathVariable("id") String id) { - FarmingNameMaintenanceDO farmingNameMaintenance = sysDictService.getFarmingNameMaintenance(id); - return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class)); - } - - @Operation(summary = "字典数据维护-农事名称-新增") - @PostMapping("/farming-name/create") - public CommonResult createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) { - sysDictService.createFarmingNameMaintenance(createReqVO); - return success(true); - } +// @Operation(summary = "字典数据维护-农事类型-分页") +// @GetMapping("/farming-type/page") +// public CommonResult> getFarmingTypePage(FarmingTypeMaintenancePageReqVO reqVO) { +// PageResult result = sysDictService.getFarmingTypeMaintenancePage(reqVO); +// return success(BeanUtils.toBean(result, FarmingTypeMaintenanceRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-农事类型-查看") +// @GetMapping("/farming-type/get/{id}") +// public CommonResult getFarmingTypeMaintenance(@PathVariable("id") String id) { +// FarmingTypeMaintenanceDO aDo = sysDictService.getFarmingTypeMaintenance(id); +// return success(BeanUtils.toBean(aDo, FarmingTypeMaintenanceRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-农事类型-新增") +// @PostMapping("/farming-type/create") +// public CommonResult createFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO saveVO) { +// sysDictService.createFarmingTypeMaintenance(saveVO); +// return success(true); +// } +// +// @Operation(summary = "字典数据维护-农事类型-编辑") +// @PutMapping("/farming-type/update") +// public CommonResult updateFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO updateVO) { +// sysDictService.updateFarmingTypeMaintenance(updateVO); +// return success(true); +// } +// +// @Operation(summary = "字典数据维护-农事类型-删除") +// @DeleteMapping("/farming-type/delete/{id}") +// public CommonResult delFarmingType(@PathVariable("id") String id) { +// sysDictService.deleteFarmingTypeMaintenance(id); +// return success(true); +// } +// +// // 农事名称 +// @Operation(summary = "字典数据维护-农事名称-分页") +// @GetMapping("/farming-name/page") +// public CommonResult> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) { +// PageResult pageResult = sysDictService.getFarmingNameMaintenancePage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, FarmingNameMaintenanceRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-农事名称-查看") +// @GetMapping("/farming-name/get/{id}") +// public CommonResult getFarmingNameMaintenance(@PathVariable("id") String id) { +// FarmingNameMaintenanceDO farmingNameMaintenance = sysDictService.getFarmingNameMaintenance(id); +// return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-农事名称-新增") +// @PostMapping("/farming-name/create") +// public CommonResult createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) { +// sysDictService.createFarmingNameMaintenance(createReqVO); +// return success(true); +// } +// +// +// @Operation(summary = "字典数据维护-农事名称-编辑") +// @PutMapping("/farming-name/update") +// public CommonResult updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) { +// sysDictService.updateFarmingNameMaintenance(updateReqVO); +// return success(true); +// } +// +// +// @Operation(summary = "字典数据维护-农事名称-删除") +// @DeleteMapping("/farming-name/delete/{id}") +// public CommonResult deleteFarmingNameMaintenance(@PathVariable("id") String id) { +// sysDictService.deleteFarmingNameMaintenance(id); +// return success(true); +// } +// +// // 物种库维护 +// @Operation(summary = "字典数据维护-物种库-分页") +// @GetMapping("/species/page") +// public CommonResult> getSpeciesLibraryPage(@Valid SpeciesLibraryPageReqVO pageReqVO) { +// PageResult pageResult = speciesLibraryService.getSpeciesLibraryPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, SpeciesLibraryRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-物种库-查看") +// @GetMapping("/species/get/{id}") +// public CommonResult getSpeciesLibrary(@PathVariable("id") String id) { +// SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(id); +// return success(BeanUtils.toBean(speciesLibrary, SpeciesLibraryRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-物种库-新增") +// @PostMapping("/species/create") +// public CommonResult createSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO createReqVO) { +// String msg = speciesLibraryService.createSpeciesLibrary(createReqVO); +// +// CommonResult result = new CommonResult<>(); +// result.setCode(GlobalErrorCodeConstants.SUCCESS.getCode()); +// result.setData(""); +// result.setMsg(msg); +// return result; +// } +// +// @Operation(summary = "字典数据维护-物种库-编辑") +// @PutMapping("/species/update") +// public CommonResult updateSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO updateReqVO) { +// speciesLibraryService.updateSpeciesLibrary(updateReqVO); +// return success(true); +// } +// +// @Operation(summary = "字典数据维护-物种库-删除") +// @DeleteMapping("/species/delete/{id}") +// public CommonResult deleteSpeciesLibrary(@PathVariable("id") String id) { +// speciesLibraryService.deleteSpeciesLibrary(id); +// return success(true); +// } +// +// // 投入品维护 +// @Operation(summary = "字典数据维护-投入品-分页") +// @GetMapping("/invest-goods/page") +// public CommonResult> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) { +// PageResult pageResult = inputLibraryService.getInputLibraryPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, InputLibraryRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-投入品-查看") +// @GetMapping("/invest-goods/get/{id}") +// public CommonResult getInputLibrary(@PathVariable("id") String id) { +// InputLibraryDO inputLibrary = inputLibraryService.getInputLibrary(id); +// return success(BeanUtils.toBean(inputLibrary, InputLibraryRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-投入品-新增") +// @PostMapping("/invest-goods/create") +// public CommonResult createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) { +// return success(inputLibraryService.createInputLibrary(createReqVO)); +// } +// +// @PutMapping("/invest-goods/update") +// @Operation(summary = "字典数据维护-投入品-编辑") +// public CommonResult updateInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO updateReqVO) { +// inputLibraryService.updateInputLibrary(updateReqVO); +// return success(true); +// } +// +// +// @Operation(summary = "字典数据维护-投入品-删除") +// @DeleteMapping("/invest-goods/delete/{id}") +// public CommonResult deleteInputLibrary(@PathVariable("id") String id) { +// inputLibraryService.deleteInputLibrary(id); +// return success(true); +// } +// +// // 灾害/气象灾害库维护 +// @Operation(summary = "字典数据维护-灾害库-分页") +// @GetMapping("/disaster/page") +// public CommonResult> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) { +// PageResult pageResult = disasterDataService.getDisasterDataPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, DisasterDataRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-灾害库-查看") +// @GetMapping("/disaster/get/{id}") +// public CommonResult getDisasterData(@PathVariable("id") String id) { +// DisasterDataDO disasterData = disasterDataService.getDisasterData(id); +// return success(BeanUtils.toBean(disasterData, DisasterDataRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-灾害库-新增") +// @PostMapping("/disaster/create") +// public CommonResult createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) { +// return success(disasterDataService.createDisasterData(createReqVO)); +// } +// +// @Operation(summary = "字典数据维护-灾害库-编辑") +// @PutMapping("/disaster/update") +// public CommonResult updateDisasterData(@Valid @RequestBody DisasterDataSaveReqVO updateReqVO) { +// disasterDataService.updateDisasterData(updateReqVO); +// return success(true); +// } +// +// @Operation(summary = "字典数据维护-灾害库-删除") +// @DeleteMapping("/disaster/delete/{id}") +// public CommonResult deleteDisasterData(@PathVariable("id") String id) { +// disasterDataService.deleteDisasterData(id); +// return success(true); +// } - @Operation(summary = "字典数据维护-农事名称-编辑") - @PutMapping("/farming-name/update") - public CommonResult updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) { - sysDictService.updateFarmingNameMaintenance(updateReqVO); - return success(true); - } - @Operation(summary = "字典数据维护-农事名称-删除") - @DeleteMapping("/farming-name/delete/{id}") - public CommonResult deleteFarmingNameMaintenance(@PathVariable("id") String id) { - sysDictService.deleteFarmingNameMaintenance(id); - return success(true); - } - - // 物种库维护 - @Operation(summary = "字典数据维护-物种库-分页") - @GetMapping("/species/page") - public CommonResult> getSpeciesLibraryPage(@Valid SpeciesLibraryPageReqVO pageReqVO) { - PageResult pageResult = speciesLibraryService.getSpeciesLibraryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, SpeciesLibraryRespVO.class)); - } - - @Operation(summary = "字典数据维护-物种库-查看") - @GetMapping("/species/get/{id}") - public CommonResult getSpeciesLibrary(@PathVariable("id") String id) { - SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(id); - return success(BeanUtils.toBean(speciesLibrary, SpeciesLibraryRespVO.class)); - } - - @Operation(summary = "字典数据维护-物种库-新增") - @PostMapping("/species/create") - public CommonResult createSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO createReqVO) { - String msg = speciesLibraryService.createSpeciesLibrary(createReqVO); - - CommonResult result = new CommonResult<>(); - result.setCode(GlobalErrorCodeConstants.SUCCESS.getCode()); - result.setData(""); - result.setMsg(msg); - return result; - } - - @Operation(summary = "字典数据维护-物种库-编辑") - @PutMapping("/species/update") - public CommonResult updateSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO updateReqVO) { - speciesLibraryService.updateSpeciesLibrary(updateReqVO); - return success(true); - } - - @Operation(summary = "字典数据维护-物种库-删除") - @DeleteMapping("/species/delete/{id}") - public CommonResult deleteSpeciesLibrary(@PathVariable("id") String id) { - speciesLibraryService.deleteSpeciesLibrary(id); - return success(true); - } - - // 投入品维护 - @Operation(summary = "字典数据维护-投入品-分页") - @GetMapping("/invest-goods/page") - public CommonResult> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) { - PageResult pageResult = inputLibraryService.getInputLibraryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, InputLibraryRespVO.class)); - } - - @Operation(summary = "字典数据维护-投入品-查看") - @GetMapping("/invest-goods/get/{id}") - public CommonResult getInputLibrary(@PathVariable("id") String id) { - InputLibraryDO inputLibrary = inputLibraryService.getInputLibrary(id); - return success(BeanUtils.toBean(inputLibrary, InputLibraryRespVO.class)); - } - - @Operation(summary = "字典数据维护-投入品-新增") - @PostMapping("/invest-goods/create") - public CommonResult createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) { - return success(inputLibraryService.createInputLibrary(createReqVO)); - } - - @PutMapping("/invest-goods/update") - @Operation(summary = "字典数据维护-投入品-编辑") - public CommonResult updateInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO updateReqVO) { - inputLibraryService.updateInputLibrary(updateReqVO); - return success(true); - } - @Operation(summary = "字典数据维护-投入品-删除") - @DeleteMapping("/invest-goods/delete/{id}") - public CommonResult deleteInputLibrary(@PathVariable("id") String id) { - inputLibraryService.deleteInputLibrary(id); - return success(true); - } - // 灾害/气象灾害库维护 - @Operation(summary = "字典数据维护-灾害库-分页") - @GetMapping("/disaster/page") - public CommonResult> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) { - PageResult pageResult = disasterDataService.getDisasterDataPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DisasterDataRespVO.class)); - } - @Operation(summary = "字典数据维护-灾害库-查看") - @GetMapping("/disaster/get/{id}") - public CommonResult getDisasterData(@PathVariable("id") String id) { - DisasterDataDO disasterData = disasterDataService.getDisasterData(id); - return success(BeanUtils.toBean(disasterData, DisasterDataRespVO.class)); - } - - @Operation(summary = "字典数据维护-灾害库-新增") - @PostMapping("/disaster/create") - public CommonResult createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) { - return success(disasterDataService.createDisasterData(createReqVO)); - } - - @Operation(summary = "字典数据维护-灾害库-编辑") - @PutMapping("/disaster/update") - public CommonResult updateDisasterData(@Valid @RequestBody DisasterDataSaveReqVO updateReqVO) { - disasterDataService.updateDisasterData(updateReqVO); - return success(true); - } - - @Operation(summary = "字典数据维护-灾害库-删除") - @DeleteMapping("/disaster/delete/{id}") - public CommonResult deleteDisasterData(@PathVariable("id") String id) { - disasterDataService.deleteDisasterData(id); - return success(true); - } - - // 下拉框列表 - @Operation(summary = "字典数据维护-下拉框列表-农事类型") - @GetMapping("/list/farming-type") - public CommonResult> getFarmingTypeList() { - List res = farmingTypeMaintenanceService.getFarmingTypeList(); - return success(BeanUtils.toBean(res, FarmingTypeRespVO.class)); - } - - @Operation(summary = "字典数据维护-下拉框列表-三级物种类别") - @GetMapping("/list/three-library") - public CommonResult> getTreeLibraryList() { - try { - List threeList = speciesLibraryService.getSpeciesThreeLevelTree(); - return success(threeList); - } catch (Exception e) { - log.error("获取三级物种类别列表失败", e); - return success(new ArrayList<>()); - } - } - - @Operation(summary = "字典数据维护-下拉框列表-二级物种类别") - @GetMapping("/list/two-library") - public CommonResult> getTwoLibraryList() { - try { - List twoList = speciesLibraryService.getSpeciesTwoLevelTree(); - return success(twoList); - } catch (Exception e) { - log.error("获取二级物种类别列表失败", e); - return success(new ArrayList<>()); - } - } - - @Operation(summary = "字典数据维护-下拉框列表-物种类别与模型") - @GetMapping("/list/species-classify-model") - public CommonResult> getSpeciesClassifyAndModelList() { - return success(sysDictService.getSpeciesClassifyAndModelList()); - } +// +// // 下拉框列表 +// @Operation(summary = "字典数据维护-下拉框列表-农事类型") +// @GetMapping("/list/farming-type") +// public CommonResult> getFarmingTypeList() { +// List res = farmingTypeMaintenanceService.getFarmingTypeList(); +// return success(BeanUtils.toBean(res, FarmingTypeRespVO.class)); +// } +// +// @Operation(summary = "字典数据维护-下拉框列表-三级物种类别") +// @GetMapping("/list/three-library") +// public CommonResult> getTreeLibraryList() { +// try { +// List threeList = speciesLibraryService.getSpeciesThreeLevelTree(); +// return success(threeList); +// } catch (Exception e) { +// log.error("获取三级物种类别列表失败", e); +// return success(new ArrayList<>()); +// } +// } +// +// @Operation(summary = "字典数据维护-下拉框列表-二级物种类别") +// @GetMapping("/list/two-library") +// public CommonResult> getTwoLibraryList() { +// try { +// List twoList = speciesLibraryService.getSpeciesTwoLevelTree(); +// return success(twoList); +// } catch (Exception e) { +// log.error("获取二级物种类别列表失败", e); +// return success(new ArrayList<>()); +// } +// } +// +// @Operation(summary = "字典数据维护-下拉框列表-物种类别与模型") +// @GetMapping("/list/species-classify-model") +// public CommonResult> getSpeciesClassifyAndModelList() { +// return success(sysDictService.getSpeciesClassifyAndModelList()); +// } +// @GetMapping("/list/base-name") @Operation(summary = "字典数据维护-下拉框列表-基地,地块二级联动") public CommonResult> getBaseNameList() { List res = baseInfoService.getBaseNameList(); 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 = "字典数据维护-下拉框列表-投入品") - public CommonResult> getInvestGoodsList() { - List res = sysDictService.getInvestGoodsList(); - 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 = "字典数据维护-下拉框列表-投入品") +// public CommonResult> getInvestGoodsList() { +// List res = sysDictService.getInvestGoodsList(); +// return success(res); +// } +// @Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询") @GetMapping("/list/{dictTypeCode}") public CommonResult> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpit.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpit.java new file mode 100644 index 00000000..27b391f8 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpit.java @@ -0,0 +1,157 @@ +package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit; + +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.digitalcockpit.vo.BaseNameRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BasePointRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CompanyInfoRespVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; +import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService; +import cn.iocoder.yudao.module.farm.service.companyinfo.CompanyInfoService; +import cn.iocoder.yudao.module.farm.service.deviceinfo.DeviceInfoService; +import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; +import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; +import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +/** + * @description: 大屏驾驶舱 + * @author: binda + * @date: 2025/9/22 14:49 + */ +@Tag(name = "大屏-驾驶舱") +@RestController +@RequestMapping("/farm/digital-cockpit") +@Validated +public class DigitalCockpit { + + private final BaseInfoService baseInfoService; + private final PlotInfoService plotInfoService; + private final CompanyInfoService companyInfoService; + private final DeviceInfoService deviceInfoService; + private final ProductionPlanService productionPlanService; + private final FarmingRecordService farmingRecordService; + + public DigitalCockpit(BaseInfoService baseInfoService, PlotInfoService plotInfoService, CompanyInfoService companyInfoService, DeviceInfoService deviceInfoService, ProductionPlanService productionPlanService, FarmingRecordService farmingRecordService) { + this.baseInfoService = baseInfoService; + this.plotInfoService = plotInfoService; + this.companyInfoService = companyInfoService; + this.deviceInfoService = deviceInfoService; + this.productionPlanService = productionPlanService; + this.farmingRecordService = farmingRecordService; + } + + @GetMapping("/company-info") + @Operation(summary = "租户信息") + public CommonResult getCompanyInfo() { + CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo(); + return success(BeanUtils.toBean(companyInfo,CompanyInfoRespVO.class)); + } + + @GetMapping("/base-map") + @Operation(summary = "基地地图") + @Parameter(name = "baseId", description = "基地ID", required = true) + public CommonResult> getBasePointInfo(@RequestParam("baseId") String baseId) { + List res = new ArrayList<>(); + + List bList = baseInfoService.getBaseInfosById(baseId); + for (BaseInfoDO b : bList) { + List pList = plotInfoService.getPlotInfos(b.getId()); + List pRes = pList.stream().map(p -> new BasePointRespVO.PlotInfo(p.getId(), p.getPlotName(), p.getPoint(), p.getPlotColor())).toList(); + + BasePointRespVO target = new BasePointRespVO(); + target.setBaseId(b.getId()); + target.setBaseName(b.getName()); + target.setPoint(b.getPoint()); + target.setPlotInfos(pRes); + res.add(target); + } + return success(res); + } + + @GetMapping("/base-statistics") + @Operation(summary = "基地统计信息") + @Parameter(name = "baseId", description = "基地ID", required = true) + public CommonResult getBaseStatisticsInfo(@RequestParam("baseId") String baseId) { + BaseStatisticsInfoRespVO res = baseInfoService.getBaseStatisticsInfo(baseId); + return success(res); + } + + @GetMapping("/base-name/list") + @Operation(summary = "基地下拉框") + public CommonResult> getBaseName() { + List res = baseInfoService.getBaseInfos().stream().map(e -> new BaseNameRespVO(e.getId(), e.getName())).toList(); + return success(res); + } + + @GetMapping("/crop-statistics/type/1") + @Operation(summary = "种植统计-种植分布") + @Parameter(name = "baseId", description = "基地ID", required = true) + @Parameter(name = "year", description = "查询条件: 年份", required = true) + public void getCropStatisticsInfo(@RequestParam("baseId") String baseId, + @RequestParam("year") String year) { + + } + + @GetMapping("/crop-statistics/type/2") + @Operation(summary = "种植统计-产量分布") + @Parameter(name = "baseId", description = "基地ID", required = true) + @Parameter(name = "year", description = "查询条件: 年份", required = true) + public void getYieldStatisticsInfo(@RequestParam("baseId") String baseId, + @RequestParam("year") String year) { + + } + + @GetMapping("/crop-statistics/type/3") + @Operation(summary = "种植统计-实际/预计产量对比") + @Parameter(name = "baseId", description = "基地ID", required = true) + @Parameter(name = "year", description = "查询条件: 年份", required = true) + public void getActualYieldStatisticsInfo(@RequestParam("baseId") String baseId, + @RequestParam("year") String year) { + + + } + + @GetMapping("/farm-records/type/1") + @Operation(summary = "农事分布") + @Parameter(name = "baseId", description = "基地ID", required = true) + public void getFarmRecords(@RequestParam("baseId") String baseId) { + + } + + @GetMapping("/farm-records/type/2") + @Operation(summary = "农事活动趋势") + @Parameter(name = "baseId", description = "基地ID", required = true) + public void getFarmRecordsDirection(@RequestParam("baseId") String baseId) { + + } + + @GetMapping("/device-info/statistics") + @Operation(summary = "设备统计") + @Parameter(name = "baseId", description = "基地ID", required = true) + public void getDeviceInfo(@RequestParam("baseId") String baseId) { + + } + + @GetMapping("/device-info/monitor-data") + @Operation(summary = "监测数据") + @Parameter(name = "baseId", description = "基地ID", required = true) + public void getMonitoringData(@RequestParam("baseId") String baseId) { + + + + } + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseNameRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseNameRespVO.java new file mode 100644 index 00000000..c814c959 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseNameRespVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: + * @author: binda + * @date: 2025/9/23 18:36 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BaseNameRespVO { + @Schema(description = "基地ID") + private String baseId; + @Schema(description = "基地名称") + private String baseName; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BasePointRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BasePointRespVO.java new file mode 100644 index 00000000..18790b55 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BasePointRespVO.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @description: + * @author: binda + * @date: 2025/9/23 18:28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BasePointRespVO { + + @Schema(description = "基地ID") + private String baseId; + @Schema(description = "基地名称") + private String baseName; + @Schema(description = "基地坐标") + private String point; + @Schema(description = "地块集合") + private List plotInfos; + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class PlotInfo { + @Schema(description = "地块ID") + private String plotId; + @Schema(description = "地块名称") + private String plotName; + @Schema(description = "基地坐标") + private String point; + @Schema(description = "基地颜色") + private String plotColor; + } + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseStatisticsInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseStatisticsInfoRespVO.java new file mode 100644 index 00000000..20ebfcba --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseStatisticsInfoRespVO.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: + * @author: binda + * @date: 2025/9/22 21:32 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BaseStatisticsInfoRespVO { + @Schema(description = "总面积") + private Integer totalArea; + @Schema(description = "基地数量") + private Integer totalBase; + @Schema(description = "地块数量") + private Integer totalPlot; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/CompanyInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/CompanyInfoRespVO.java new file mode 100644 index 00000000..3d0bd99a --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/CompanyInfoRespVO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 驾驶舱-组合信息 响应数据 + * @author: binda + * @date: 2025/9/22 21:24 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CompanyInfoRespVO { + private String id; + @Schema(description = "企业名称") + private String name; + @Schema(description = "企业介绍") + private String introduction; + @Schema(description = "企业logo") + private String logoImage; +} 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/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java index 11209c24..18f84a29 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/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java @@ -19,19 +19,4 @@ public class FarmingNameMaintenanceSaveReqVO { @Schema(description = "0=启用，1=停用", example = "2") private Integer useStatus; -// @Schema(description = "基地id", example = "23381") -// private String baseId; -// -// @Schema(description = "基地", example = "赵六") -// private String baseName; -// -// @Schema(description = "地块ID", example = "20315") -// private String plotId; -// -// @Schema(description = "地块", example = "张三") -// private String plotName; -// -// @Schema(description = "租户id", example = "15178") -// private String tenantId; - } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java index fab2875d..7a4441ce 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java @@ -31,83 +31,82 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; -@Tag(name = "管理后台 - 种植中心-农事基地-农事记录") -@RestController -@RequestMapping("/farm/farming-record") -@Validated +//@Tag(name = "种植中心-农事记录") +//@RestController +//@RequestMapping("/farm/farming-record") +//@Validated public class FarmingRecordController { - @Resource - private FarmingRecordService farmingRecordService; - - @PostMapping("/create") - @Operation(summary = "创建种植中心-农事基地-农事记录") - - public CommonResult createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) { - return success(farmingRecordService.createFarmingRecord(createReqVO)); - } - - @PostMapping("/create-new") - @Operation(summary = "创建种植中心-农事基地-农事记录（新格式）") - - public CommonResult createFarmingRecordNew(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) { - return success(farmingRecordService.createFarmingRecordNew(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新种植中心-农事基地-农事记录") - - public CommonResult updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { - farmingRecordService.updateFarmingRecord(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除种植中心-农事基地-农事记录") - @Parameter(name = "id", description = "编号", required = true) - - public CommonResult deleteFarmingRecord(@RequestParam("id") String id) { - farmingRecordService.deleteFarmingRecord(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除种植中心-农事基地-农事记录") - - public CommonResult deleteFarmingRecordList(@RequestParam("ids") List ids) { - farmingRecordService.deleteFarmingRecordListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得种植中心-农事基地-农事记录") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - - public CommonResult getFarmingRecord(@RequestParam("id") String id) { - FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); - return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得种植中心-农事基地-农事记录分页") - - public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { - PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出种植中心-农事基地-农事记录 Excel") - - @ApiAccessLog(operateType = EXPORT) - public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class, - BeanUtils.toBean(list, FarmingRecordRespVO.class)); - } +// @Resource +// private FarmingRecordService farmingRecordService; +// +// @PostMapping("/create") +// @Operation(summary = "创建种植中心-农事基地-农事记录") +// +// public CommonResult createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) { +// return success(farmingRecordService.createFarmingRecord(createReqVO)); +// } +// +// @PostMapping("/create-new") +// @Operation(summary = "创建种植中心-农事基地-农事记录（新格式）") +// public CommonResult createFarmingRecordNew(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) { +// return success(farmingRecordService.createFarmingRecordNew(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新种植中心-农事基地-农事记录") +// +// public CommonResult updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { +// farmingRecordService.updateFarmingRecord(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除种植中心-农事基地-农事记录") +// @Parameter(name = "id", description = "编号", required = true) +// +// public CommonResult deleteFarmingRecord(@RequestParam("id") String id) { +// farmingRecordService.deleteFarmingRecord(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除种植中心-农事基地-农事记录") +// +// public CommonResult deleteFarmingRecordList(@RequestParam("ids") List ids) { +// farmingRecordService.deleteFarmingRecordListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得种植中心-农事基地-农事记录") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// +// public CommonResult getFarmingRecord(@RequestParam("id") String id) { +// FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); +// return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得种植中心-农事基地-农事记录分页") +// +// public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { +// PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); +// } +// +// @GetMapping("/export-excel") +// @Operation(summary = "导出种植中心-农事基地-农事记录 Excel") +// +// @ApiAccessLog(operateType = EXPORT) +// public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class, +// BeanUtils.toBean(list, FarmingRecordRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java index 61e28847..71d7ce7e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import cn.idev.excel.annotation.*; -import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; @Schema(description = "管理后台 - 种植中心-农事基地-农事记录 Response VO") @Data @@ -45,6 +45,8 @@ public class FarmingRecordRespVO { @Schema(description = "执行人") @ExcelProperty("执行人") private List executor; + @Schema(description = "临时工姓名") + private String dayLaborer; @Schema(description = "实际用工") @ExcelProperty("实际用工") @@ -86,10 +88,29 @@ public class FarmingRecordRespVO { private String tenantId; @Schema(description = "投入品列表") - private List investGoodsList; + private List investGoodsList; @Schema(description = "创建时间") @ExcelProperty("创建时间") private LocalDateTime createTime; + @Data + public static class FarmingRecordInputVO{ + private String id; + @Schema(description = "投入品名称") + private String inputsId; + @Schema(description = "投入品类型") + private String assetType; + @Schema(description = "用量") + private BigDecimal dose; + @Schema(description = "单位") + private Integer unit; + @Schema(description = "单件") + private Integer packageUnit; + @Schema(description = "稀释倍液") + private Integer diluted; + @Schema(description = "用法") + private String usage; + } + } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/BaseInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/BaseInfoController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java index e73fc344..d84a6e2c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/BaseInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.wx.BaseInfoForWxRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.BaseInfoForWxRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.*; import org.springframework.web.bind.annotation.*; import jakarta.validation.Valid; import jakarta.servlet.http.HttpServletResponse; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/GridInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/GridInfoController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java index 18585b94..313a22c6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/GridInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java @@ -1,5 +1,8 @@ -package cn.iocoder.yudao.module.farm.controller.admin.gridinfo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoSaveReqVO; 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.gridinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; import cn.iocoder.yudao.module.farm.service.gridinfo.GridInfoService; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/PlotInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/PlotInfoController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java index 73bdb58c..750fa09c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/PlotInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.farm.controller.admin.plotinfo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.wx.RegularPlotInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.RegularPlotInfoRespVO; import org.springframework.web.bind.annotation.*; import jakarta.validation.Valid; import jakarta.servlet.http.HttpServletResponse; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseAndPlotNamesRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseAndPlotNamesRespVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseAndPlotNamesRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseAndPlotNamesRespVO.java index c3da3eda..2b8a031c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseAndPlotNamesRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseAndPlotNamesRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/BaseInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoPageReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoPageReqVO.java index a8bcb433..3e8aa3cf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java similarity index 97% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java index ec3d44f1..20a1cd39 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/BaseInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoSaveReqVO.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoSaveReqVO.java index e6d34042..c1616d0a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/BaseNamePlanRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamePlanRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamePlanRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamePlanRespVO.java index 813cbce7..6ef7f8fc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamePlanRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamePlanRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNameRespVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNameRespVO.java index 808c1909..3371960a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNameRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/BaseNamesRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamesRespVO.java similarity index 77% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamesRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamesRespVO.java index 051d9343..77f8d002 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamesRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamesRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseOverviewRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseOverviewRespVO.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseOverviewRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseOverviewRespVO.java index a5932d9e..d9ad8003 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseOverviewRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseOverviewRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/gridinfo/vo/GridInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoPageReqVO.java index 427fa5ef..6673e40e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo; import lombok.*; import java.util.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoRespVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoRespVO.java index 49ff2c2a..47045b13 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/gridinfo/vo/GridInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoSaveReqVO.java index 2bf00979..c110eea6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/plotinfo/vo/PlotInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoPageReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoPageReqVO.java index 098c4c96..03a888ac 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoRespVO.java index 411d5144..2debccf2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/plotinfo/vo/PlotInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoSaveReqVO.java index dfb4d7ef..ea1fd96e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/TenantInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/TenantInfoRespVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/TenantInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/TenantInfoRespVO.java index 196b8f07..3a4fc318 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/TenantInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/TenantInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.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/baseinfo/vo/wx/BaseInfoForWxRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/BaseInfoForWxRespVO.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/wx/BaseInfoForWxRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/BaseInfoForWxRespVO.java index fa49f308..a68a8db6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/wx/BaseInfoForWxRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/BaseInfoForWxRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.wx; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx; 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/plotinfo/vo/wx/RegularPlotInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/RegularPlotInfoRespVO.java similarity index 86% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/wx/RegularPlotInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/RegularPlotInfoRespVO.java index 202df17c..960af9a9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/wx/RegularPlotInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/RegularPlotInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.wx; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx; 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/companyinfo/CompanyInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java similarity index 90% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/CompanyInfoController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java index d4a43b12..7800edb0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/CompanyInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.companyinfo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoSaveReqVO; 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/companyinfo/vo/CompanyInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoPageReqVO.java index 6a756954..578d6403 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoRespVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoRespVO.java index 8c1b3d0f..56b9658e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.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/companyinfo/vo/CompanyInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoSaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoSaveReqVO.java index d6e5239a..8f11c498 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.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/messagecenter/MessageCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java index 7f7bbe26..311c1868 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.messagecenter; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -6,10 +6,10 @@ 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.messagecenter.vo.MessageCenterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageStatisticsRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.module.farm.service.messagecenter.MessageCenterService; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterPageReqVO.java index ce44fb3e..60032ba4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterRespVO.java index f7f28633..ab1eb868 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.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/messagecenter/vo/MessageCenterSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterSaveReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterSaveReqVO.java index aa4b28c8..13ecaed8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.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/messagecenter/vo/MessageStatisticsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageStatisticsRespVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageStatisticsRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageStatisticsRespVO.java index 6c9c0a5b..f0dd76b4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageStatisticsRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageStatisticsRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.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/modelcycle/ModelCycleController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/ModelCycleController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/ModelCycleController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/ModelCycleController.java index ec2e16b0..1294c6a2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/ModelCycleController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/ModelCycleController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelcycle; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCyclePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO; 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/modelcycle/vo/ModelCyclePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCyclePageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCyclePageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCyclePageReqVO.java index fb8905b9..48e64cd4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCyclePageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCyclePageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleRespVO.java similarity index 86% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleRespVO.java index 9f8fec05..a6e3d8f1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleRespVO.java @@ -1,11 +1,9 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleSaveReqVO.java index 77e83676..8bd2da98 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.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/modelenvironmentindex/ModelEnvironmentIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/ModelEnvironmentIndexController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/ModelEnvironmentIndexController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/ModelEnvironmentIndexController.java index b9f84eb4..84b021d1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/ModelEnvironmentIndexController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/ModelEnvironmentIndexController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; 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/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java index ad505dca..88a9e655 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java index 278c0173..102903a6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.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/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java index 94f78acc..1ffd4572 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.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/modelfarmingoperation/ModelFarmingOperationController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/ModelFarmingOperationController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/ModelFarmingOperationController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/ModelFarmingOperationController.java index 1a10f392..e807a56d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/ModelFarmingOperationController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/ModelFarmingOperationController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; 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/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java index 445d7f82..d63b1088 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.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/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java index 44957930..08ded5e9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.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/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java index d8da2c43..5b98848f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/ModelFarmingOperationInputController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/ModelFarmingOperationInputController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/ModelFarmingOperationInputController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/ModelFarmingOperationInputController.java index 95b1179b..9fd66814 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/ModelFarmingOperationInputController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/ModelFarmingOperationInputController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java index 5574d9aa..c34178bf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java index 2548cc75..77cbe5a7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.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/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java index 8c94f26c..11b45423 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.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/modelpestdiseaseweed/ModelPestDiseaseWeedController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/ModelPestDiseaseWeedController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/ModelPestDiseaseWeedController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/ModelPestDiseaseWeedController.java index 28f48105..03f45450 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/ModelPestDiseaseWeedController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/ModelPestDiseaseWeedController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java index 399f7d8c..ec858787 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java index 12857e30..ac7a9f78 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java index a8179fe2..b2ef5802 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.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/modelmanagement/ModelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/ModelManagementController.java similarity index 92% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/ModelManagementController.java index 4bfbc02a..c29fad69 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/ModelManagementController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models; 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.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementForPlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementForPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.framework.util.ModelManagementConvertUtil; import cn.iocoder.yudao.module.farm.service.modelmanagement.ModelManagementService; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementForPlanRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementForPlanRespVO.java similarity index 86% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementForPlanRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementForPlanRespVO.java index ea1d41a5..bd871977 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementForPlanRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementForPlanRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.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/modelmanagement/vo/ModelManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementPageReqVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementPageReqVO.java index 8bdf20ad..4ba295d1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.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/modelmanagement/vo/ModelManagementRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementRespVO.java index 97797c00..e6283c7a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementRespVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO; 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/modelmanagement/vo/ModelManagementSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementSaveReqVO.java similarity index 96% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementSaveReqVO.java index a0d0af6e..4f9390fc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.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/modelweatherdisaster/ModelWeatherDisasterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/ModelWeatherDisasterController.java similarity index 89% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/ModelWeatherDisasterController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/ModelWeatherDisasterController.java index 195fb559..24af8c0d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/ModelWeatherDisasterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/ModelWeatherDisasterController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; 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/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java index eb5eaad2..537aa8bf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java index d55c8780..29ebb497 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.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/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java index 324d9464..54d1e371 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.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/personnelmanagement/PersonnelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java index a1d07510..17e4fa81 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement; 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.personnelmanagement.vo.PersonnelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagementService; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementPageReqVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementPageReqVO.java index 469e1937..7950fa96 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo; import lombok.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementRespVO.java similarity index 95% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementRespVO.java index bec21004..d4c719ff 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.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/personnelmanagement/vo/PersonnelManagementSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementSaveReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementSaveReqVO.java index 1acc90ce..a12ed03e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; +package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.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/pestdiseaseweedlibrary/PestDiseaseWeedLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/PestDiseaseWeedLibraryController.java index 3b7f66b2..ac037652 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/PestDiseaseWeedLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/PestDiseaseWeedLibraryController.java @@ -33,76 +33,76 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO; import cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary.PestDiseaseWeedLibraryService; -@Tag(name = "管理后台 - 病虫草害库维护") -@RestController -@RequestMapping("/farm/pest-disease-weed-library") -@Validated +//@Tag(name = "管理后台 - 病虫草害库维护") +//@RestController +//@RequestMapping("/farm/pest-disease-weed-library") +//@Validated public class PestDiseaseWeedLibraryController { - @Resource - private PestDiseaseWeedLibraryService pestDiseaseWeedLibraryService; - - @PostMapping("/create") - @Operation(summary = "创建病虫草害库维护") - - public CommonResult createPestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO createReqVO) { - return success(pestDiseaseWeedLibraryService.createPestDiseaseWeedLibrary(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新病虫草害库维护") - - public CommonResult updatePestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO updateReqVO) { - pestDiseaseWeedLibraryService.updatePestDiseaseWeedLibrary(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除病虫草害库维护") - @Parameter(name = "id", description = "编号", required = true) - - public CommonResult deletePestDiseaseWeedLibrary(@RequestParam("id") String id) { - pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibrary(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除病虫草害库维护") - - public CommonResult deletePestDiseaseWeedLibraryList(@RequestParam("ids") List ids) { - pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibraryListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得病虫草害库维护") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - - public CommonResult getPestDiseaseWeedLibrary(@RequestParam("id") String id) { - PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibrary(id); - return success(BeanUtils.toBean(pestDiseaseWeedLibrary, PestDiseaseWeedLibraryRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得病虫草害库维护分页") - - public CommonResult> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) { - PageResult pageResult = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PestDiseaseWeedLibraryRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出病虫草害库维护 Excel") - - @ApiAccessLog(operateType = EXPORT) - public void exportPestDiseaseWeedLibraryExcel(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "病虫草害库维护.xls", "数据", PestDiseaseWeedLibraryRespVO.class, - BeanUtils.toBean(list, PestDiseaseWeedLibraryRespVO.class)); - } +// @Resource +// private PestDiseaseWeedLibraryService pestDiseaseWeedLibraryService; +// +// @PostMapping("/create") +// @Operation(summary = "创建病虫草害库维护") +// +// public CommonResult createPestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO createReqVO) { +// return success(pestDiseaseWeedLibraryService.createPestDiseaseWeedLibrary(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新病虫草害库维护") +// +// public CommonResult updatePestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO updateReqVO) { +// pestDiseaseWeedLibraryService.updatePestDiseaseWeedLibrary(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除病虫草害库维护") +// @Parameter(name = "id", description = "编号", required = true) +// +// public CommonResult deletePestDiseaseWeedLibrary(@RequestParam("id") String id) { +// pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibrary(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除病虫草害库维护") +// +// public CommonResult deletePestDiseaseWeedLibraryList(@RequestParam("ids") List ids) { +// pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibraryListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得病虫草害库维护") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// +// public CommonResult getPestDiseaseWeedLibrary(@RequestParam("id") String id) { +// PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibrary(id); +// return success(BeanUtils.toBean(pestDiseaseWeedLibrary, PestDiseaseWeedLibraryRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得病虫草害库维护分页") +// +// public CommonResult> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) { +// PageResult pageResult = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, PestDiseaseWeedLibraryRespVO.class)); +// } +// +// @GetMapping("/export-excel") +// @Operation(summary = "导出病虫草害库维护 Excel") +// +// @ApiAccessLog(operateType = EXPORT) +// public void exportPestDiseaseWeedLibraryExcel(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "病虫草害库维护.xls", "数据", PestDiseaseWeedLibraryRespVO.class, +// BeanUtils.toBean(list, PestDiseaseWeedLibraryRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java index 7f0c11d2..94de4286 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java @@ -31,75 +31,75 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; -@Tag(name = "管理后台 - 种植中心-生产计划-生产计划") -@RestController -@RequestMapping("/farm/production-plan") -@Validated +//@Tag(name = "种植中心-生产计划") +//@RestController +//@RequestMapping("/farm/production-plan") +//@Validated public class ProductionPlanController { - @Resource - private ProductionPlanService productionPlanService; - - @PostMapping("/create") - @Operation(summary = "创建种植中心-生产计划-生产计划") - - public CommonResult createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) { - return success(productionPlanService.createProductionPlan(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新种植中心-生产计划-生产计划") - - public CommonResult updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) { - productionPlanService.updateProductionPlan(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除种植中心-生产计划-生产计划") - @Parameter(name = "id", description = "编号", required = true) - - public CommonResult deleteProductionPlan(@RequestParam("id") String id) { - productionPlanService.deleteProductionPlan(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除种植中心-生产计划-生产计划") - - public CommonResult deleteProductionPlanList(@RequestParam("ids") List ids) { - productionPlanService.deleteProductionPlanListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得种植中心-生产计划-生产计划") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - - public CommonResult getProductionPlan(@RequestParam("id") String id) { - ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id); - return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得种植中心-生产计划-生产计划分页") - public CommonResult> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) { - PageResult pageResult = productionPlanService.getProductionPlanPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出种植中心-生产计划-生产计划 Excel") - - @ApiAccessLog(operateType = EXPORT) - public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = productionPlanService.getProductionPlanPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "种植中心-生产计划-生产计划.xls", "数据", ProductionPlanRespVO.class, - BeanUtils.toBean(list, ProductionPlanRespVO.class)); - } +// @Resource +// private ProductionPlanService productionPlanService; +// +// @PostMapping("/create") +// @Operation(summary = "创建种植中心-生产计划-生产计划") +// +// public CommonResult createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) { +// return success(productionPlanService.createProductionPlan(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新种植中心-生产计划-生产计划") +// +// public CommonResult updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) { +// productionPlanService.updateProductionPlan(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除种植中心-生产计划-生产计划") +// @Parameter(name = "id", description = "编号", required = true) +// +// public CommonResult deleteProductionPlan(@RequestParam("id") String id) { +// productionPlanService.deleteProductionPlan(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除种植中心-生产计划-生产计划") +// +// public CommonResult deleteProductionPlanList(@RequestParam("ids") List ids) { +// productionPlanService.deleteProductionPlanListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得种植中心-生产计划-生产计划") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// +// public CommonResult getProductionPlan(@RequestParam("id") String id) { +// ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id); +// return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得种植中心-生产计划-生产计划分页") +// public CommonResult> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) { +// PageResult pageResult = productionPlanService.getProductionPlanPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class)); +// } +// +// @GetMapping("/export-excel") +// @Operation(summary = "导出种植中心-生产计划-生产计划 Excel") +// +// @ApiAccessLog(operateType = EXPORT) +// public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = productionPlanService.getProductionPlanPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "种植中心-生产计划-生产计划.xls", "数据", ProductionPlanRespVO.class, +// BeanUtils.toBean(list, ProductionPlanRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/TwoDictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/TwoDictController.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java index 3d10d3e1..62fdf206 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/TwoDictController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.twodict; +package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -8,7 +8,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,10 +24,10 @@ 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.twodict.vo.TwoDictPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictTreeRespVO; +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.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/twodict/vo/TwoDictPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java similarity index 93% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictPageReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java index 8fefa37c..560229c9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.twodict.vo; +package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; import lombok.*; import java.util.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java index 7d4a1804..b06a72ec 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.twodict.vo; +package cn.iocoder.yudao.module.farm.controller.admin.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/twodict/vo/TwoDictSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java similarity index 91% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictSaveReqVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java index c1931c67..2101749d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.twodict.vo; +package cn.iocoder.yudao.module.farm.controller.admin.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/twodict/vo/TwoDictTreeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java similarity index 94% rename from yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictTreeRespVO.java rename to yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java index 3ecfc6b2..ca7a0e99 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/vo/TwoDictTreeRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.farm.controller.admin.twodict.vo; +package cn.iocoder.yudao.module.farm.controller.admin.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/weatherdisasterlibrary/WeatherDisasterLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java index 275119fe..963af043 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java @@ -33,76 +33,76 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; import cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary.WeatherDisasterLibraryService; -@Tag(name = "管理后台 - 气象灾害库维护") -@RestController -@RequestMapping("/farm/weather-disaster-library") -@Validated +//@Tag(name = "管理后台 - 气象灾害库维护") +//@RestController +//@RequestMapping("/farm/weather-disaster-library") +//@Validated public class WeatherDisasterLibraryController { - @Resource - private WeatherDisasterLibraryService weatherDisasterLibraryService; - - @PostMapping("/create") - @Operation(summary = "创建气象灾害库维护") - - public CommonResult createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) { - return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新气象灾害库维护") - - public CommonResult updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) { - weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除气象灾害库维护") - @Parameter(name = "id", description = "编号", required = true) - - public CommonResult deleteWeatherDisasterLibrary(@RequestParam("id") String id) { - weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除气象灾害库维护") - - public CommonResult deleteWeatherDisasterLibraryList(@RequestParam("ids") List ids) { - weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得气象灾害库维护") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - - public CommonResult getWeatherDisasterLibrary(@RequestParam("id") String id) { - WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id); - return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得气象灾害库维护分页") - - public CommonResult> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) { - PageResult pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出气象灾害库维护 Excel") - - @ApiAccessLog(operateType = EXPORT) - public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "气象灾害库维护.xls", "数据", WeatherDisasterLibraryRespVO.class, - BeanUtils.toBean(list, WeatherDisasterLibraryRespVO.class)); - } +// @Resource +// private WeatherDisasterLibraryService weatherDisasterLibraryService; +// +// @PostMapping("/create") +// @Operation(summary = "创建气象灾害库维护") +// +// public CommonResult createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) { +// return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新气象灾害库维护") +// +// public CommonResult updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) { +// weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除气象灾害库维护") +// @Parameter(name = "id", description = "编号", required = true) +// +// public CommonResult deleteWeatherDisasterLibrary(@RequestParam("id") String id) { +// weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除气象灾害库维护") +// +// public CommonResult deleteWeatherDisasterLibraryList(@RequestParam("ids") List ids) { +// weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得气象灾害库维护") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// +// public CommonResult getWeatherDisasterLibrary(@RequestParam("id") String id) { +// WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id); +// return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得气象灾害库维护分页") +// +// public CommonResult> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) { +// PageResult pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class)); +// } +// +// @GetMapping("/export-excel") +// @Operation(summary = "导出气象灾害库维护 Excel") +// +// @ApiAccessLog(operateType = EXPORT) +// public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "气象灾害库维护.xls", "数据", WeatherDisasterLibraryRespVO.class, +// BeanUtils.toBean(list, WeatherDisasterLibraryRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/baseinfo/BaseInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/baseinfo/BaseInfoMapper.java index 889c96ef..6528538b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/baseinfo/BaseInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/baseinfo/BaseInfoMapper.java @@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.farm.dal.mysql.baseinfo; 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.baseinfo.vo.BaseInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -33,4 +34,5 @@ public interface BaseInfoMapper extends BaseMapperX { BigDecimal getTotalBaseArea(@Param("id") String id, @Param("tenantId") Long tenantId); + BaseStatisticsInfoRespVO getBaseStatisticsInfo(@Param("baseId") String baseId); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/companyinfo/CompanyInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/companyinfo/CompanyInfoMapper.java index 064468cd..9b61a758 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/companyinfo/CompanyInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/companyinfo/CompanyInfoMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.companyinfo; 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.companyinfo.vo.CompanyInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java index 69d67087..ec55c000 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java @@ -34,7 +34,7 @@ public interface FarmingRecordMapper extends BaseMapperX { .likeIfPresent(FarmingRecordDO::getPlotName, reqVO.getPlotName()) .eqIfPresent(FarmingRecordDO::getTenantId, reqVO.getTenantId()) .betweenIfPresent(FarmingRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(FarmingRecordDO::getCreateTime)); + .orderByDesc(FarmingRecordDO::getTaskTime)); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/gridinfo/GridInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/gridinfo/GridInfoMapper.java index c42e4628..e2d4c530 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/gridinfo/GridInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/gridinfo/GridInfoMapper.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.farm.dal.mysql.gridinfo; 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.baseinfo.vo.GridInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo.*; /** * 网格 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/messagecenter/MessageCenterMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/messagecenter/MessageCenterMapper.java index 60e17503..3a26e674 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/messagecenter/MessageCenterMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/messagecenter/MessageCenterMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.messagecenter; 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.messagecenter.vo.MessageCenterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; 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/modelcycle/ModelCycleMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelcycle/ModelCycleMapper.java index cc37bed9..2d054964 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelcycle/ModelCycleMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelcycle/ModelCycleMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelcycle; 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.modelcycle.vo.ModelCyclePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCyclePageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelenvironmentindex/ModelEnvironmentIndexMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelenvironmentindex/ModelEnvironmentIndexMapper.java index 1b6534bb..1d4441ed 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelenvironmentindex/ModelEnvironmentIndexMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelenvironmentindex/ModelEnvironmentIndexMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex; 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.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperation/ModelFarmingOperationMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperation/ModelFarmingOperationMapper.java index 3e781a56..675099e4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperation/ModelFarmingOperationMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperation/ModelFarmingOperationMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation; 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.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperationinput/ModelFarmingOperationInputMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperationinput/ModelFarmingOperationInputMapper.java index 05c393e9..002b64c6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperationinput/ModelFarmingOperationInputMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelfarmingoperationinput/ModelFarmingOperationInputMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput; 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.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java index 317f8d8f..c8b7de12 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java @@ -3,11 +3,8 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement; 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.MPJLambdaWrapperX; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.java index 0f962f83..4ae39357 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed; 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.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelweatherdisaster/ModelWeatherDisasterMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelweatherdisaster/ModelWeatherDisasterMapper.java index 5f581065..54c73453 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelweatherdisaster/ModelWeatherDisasterMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelweatherdisaster/ModelWeatherDisasterMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster; 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.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/PersonnelManagementMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/PersonnelManagementMapper.java index 0bd6a3f6..c7a06849 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/PersonnelManagementMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/PersonnelManagementMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement; 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.personnelmanagement.vo.PersonnelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/plotinfo/PlotInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/plotinfo/PlotInfoMapper.java index a4f275f5..b5d4bb85 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/plotinfo/PlotInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/plotinfo/PlotInfoMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.plotinfo; 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.plotinfo.vo.PlotInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java index fce89e6e..712fa5b0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java @@ -5,8 +5,8 @@ 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.api.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.ProductionPlanPage2ReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.ProductionPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanPage2ReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanRespVO; import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; 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 7e43cf1f..bdf0b85d 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,9 +5,9 @@ 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.dal.dataobject.twodict.TwoDictDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.*; /** * 二级字典 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java index 37cdfa19..730e8f46 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java @@ -27,9 +27,18 @@ public class CommonConstants { public final static Integer LIFE_CYCLE_NAME_1 = 1; public final static Integer LIFE_CYCLE_NAME_2 = 10; + public final static Integer DEVICE_STATE_0 = 0; // 未激活 + public final static Integer DEVICE_STATE_1 = 1; // 在线 + public final static Integer DEVICE_STATE_2 = 2; // 离线 + public final static Integer DEVICE_STATE_3 = 3; // 维护中 + public final static Integer DEVICE_STATE_4 = 4; // 故障 + + public static Map PLAN_MAP = new HashMap<>(); public static Map LIFE_CYCLE_MAP = new HashMap<>(); public static Map GRID_TYPE = new HashMap<>(); + public static Map DEVICE_STATE_MAP = new HashMap<>(); + public static Map BINDING_STATE_MAP = new HashMap<>(); static { PLAN_MAP.put(PLAN_STATUS_1, "未开始"); @@ -46,6 +55,15 @@ public class CommonConstants { GRID_TYPE.put("1", "养殖类型"); GRID_TYPE.put("2", "水产类型"); + + DEVICE_STATE_MAP.put(DEVICE_STATE_0,"未激活"); + DEVICE_STATE_MAP.put(DEVICE_STATE_1,"在线"); + DEVICE_STATE_MAP.put(DEVICE_STATE_2,"离线"); + DEVICE_STATE_MAP.put(DEVICE_STATE_3,"维护中"); + DEVICE_STATE_MAP.put(DEVICE_STATE_4,"故障"); + + BINDING_STATE_MAP.put(0,"未绑定"); + BINDING_STATE_MAP.put(1,"已绑定"); } // 模型类型 （1：模型模板； 2：引用案例） @@ -73,18 +91,13 @@ public class CommonConstants { public final static Boolean DHTMLX_GANTT_OPEN_TRUE = true; public final static Boolean DHTMLX_GANTT_OPEN_FALSE = false; - public final static String GROW_FLAG_1 = "在种"; public final static String GROW_FLAG_2 = "空闲"; - public final static Integer FARMING_RECORD_STATUS_1 = 1;//开始 public final static Integer FARMING_RECORD_STATUS_2 = 2; // "结束"; public final static Integer FARM_MODEL_FARMING_OPERATION_USABLE_TYPE_1 = 1; // 可用 public final static Integer FARM_MODEL_FARMING_OPERATION_USABLE_TYPE_2 = 2; // 不可用 - - - } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/ModelManagementConvertUtil.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/ModelManagementConvertUtil.java index a1d2607e..0a8e7a58 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/ModelManagementConvertUtil.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/ModelManagementConvertUtil.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.farm.framework.util; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import org.apache.commons.lang3.StringUtils; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java index 61e70d9c..11676a2b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/DeviceManager.java @@ -1,7 +1,16 @@ package cn.iocoder.yudao.module.farm.manager.devices; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceInfoDetailV2RespVO; +import cn.iocoder.yudao.module.farm.manager.devices.soil.SoilService; +import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.RealTimeDataReqVO; +import cn.iocoder.yudao.module.farm.manager.devices.soil.dto.RealTimeDataRespVO; +import cn.iocoder.yudao.module.farm.manager.devices.wf.WaterFertilizerService; import org.springframework.stereotype.Service; +import java.util.List; + +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; + /** * @description: 设备管理 * 参考文档: 物连网农业四情采集api协议.pdf 版本:v2.0.3 日期:2022.08.16 @@ -10,4 +19,42 @@ import org.springframework.stereotype.Service; */ @Service public class DeviceManager { + + private final SoilService soilService; + private final WaterFertilizerService waterFertilizerService; + + public DeviceManager(SoilService soilService, WaterFertilizerService waterFertilizerService) { + this.soilService = soilService; + this.waterFertilizerService = waterFertilizerService; + } + + public DeviceInfoDetailV2RespVO getRealData(String deviceUniqueId) { + DeviceInfoDetailV2RespVO.SoilInfo soilInfo = this.getSoilRealData(deviceUniqueId); + DeviceInfoDetailV2RespVO.WfInfo wfInfo = this.coverToWf(deviceUniqueId); + + return new DeviceInfoDetailV2RespVO(deviceUniqueId, soilInfo, wfInfo); + } + + public DeviceInfoDetailV2RespVO.SoilInfo getSoilRealData(String deviceUniqueId) { + String tenantId = String.valueOf(getLoginUser().getTenantId()); + if (!soilService.validateUserToken(tenantId)) { + soilService.userLogin(); + } + List realTimeData = soilService.getRealTimeData(new RealTimeDataReqVO(deviceUniqueId)); +// soilService.getHistoryDataList(); + + return null; + } + + + + public DeviceInfoDetailV2RespVO.WfInfo coverToWf(String deviceUniqueId) { + String tenantId = String.valueOf(getLoginUser().getTenantId()); + + + + return null; + } + + } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/SoilService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/SoilService.java index 20780c0c..cbb3e518 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/SoilService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/SoilService.java @@ -35,6 +35,13 @@ public class SoilService extends BaseTokenCacheService { private final String SOIL = "soil_"; + public void userLogin() { + String username = deviceConf.getFourSituations().getUsername(); + String password = deviceConf.getFourSituations().getPassword(); + + this.userLogin(new UserLoginReqVO(username,password)); + } + /** * 登录获取token * @@ -129,7 +136,7 @@ public class SoilService extends BaseTokenCacheService { } /** - * 设备报请通知记录 + * 设备报警通知记录 */ public List getAlarmNoticeRecord(AlarmNoticeRecordReqVO req) { @@ -187,6 +194,8 @@ public class SoilService extends BaseTokenCacheService { */ public HistoryDataListPageRespVO getHistoryDataList(HistoryDataListPageReqVO req) { + + return null; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/dto/HistoryDataListPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/dto/HistoryDataListPageReqVO.java index 578ce155..210182a4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/dto/HistoryDataListPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/manager/devices/soil/dto/HistoryDataListPageReqVO.java @@ -4,6 +4,10 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; + /** * @description: 墒情设备, 获取历史数据 请求实体 * @author: binda @@ -43,4 +47,63 @@ public class HistoryDataListPageReqVO { * 每页数量 */ private Integer limit; + + public HistoryDataListPageReqVO(String beginTime, String endTime) { + this.beginTime = beginTime; + this.endTime = endTime; + } + + + public static class HistoryDataTimeRangeUtil { + + /** + * 获取近12小时的时间范围 + */ + public static HistoryDataListPageReqVO getLast12Hours() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime startTime = endTime.minusHours(12); + + return buildRequestVO(startTime, endTime); + } + + /** + * 获取近一天的时间范围 + */ + public static HistoryDataListPageReqVO getLast24Hours() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime startTime = endTime.minusDays(1); + + return buildRequestVO(startTime, endTime); + } + + /** + * 获取近三天的时间范围 + */ + public static HistoryDataListPageReqVO getLast3Days() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime startTime = endTime.minusDays(3); + + return buildRequestVO(startTime, endTime); + } + + /** + * 获取近七天的时间范围 + */ + public static HistoryDataListPageReqVO getLast7Days() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime startTime = endTime.minusDays(7); + + return buildRequestVO(startTime, endTime); + } + + /** + * 构建请求VO对象 + */ + private static HistoryDataListPageReqVO buildRequestVO(LocalDateTime startTime, LocalDateTime endTime) { + String beginTimeStamp = String.valueOf(startTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + String endTimeStamp = String.valueOf(endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + + return new HistoryDataListPageReqVO(beginTimeStamp, endTimeStamp); + } + } } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java index bdae6cd5..df79519e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java @@ -6,8 +6,9 @@ import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseInfoReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseInfoRespVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseOverviewReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseOverviewRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.wx.BaseInfoForWxRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.BaseInfoForWxRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import jakarta.validation.Valid; @@ -113,4 +114,6 @@ public interface BaseInfoService { * @return */ List getBasePlotList(); + + BaseStatisticsInfoRespVO getBaseStatisticsInfo(String baseId); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index 5a916140..942160ac 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -10,8 +10,9 @@ import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseInfoReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseInfoRespVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseOverviewReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmBaseOverviewRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.wx.BaseInfoForWxRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.BaseInfoForWxRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; @@ -429,4 +430,9 @@ public class BaseInfoServiceImpl implements BaseInfoService { return b; }).toList(); } + + @Override + public BaseStatisticsInfoRespVO getBaseStatisticsInfo(String baseId) { + return baseInfoMapper.getBaseStatisticsInfo(baseId); + } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java index dec3e5bc..0a688717 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.farm.service.companyinfo; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java index 18196ad0..b665a588 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.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.companyinfo.vo.CompanyInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.dal.mysql.companyinfo.CompanyInfoMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java index 61b1063f..1829afbf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java @@ -1,7 +1,13 @@ package cn.iocoder.yudao.module.farm.service.cropFarmingCenter; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; +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.dal.dataobject.farmingrecord.FarmingRecordDO; +import jakarta.validation.Valid; /** * @description: 种植中心 @@ -41,4 +47,15 @@ public interface CropFarmingCenterService { BasePlanOverviewRespVO getBaseOverview(String baseId); FarmRecordOverviewRespVO getFarmRecordOverview(String baseId); + + + PageResult getFarmingRecordPage(FarmingRecordPageReqVO pageReqVO); + + FarmingRecordRespVO getFarmingRecord(String id); + + String createFarmingRecordNew(@Valid FarmingRecordCreateReqVO createReqVO); + + void updateFarmingRecord(@Valid FarmingRecordSaveReqVO updateReqVO); + + void deleteFarmingRecord(String id); } 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 00893079..a47f4472 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 @@ -4,13 +4,18 @@ 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.cropFarmingCenter.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; +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.modelcycle.vo.ModelCycleRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; +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; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; @@ -31,7 +36,6 @@ import cn.iocoder.yudao.module.farm.utils.StrHelperUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -542,4 +546,53 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { return new FarmRecordOverviewRespVO(BigDecimalUtil.roundedViaMath(totalArea), farmRecordCount); } + + @Override + public PageResult getFarmingRecordPage(FarmingRecordPageReqVO pageReqVO) { + PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); + return pageResult; + } + + @Override + public FarmingRecordRespVO getFarmingRecord(String id) { + FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); + + List list = new ArrayList<>(); + for (FarmingRecordInputDO fr : farmingRecord.getInvestGoodsList()) { + FarmingRecordRespVO.FarmingRecordInputVO target = new FarmingRecordRespVO.FarmingRecordInputVO(); + target.setId(fr.getId()); + target.setInputsId(fr.getInputChildCategory()); + target.setAssetType(fr.getInputParentCategory()); + target.setDose(fr.getDosage()); + target.setUsage(fr.getUsage()); + + int diluted = fr.getDilutionRatio() != null ? Integer.parseInt(fr.getDilutionRatio()) : 0; + target.setDiluted(diluted); + int packageUnit = fr.getSingleUseUnit() != null ? Integer.parseInt(fr.getSingleUseUnit()) : 0; + target.setPackageUnit(packageUnit); + int unit = fr.getSingleUseOption() != null ? Integer.parseInt(fr.getSingleUseOption()) : 0; + target.setUnit(unit); + list.add(target); + } + + FarmingRecordRespVO res = BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class); + res.setInvestGoodsList(list); + return res; + } + + @Override + public String createFarmingRecordNew(FarmingRecordCreateReqVO createReqVO) { + return farmingRecordService.createFarmingRecordNew(createReqVO); + } + + @Override + public void updateFarmingRecord(FarmingRecordSaveReqVO updateReqVO) { + farmingRecordService.updateFarmingRecord(updateReqVO); + } + + @Override + public void deleteFarmingRecord(String id) { + farmingRecordService.deleteFarmingRecord(id); + } + } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoService.java index dd1b06d5..9f0537f5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoService.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.service.deviceinfo; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceInfoDetailV2RespVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -54,6 +55,13 @@ public interface DeviceInfoService { */ DeviceInfoDO getDeviceInfo(String id); + /** + * 获取设备商 真实数据 + * @param id + * @return + */ + DeviceInfoDetailV2RespVO getDeviceRealTimeInfo(String id); + /** * 获得设备信息分页 * diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java index 1e89f16d..0474b2b5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceInfoDetailV2RespVO; import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.DeviceStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; @@ -11,6 +12,8 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.deviceclassify.DeviceClassifyMapper; import cn.iocoder.yudao.module.farm.dal.mysql.plotinfo.PlotInfoMapper; +import cn.iocoder.yudao.module.farm.enums.CommonConstants; +import cn.iocoder.yudao.module.farm.manager.devices.DeviceManager; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -24,6 +27,8 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.farm.dal.mysql.deviceinfo.DeviceInfoMapper; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; @@ -47,6 +52,8 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { private BaseInfoMapper baseInfoMapper; @Resource private PlotInfoMapper plotInfoMapper; + @Resource + private DeviceManager deviceManager; @Override public String createDeviceInfo(DeviceInfoSaveReqVO createReqVO) { @@ -61,6 +68,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { PlotInfoDO plotInfoDO = plotInfoMapper.selectOne(PlotInfoDO::getId, deviceInfo.getPlotId()); deviceInfo.setPlotName(plotInfoDO.getPlotName()); + deviceInfo.setBindingState(CommonConstants.YES_CODE); deviceInfoMapper.insert(deviceInfo); // 返回 @@ -85,12 +93,12 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } @Override - public void deleteDeviceInfoListByIds(List ids) { + public void deleteDeviceInfoListByIds(List ids) { // 删除 deviceInfoMapper.deleteByIds(ids); - } + } -private void validateDeviceInfoExists(String id) { + private void validateDeviceInfoExists(String id) { if (deviceInfoMapper.selectById(id) == null) { throw exception(DEVICE_INFO_NOT_EXISTS); } @@ -109,10 +117,27 @@ private void validateDeviceInfoExists(String id) { deviceInfo.setImage(dc.getImage()); deviceInfo.setImageList(dc.getImageList()); - // TODO: 2025/9/21 获取设备的实时/历史数据 return deviceInfo; } + @Override + public DeviceInfoDetailV2RespVO getDeviceRealTimeInfo(String id) { + + DeviceInfoDO deviceInfo = this.getDeviceInfo(id); + DeviceInfoDetailV2RespVO target = BeanUtils.toBean(deviceInfo, DeviceInfoDetailV2RespVO.class); + + List deviceClassifyDOS = deviceClassifyMapper.selectList(); + Map map = deviceClassifyDOS.stream() + .filter(device -> device.getParentId() != null && device.getParentId() == 0) + .collect(Collectors.toMap(e -> e.getId().toString(), DeviceClassifyDO::getName)); + + target.setDeviceTypeName(map.getOrDefault(target.getDeviceType(), "")); +// DeviceInfoDetailV2RespVO realData = deviceManager.getRealData(id); +// target.setSoilInfo(realData.getSoilInfo()); +// target.setWfInfo(realData.getWfInfo()); + return target; + } + @Override public PageResult getDeviceInfoPage(DeviceInfoPageReqVO pageReqVO) { PageResult pageResult = deviceInfoMapper.selectPage(pageReqVO); 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 7c015906..c0d903db 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 @@ -62,6 +62,10 @@ public class FarmingNameMaintenanceServiceImpl implements FarmingNameMaintenance validateFarmingNameMaintenanceExists(updateReqVO.getId()); // 更新 FarmingNameMaintenanceDO updateObj = BeanUtils.toBean(updateReqVO, FarmingNameMaintenanceDO.class); + FarmingTypeMaintenanceDO one = farmingTypeMaintenanceMapper.selectOne(FarmingTypeMaintenanceDO::getId, updateReqVO.getFarmingType()); + updateObj.setFarmingTypeName(one.getFarmingName()); + updateObj.setFarmingTypeCode(updateReqVO.getFarmingType()); + farmingNameMaintenanceMapper.updateById(updateObj); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java index fec9db0f..526d7c0e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java @@ -200,6 +200,12 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { input.setId(IdUtil.fastUUID()); input.setDosage(item.getDose()); input.setUsage(item.getUsage()); + input.setInputParentCategory(item.getAssetType()); // 投入品-父类 + input.setInputChildCategory(item.getInputsId()); // 投入品-子类 + input.setSingleUseOption(item.getUnit()); // 单位用量 + input.setSingleUseUnit(item.getPackageUnit()); // 单件单位 + input.setDilutionRatio(item.getDiluted()); // 稀释倍液 + input.setBaseId(createReqVO.getBaseId()); input.setBaseName(createReqVO.getBaseName()); input.setPlotId(createReqVO.getPlotId()); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoService.java index e020946b..ec4202c3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoService.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.service.gridinfo; import java.util.*; + +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoSaveReqVO; import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; 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/gridinfo/GridInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoServiceImpl.java index 454bf5d5..731be171 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/gridinfo/GridInfoServiceImpl.java @@ -1,24 +1,21 @@ package cn.iocoder.yudao.module.farm.service.gridinfo; -import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; 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.module.farm.dal.mysql.gridinfo.GridInfoMapper; 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.module.farm.enums.ErrorCodeConstants.*; /** diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterService.java index 2c0f3091..9c4512b7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.farm.service.messagecenter; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageStatisticsRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterServiceImpl.java index 53bbcc0f..fbfdcc25 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagecenter/MessageCenterServiceImpl.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.messagecenter.vo.MessageCenterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageStatisticsRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.module.farm.dal.mysql.messagecenter.MessageCenterMapper; import cn.iocoder.yudao.module.farm.enums.MessageTypeEnum; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagepush/FarmMessagePushServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagepush/FarmMessagePushServiceImpl.java index 3c0764e1..a7707c87 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagepush/FarmMessagePushServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/messagepush/FarmMessagePushServiceImpl.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.websocket.core.session.WebSocketSessionManager import cn.iocoder.yudao.framework.websocket.core.util.WebSocketFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.websocket.vo.FarmWebSocketMessageVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.module.farm.enums.AlarmStatusEnum; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleService.java index 913d8f48..43906ce9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleService.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.service.modelcycle; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCyclePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; 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/modelcycle/ModelCycleServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java index f8a55ebe..04c81838 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java @@ -1,17 +1,14 @@ package cn.iocoder.yudao.module.farm.service.modelcycle; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCyclePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleSaveReqVO; 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.modelcycle.ModelCycleDO; 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.MODEL_CYCLE_NOT_EXISTS; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexService.java index a5a7ef6a..091bdef5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.modelenvironmentindex; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; 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/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java index 8cefc7c0..10257f05 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.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.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationService.java index f7e12848..52edfe33 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationService.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperation; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; 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/modelfarmingoperation/ModelFarmingOperationServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java index 63cc08a4..01a1f8c1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.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.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation.ModelFarmingOperationMapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputService.java index db32eab0..09633c60 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperationinput; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; 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/modelfarmingoperationinput/ModelFarmingOperationInputServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputServiceImpl.java index 997cdfe5..2939dfa1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperationinput/ModelFarmingOperationInputServiceImpl.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.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFarmingOperationInputMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java index ef371e81..13169b09 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.farm.service.modelmanagement; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementForPlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementForPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java index 773a84c9..ce1f9dd5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java @@ -5,14 +5,13 @@ 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.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementForPlanRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO; +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.ModelManagementForPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedService.java index 1e544d4e..804f62a9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.modelpestdiseaseweed; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; 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/modelpestdiseaseweed/ModelPestDiseaseWeedServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedServiceImpl.java index 5078387e..eddb1b57 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelpestdiseaseweed/ModelPestDiseaseWeedServiceImpl.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.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterService.java index a4ace7b5..caffc904 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.farm.service.modelweatherdisaster; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; 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/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java index 5f903e35..4923c36d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java @@ -5,8 +5,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.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java index 5d05fcaa..4610dc95 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.farm.service.personnelmanagement; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import jakarta.validation.Valid; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java index aed25831..7ae53c6e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java @@ -5,8 +5,8 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 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.personnelmanagement.vo.PersonnelManagementPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserRoleDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoService.java index b88fc180..97cd38cc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.farm.service.plotinfo; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.wx.RegularPlotInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.RegularPlotInfoRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; 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/plotinfo/PlotInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java index 60e168c2..356bafbe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java @@ -5,9 +5,9 @@ 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.plotinfo.vo.PlotInfoPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.wx.RegularPlotInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.RegularPlotInfoRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; @@ -120,7 +120,9 @@ public class PlotInfoServiceImpl implements PlotInfoService { @Override public List getPlotInfos() { - return plotInfoMapper.selectList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PlotInfoDO::getTenantId, String.valueOf(getLoginUser().getTenantId())); + return plotInfoMapper.selectList(queryWrapper); } @Override diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java index 9fba8af9..334f0de3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.service.productionplan; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNamePlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO; import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java index a3fed8dc..1e4fa3a9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNamePlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO; import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; 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 e9423f25..c7346cde 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,15 +6,13 @@ 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.dict.vo.sys.SysDictReqVO; import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictTreeRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictTreeRespVO; 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; import cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement.ModelManagementMapper; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; -import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; import cn.iocoder.yudao.module.farm.dal.mysql.twodict.TwoDictMapper; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService; @@ -32,9 +30,7 @@ import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; -import static cn.iocoder.yudao.module.farm.enums.CommonConstants.DICT_TYPE_CODE_3; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.module.farm.utils.StrHelperUtil.generate; /** * 物种库维护 Service 实现类 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 27fb2936..663089f5 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 @@ -1,11 +1,13 @@ 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 jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO; 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/twodict/TwoDictServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/twodict/TwoDictServiceImpl.java index 48018869..f34c10e6 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.twodict.vo.TwoDictPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictSaveReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictTreeRespVO; +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.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/utils/TreeStructureUtil.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/utils/TreeStructureUtil.java index 4fdbc51a..ba1409b6 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.twodict.vo.TwoDictTreeRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.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/baseinfo/BaseInfoMapper.xml b/yudao-module-farm/src/main/resources/mapper/baseinfo/BaseInfoMapper.xml index 8a182833..86af3e9a 100644 --- a/yudao-module-farm/src/main/resources/mapper/baseinfo/BaseInfoMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/baseinfo/BaseInfoMapper.xml @@ -31,4 +31,20 @@ + + \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml index 7301589e..bda27661 100644 --- a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml @@ -25,7 +25,7 @@