From e75b5ae32585ff7fa47f7d15a1337997b7e215da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Thu, 14 Aug 2025 15:01:49 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=A9=BA=E5=8C=85=E5=BC=95=E5=85=A5=EF=BC=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/baseinfo/BaseInfoController.java | 25 ++++---- .../admin/baseinfo/vo/BaseInfoPageReqVO.java | 2 +- .../admin/baseinfo/vo/BaseInfoRespVO.java | 2 +- .../admin/baseinfo/vo/BaseInfoSaveReqVO.java | 3 +- .../companyinfo/CompanyInfoController.java | 25 ++++---- .../companyinfo/vo/CompanyInfoPageReqVO.java | 2 +- .../companyinfo/vo/CompanyInfoRespVO.java | 2 +- .../companyinfo/vo/CompanyInfoSaveReqVO.java | 2 - .../CultivationAreaController.java | 25 ++++---- .../vo/CultivationAreaPageReqVO.java | 2 +- .../vo/CultivationAreaRespVO.java | 2 +- .../vo/CultivationAreaSaveReqVO.java | 3 +- .../deviceinfo/DeviceInfoController.java | 25 ++++---- .../deviceinfo/vo/DeviceInfoPageReqVO.java | 2 +- .../admin/deviceinfo/vo/DeviceInfoRespVO.java | 2 +- .../deviceinfo/vo/DeviceInfoSaveReqVO.java | 5 +- .../DevicePlotRelationController.java | 25 ++++---- .../vo/DevicePlotRelationPageReqVO.java | 2 +- .../vo/DevicePlotRelationRespVO.java | 2 +- .../vo/DevicePlotRelationSaveReqVO.java | 2 - .../disasterdata/DisasterDataController.java | 25 ++++---- .../vo/DisasterDataPageReqVO.java | 2 +- .../disasterdata/vo/DisasterDataRespVO.java | 2 +- .../vo/DisasterDataSaveReqVO.java | 2 - .../EnvironmentIndexConfigController.java | 25 ++++---- .../vo/EnvironmentIndexConfigPageReqVO.java | 2 +- .../vo/EnvironmentIndexConfigRespVO.java | 2 +- .../vo/EnvironmentIndexConfigSaveReqVO.java | 2 - .../FarmingNameMaintenanceController.java | 59 +++++++++-------- .../vo/FarmingNameMaintenancePageReqVO.java | 2 +- .../vo/FarmingNameMaintenanceRespVO.java | 2 +- .../vo/FarmingNameMaintenanceSaveReqVO.java | 2 - .../FarmingRecordController.java | 61 +++++++++--------- .../vo/FarmingRecordPageReqVO.java | 2 +- .../farmingrecord/vo/FarmingRecordRespVO.java | 2 +- .../vo/FarmingRecordSaveReqVO.java | 3 +- .../FarmingRecordInputController.java | 64 ++++++++++--------- .../vo/FarmingRecordInputPageReqVO.java | 2 +- .../vo/FarmingRecordInputRespVO.java | 2 +- .../vo/FarmingRecordInputSaveReqVO.java | 3 +- .../FarmingTypeMaintenanceController.java | 64 ++++++++++--------- .../vo/FarmingTypeMaintenancePageReqVO.java | 2 +- .../vo/FarmingTypeMaintenanceRespVO.java | 2 +- .../vo/FarmingTypeMaintenanceSaveReqVO.java | 2 - .../FertilizerIndexController.java | 32 +++++----- .../vo/FertilizerIndexPageReqVO.java | 2 +- .../vo/FertilizerIndexRespVO.java | 2 +- .../vo/FertilizerIndexSaveReqVO.java | 2 - .../FoundationInfoController.java | 32 ++++++---- .../vo/FoundationInfoPageReqVO.java | 2 +- .../vo/FoundationInfoRespVO.java | 2 +- .../vo/FoundationInfoSaveReqVO.java | 2 - .../inputlibrary/InputLibraryController.java | 32 ++++++---- .../vo/InputLibraryPageReqVO.java | 2 +- .../inputlibrary/vo/InputLibraryRespVO.java | 2 +- .../vo/InputLibrarySaveReqVO.java | 3 +- .../MessageCenterController.java | 32 ++++++---- .../vo/MessageCenterPageReqVO.java | 2 +- .../messagecenter/vo/MessageCenterRespVO.java | 4 +- .../vo/MessageCenterSaveReqVO.java | 3 +- .../modelcycle/ModelCycleController.java | 32 ++++++---- .../modelcycle/vo/ModelCyclePageReqVO.java | 2 +- .../admin/modelcycle/vo/ModelCycleRespVO.java | 2 +- .../modelcycle/vo/ModelCycleSaveReqVO.java | 2 - .../ModelEnvironmentIndexController.java | 32 ++++++---- .../vo/ModelEnvironmentIndexPageReqVO.java | 2 +- .../vo/ModelEnvironmentIndexRespVO.java | 2 +- .../vo/ModelEnvironmentIndexSaveReqVO.java | 3 +- .../ModelFarmingOperationController.java | 32 ++++++---- .../vo/ModelFarmingOperationPageReqVO.java | 2 +- .../vo/ModelFarmingOperationRespVO.java | 2 +- .../vo/ModelFarmingOperationSaveReqVO.java | 2 - .../ModelFarmingOperationInputController.java | 32 ++++++---- .../ModelFarmingOperationInputPageReqVO.java | 2 +- .../vo/ModelFarmingOperationInputRespVO.java | 2 +- .../ModelFarmingOperationInputSaveReqVO.java | 3 +- .../ModelPestDiseaseWeedController.java | 32 ++++++---- .../vo/ModelPestDiseaseWeedPageReqVO.java | 2 +- .../vo/ModelPestDiseaseWeedRespVO.java | 2 +- .../vo/ModelPestDiseaseWeedSaveReqVO.java | 2 - .../ModelWeatherDisasterController.java | 32 ++++++---- .../vo/ModelWeatherDisasterPageReqVO.java | 2 +- .../vo/ModelWeatherDisasterRespVO.java | 2 +- .../vo/ModelWeatherDisasterSaveReqVO.java | 2 - .../PersonnelManagementController.java | 32 ++++++---- .../vo/PersonnelManagementPageReqVO.java | 2 +- .../vo/PersonnelManagementRespVO.java | 2 +- .../vo/PersonnelManagementSaveReqVO.java | 2 - .../PestDiseaseWeedLibraryController.java | 32 ++++++---- .../vo/PestDiseaseWeedLibraryPageReqVO.java | 2 +- .../vo/PestDiseaseWeedLibraryRespVO.java | 4 +- .../vo/PestDiseaseWeedLibrarySaveReqVO.java | 2 - .../PesticideResidueIndexController.java | 32 ++++++---- .../vo/PesticideResidueIndexPageReqVO.java | 2 +- .../vo/PesticideResidueIndexRespVO.java | 4 +- .../vo/PesticideResidueIndexSaveReqVO.java | 2 - .../admin/plotinfo/PlotInfoController.java | 32 ++++++---- .../admin/plotinfo/vo/PlotInfoPageReqVO.java | 2 +- .../admin/plotinfo/vo/PlotInfoRespVO.java | 4 +- .../admin/plotinfo/vo/PlotInfoSaveReqVO.java | 3 +- .../ProductionPlanController.java | 32 ++++++---- .../vo/ProductionPlanPageReqVO.java | 2 +- .../vo/ProductionPlanRespVO.java | 4 +- .../vo/ProductionPlanSaveReqVO.java | 2 - .../ProductManagementController.java | 32 ++++++---- .../vo/ProductManagementPageReqVO.java | 2 +- .../vo/ProductManagementRespVO.java | 4 +- .../vo/ProductManagementSaveReqVO.java | 2 - .../SpeciesLibraryController.java | 32 ++++++---- .../vo/SpeciesLibraryPageReqVO.java | 2 +- .../vo/SpeciesLibraryRespVO.java | 4 +- .../vo/SpeciesLibrarySaveReqVO.java | 2 - .../varietydata/VarietyDataController.java | 32 ++++++---- .../varietydata/vo/VarietyDataPageReqVO.java | 2 +- .../varietydata/vo/VarietyDataRespVO.java | 4 +- .../varietydata/vo/VarietyDataSaveReqVO.java | 3 +- .../WeatherDisasterLibraryController.java | 32 ++++++---- .../vo/WeatherDisasterLibraryPageReqVO.java | 2 +- .../vo/WeatherDisasterLibraryRespVO.java | 4 +- .../vo/WeatherDisasterLibrarySaveReqVO.java | 2 - .../dal/dataobject/baseinfo/BaseInfoDO.java | 4 +- .../dataobject/companyinfo/CompanyInfoDO.java | 4 +- .../cultivationarea/CultivationAreaDO.java | 4 +- .../dataobject/deviceinfo/DeviceInfoDO.java | 7 +- .../DevicePlotRelationDO.java | 4 +- .../disasterdata/DisasterDataDO.java | 4 +- .../EnvironmentIndexConfigDO.java | 4 +- .../FarmingNameMaintenanceDO.java | 3 +- .../farmingrecord/FarmingRecordDO.java | 4 +- .../FarmingRecordInputDO.java | 4 +- .../FarmingTypeMaintenanceDO.java | 4 +- .../fertilizerindex/FertilizerIndexDO.java | 4 +- .../foundationinfo/FoundationInfoDO.java | 4 +- .../inputlibrary/InputLibraryDO.java | 4 +- .../messagecenter/MessageCenterDO.java | 4 +- .../dataobject/modelcycle/ModelCycleDO.java | 4 +- .../ModelEnvironmentIndexDO.java | 4 +- .../ModelFarmingOperationDO.java | 4 +- .../ModelFarmingOperationInputDO.java | 4 +- .../ModelPestDiseaseWeedDO.java | 4 +- .../ModelWeatherDisasterDO.java | 4 +- .../PersonnelManagementDO.java | 4 +- .../PestDiseaseWeedLibraryDO.java | 4 +- .../PesticideResidueIndexDO.java | 4 +- .../dal/dataobject/plotinfo/PlotInfoDO.java | 4 +- .../productionplan/ProductionPlanDO.java | 4 +- .../ProductManagementDO.java | 3 +- .../specieslibrary/SpeciesLibraryDO.java | 4 +- .../dataobject/varietydata/VarietyDataDO.java | 3 +- .../WeatherDisasterLibraryDO.java | 3 +- .../dal/mysql/baseinfo/BaseInfoMapper.java | 4 +- .../mysql/companyinfo/CompanyInfoMapper.java | 4 +- .../CultivationAreaMapper.java | 4 +- .../mysql/deviceinfo/DeviceInfoMapper.java | 4 +- .../DevicePlotRelationMapper.java | 4 +- .../disasterdata/DisasterDataMapper.java | 4 +- .../EnvironmentIndexConfigMapper.java | 4 +- .../FarmingNameMaintenanceMapper.java | 4 +- .../farmingrecord/FarmingRecordMapper.java | 4 +- .../FarmingRecordInputMapper.java | 4 +- .../FarmingTypeMaintenanceMapper.java | 4 +- .../FertilizerIndexMapper.java | 4 +- .../foundationinfo/FoundationInfoMapper.java | 4 +- .../inputlibrary/InputLibraryMapper.java | 4 +- .../messagecenter/MessageCenterMapper.java | 4 +- .../mysql/modelcycle/ModelCycleMapper.java | 4 +- .../ModelEnvironmentIndexMapper.java | 4 +- .../ModelFarmingOperationMapper.java | 4 +- .../ModelFarmingOperationInputMapper.java | 4 +- .../ModelPestDiseaseWeedMapper.java | 4 +- .../ModelWeatherDisasterMapper.java | 4 +- .../PersonnelManagementMapper.java | 4 +- .../PestDiseaseWeedLibraryMapper.java | 4 +- .../PesticideResidueIndexMapper.java | 4 +- .../dal/mysql/plotinfo/PlotInfoMapper.java | 4 +- .../productionplan/ProductionPlanMapper.java | 4 +- .../ProductManagementMapper.java | 4 +- .../specieslibrary/SpeciesLibraryMapper.java | 4 +- .../mysql/varietydata/VarietyDataMapper.java | 4 +- .../WeatherDisasterLibraryMapper.java | 4 +- .../module/farm/enums/ErrorCodeConstants.java | 2 +- .../service/baseinfo/BaseInfoServiceImpl.java | 3 +- .../companyinfo/CompanyInfoServiceImpl.java | 3 +- .../CultivationAreaService.java | 8 ++- .../CultivationAreaServiceImpl.java | 11 ++-- .../service/deviceinfo/DeviceInfoService.java | 8 ++- .../deviceinfo/DeviceInfoServiceImpl.java | 11 ++-- .../DevicePlotRelationService.java | 8 ++- .../DevicePlotRelationServiceImpl.java | 11 ++-- .../disasterdata/DisasterDataService.java | 8 ++- .../disasterdata/DisasterDataServiceImpl.java | 11 ++-- .../EnvironmentIndexConfigService.java | 8 ++- .../EnvironmentIndexConfigServiceImpl.java | 11 ++-- .../FarmingNameMaintenanceService.java | 8 ++- .../FarmingNameMaintenanceServiceImpl.java | 3 +- .../farmingrecord/FarmingRecordService.java | 8 ++- .../FarmingRecordServiceImpl.java | 3 +- .../FarmingRecordInputService.java | 8 ++- .../FarmingRecordInputServiceImpl.java | 11 ++-- .../FarmingTypeMaintenanceService.java | 8 ++- .../FarmingTypeMaintenanceServiceImpl.java | 11 ++-- .../FertilizerIndexService.java | 8 ++- .../FertilizerIndexServiceImpl.java | 11 ++-- .../foundationinfo/FoundationInfoService.java | 8 ++- .../FoundationInfoServiceImpl.java | 11 ++-- .../inputlibrary/InputLibraryService.java | 8 ++- .../inputlibrary/InputLibraryServiceImpl.java | 11 ++-- .../messagecenter/MessageCenterService.java | 8 ++- .../MessageCenterServiceImpl.java | 11 ++-- .../service/modelcycle/ModelCycleService.java | 8 ++- .../modelcycle/ModelCycleServiceImpl.java | 11 ++-- .../ModelEnvironmentIndexService.java | 8 ++- .../ModelEnvironmentIndexServiceImpl.java | 11 ++-- .../ModelFarmingOperationService.java | 8 ++- .../ModelFarmingOperationServiceImpl.java | 26 +++----- .../ModelFarmingOperationInputService.java | 8 ++- ...ModelFarmingOperationInputServiceImpl.java | 26 +++----- .../ModelPestDiseaseWeedService.java | 8 ++- .../ModelPestDiseaseWeedServiceImpl.java | 26 +++----- .../ModelWeatherDisasterService.java | 8 ++- .../ModelWeatherDisasterServiceImpl.java | 11 ++-- .../PersonnelManagementService.java | 8 ++- .../PersonnelManagementServiceImpl.java | 11 ++-- .../PestDiseaseWeedLibraryService.java | 8 ++- .../PestDiseaseWeedLibraryServiceImpl.java | 11 ++-- .../PesticideResidueIndexService.java | 8 ++- .../PesticideResidueIndexServiceImpl.java | 11 ++-- .../service/plotinfo/PlotInfoService.java | 8 ++- .../service/plotinfo/PlotInfoServiceImpl.java | 11 ++-- .../productionplan/ProductionPlanService.java | 8 ++- .../ProductionPlanServiceImpl.java | 11 ++-- .../ProductManagementService.java | 8 ++- .../ProductManagementServiceImpl.java | 11 ++-- .../SpeciesLibraryServiceImpl.java | 3 +- .../varietydata/VarietyDataServiceImpl.java | 3 +- .../WeatherDisasterLibraryServiceImpl.java | 3 +- 236 files changed, 998 insertions(+), 1004 deletions(-) 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/baseinfo/BaseInfoController.java index a0578bec..1676d16f 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/baseinfo/BaseInfoController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.baseinfo; +import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoSaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.baseinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService; @@ -40,14 +44,12 @@ public class BaseInfoController { @PostMapping("/create") @Operation(summary = "创建基地") - @PreAuthorize("@ss.hasPermission('farm:base-info:create')") public CommonResult createBaseInfo(@Valid @RequestBody BaseInfoSaveReqVO createReqVO) { return success(baseInfoService.createBaseInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新基地") - @PreAuthorize("@ss.hasPermission('farm:base-info:update')") public CommonResult updateBaseInfo(@Valid @RequestBody BaseInfoSaveReqVO updateReqVO) { baseInfoService.updateBaseInfo(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class BaseInfoController { @DeleteMapping("/delete") @Operation(summary = "删除基地") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:base-info:delete')") public CommonResult deleteBaseInfo(@RequestParam("id") String id) { baseInfoService.deleteBaseInfo(id); return success(true); @@ -65,7 +66,6 @@ public class BaseInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除基地") - @PreAuthorize("@ss.hasPermission('farm:base-info:delete')") public CommonResult deleteBaseInfoList(@RequestParam("ids") List ids) { baseInfoService.deleteBaseInfoListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class BaseInfoController { @GetMapping("/get") @Operation(summary = "获得基地") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:base-info:query')") public CommonResult getBaseInfo(@RequestParam("id") String id) { BaseInfoDO baseInfo = baseInfoService.getBaseInfo(id); return success(BeanUtils.toBean(baseInfo, BaseInfoRespVO.class)); @@ -82,7 +81,6 @@ public class BaseInfoController { @GetMapping("/page") @Operation(summary = "获得基地分页") - @PreAuthorize("@ss.hasPermission('farm:base-info:query')") public CommonResult> getBaseInfoPage(@Valid BaseInfoPageReqVO pageReqVO) { PageResult pageResult = baseInfoService.getBaseInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BaseInfoRespVO.class)); @@ -90,7 +88,6 @@ public class BaseInfoController { @GetMapping("/export-excel") @Operation(summary = "导出基地 Excel") - @PreAuthorize("@ss.hasPermission('farm:base-info:export')") @ApiAccessLog(operateType = EXPORT) public void exportBaseInfoExcel(@Valid BaseInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/baseinfo/vo/BaseInfoPageReqVO.java index 4e80c884..47fa4558 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/baseinfo/vo/BaseInfoPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; 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/baseinfo/vo/BaseInfoRespVO.java index 4a3ea8c2..1c13cf5b 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/baseinfo/vo/BaseInfoRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; 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/baseinfo/vo/BaseInfoSaveReqVO.java index 29dbe530..4fa2bc12 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/baseinfo/vo/BaseInfoSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 基地新增/修改 Request VO") 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/companyinfo/CompanyInfoController.java index 2aa0b698..b0615d22 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/companyinfo/CompanyInfoController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.companyinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.service.companyinfo.CompanyInfoService; @@ -40,14 +44,12 @@ public class CompanyInfoController { @PostMapping("/create") @Operation(summary = "创建企业信息") - @PreAuthorize("@ss.hasPermission('farm:company-info:create')") public CommonResult createCompanyInfo(@Valid @RequestBody CompanyInfoSaveReqVO createReqVO) { return success(companyInfoService.createCompanyInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新企业信息") - @PreAuthorize("@ss.hasPermission('farm:company-info:update')") public CommonResult updateCompanyInfo(@Valid @RequestBody CompanyInfoSaveReqVO updateReqVO) { companyInfoService.updateCompanyInfo(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class CompanyInfoController { @DeleteMapping("/delete") @Operation(summary = "删除企业信息") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:company-info:delete')") public CommonResult deleteCompanyInfo(@RequestParam("id") String id) { companyInfoService.deleteCompanyInfo(id); return success(true); @@ -65,7 +66,6 @@ public class CompanyInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除企业信息") - @PreAuthorize("@ss.hasPermission('farm:company-info:delete')") public CommonResult deleteCompanyInfoList(@RequestParam("ids") List ids) { companyInfoService.deleteCompanyInfoListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class CompanyInfoController { @GetMapping("/get") @Operation(summary = "获得企业信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:company-info:query')") public CommonResult getCompanyInfo(@RequestParam("id") String id) { CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo(id); return success(BeanUtils.toBean(companyInfo, CompanyInfoRespVO.class)); @@ -82,7 +81,6 @@ public class CompanyInfoController { @GetMapping("/page") @Operation(summary = "获得企业信息分页") - @PreAuthorize("@ss.hasPermission('farm:company-info:query')") public CommonResult> getCompanyInfoPage(@Valid CompanyInfoPageReqVO pageReqVO) { PageResult pageResult = companyInfoService.getCompanyInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, CompanyInfoRespVO.class)); @@ -90,7 +88,6 @@ public class CompanyInfoController { @GetMapping("/export-excel") @Operation(summary = "导出企业信息 Excel") - @PreAuthorize("@ss.hasPermission('farm:company-info:export')") @ApiAccessLog(operateType = EXPORT) public void exportCompanyInfoExcel(@Valid CompanyInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/companyinfo/vo/CompanyInfoPageReqVO.java index 35829673..4b1f59f0 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/companyinfo/vo/CompanyInfoPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/companyinfo/vo/CompanyInfoRespVO.java index c90fd223..bf21f88d 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/companyinfo/vo/CompanyInfoRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/companyinfo/vo/CompanyInfoSaveReqVO.java index 6ffe602b..93df5797 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/companyinfo/vo/CompanyInfoSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 企业信息新增/修改 Request VO") @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 c21d9f0c..08de290f 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 @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaSaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.cultivationarea.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; import cn.iocoder.yudao.module.farm.service.cultivationarea.CultivationAreaService; @@ -40,14 +44,12 @@ public class CultivationAreaController { @PostMapping("/create") @Operation(summary = "创建种植区域") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:create')") public CommonResult createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) { return success(cultivationAreaService.createCultivationArea(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新种植区域") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:update')") public CommonResult updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) { cultivationAreaService.updateCultivationArea(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class CultivationAreaController { @DeleteMapping("/delete") @Operation(summary = "删除种植区域") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:delete')") public CommonResult deleteCultivationArea(@RequestParam("id") String id) { cultivationAreaService.deleteCultivationArea(id); return success(true); @@ -65,7 +66,6 @@ public class CultivationAreaController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除种植区域") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:delete')") public CommonResult deleteCultivationAreaList(@RequestParam("ids") List ids) { cultivationAreaService.deleteCultivationAreaListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class CultivationAreaController { @GetMapping("/get") @Operation(summary = "获得种植区域") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:query')") public CommonResult getCultivationArea(@RequestParam("id") String id) { CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id); return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class)); @@ -82,7 +81,6 @@ public class CultivationAreaController { @GetMapping("/page") @Operation(summary = "获得种植区域分页") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:query')") public CommonResult> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) { PageResult pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO); return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class)); @@ -90,7 +88,6 @@ public class CultivationAreaController { @GetMapping("/export-excel") @Operation(summary = "导出种植区域 Excel") - @PreAuthorize("@ss.hasPermission('farm:cultivation-area:export')") @ApiAccessLog(operateType = EXPORT) public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java index ef0f85df..487235a8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java index 05d21784..ccb07e1a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java index 7587804d..4ac507eb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 种植区域新增/修改 Request VO") 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 856cb2f2..1ea0306f 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 @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceinfo; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.deviceinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.module.farm.service.deviceinfo.DeviceInfoService; @@ -40,14 +44,12 @@ public class DeviceInfoController { @PostMapping("/create") @Operation(summary = "创建设备信息") - @PreAuthorize("@ss.hasPermission('farm:device-info:create')") public CommonResult createDeviceInfo(@Valid @RequestBody DeviceInfoSaveReqVO createReqVO) { return success(deviceInfoService.createDeviceInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新设备信息") - @PreAuthorize("@ss.hasPermission('farm:device-info:update')") public CommonResult updateDeviceInfo(@Valid @RequestBody DeviceInfoSaveReqVO updateReqVO) { deviceInfoService.updateDeviceInfo(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class DeviceInfoController { @DeleteMapping("/delete") @Operation(summary = "删除设备信息") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:device-info:delete')") public CommonResult deleteDeviceInfo(@RequestParam("id") String id) { deviceInfoService.deleteDeviceInfo(id); return success(true); @@ -65,7 +66,6 @@ public class DeviceInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除设备信息") - @PreAuthorize("@ss.hasPermission('farm:device-info:delete')") public CommonResult deleteDeviceInfoList(@RequestParam("ids") List ids) { deviceInfoService.deleteDeviceInfoListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class DeviceInfoController { @GetMapping("/get") @Operation(summary = "获得设备信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:device-info:query')") public CommonResult getDeviceInfo(@RequestParam("id") String id) { DeviceInfoDO deviceInfo = deviceInfoService.getDeviceInfo(id); return success(BeanUtils.toBean(deviceInfo, DeviceInfoRespVO.class)); @@ -82,7 +81,6 @@ public class DeviceInfoController { @GetMapping("/page") @Operation(summary = "获得设备信息分页") - @PreAuthorize("@ss.hasPermission('farm:device-info:query')") public CommonResult> getDeviceInfoPage(@Valid DeviceInfoPageReqVO pageReqVO) { PageResult pageResult = deviceInfoService.getDeviceInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceInfoRespVO.class)); @@ -90,7 +88,6 @@ public class DeviceInfoController { @GetMapping("/export-excel") @Operation(summary = "导出设备信息 Excel") - @PreAuthorize("@ss.hasPermission('farm:device-info:export')") @ApiAccessLog(operateType = EXPORT) public void exportDeviceInfoExcel(@Valid DeviceInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java index 72093215..a6c54d81 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoRespVO.java index 9e31bb98..57f7abf3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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 a265e3f8..d5e69b09 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 @@ -2,15 +2,14 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @Schema(description = "管理后台 - 设备信息新增/修改 Request VO") @Data public class DeviceInfoSaveReqVO { - + private String id; @Schema(description = "设备全局唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "9620") private String deviceUniqueId; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java index 317e53e5..1b7a080f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationSaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.deviceplotrelation.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService; @@ -40,14 +44,12 @@ public class DevicePlotRelationController { @PostMapping("/create") @Operation(summary = "创建设备与地块关联") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:create')") public CommonResult createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) { return success(devicePlotRelationService.createDevicePlotRelation(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新设备与地块关联") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:update')") public CommonResult updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) { devicePlotRelationService.updateDevicePlotRelation(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class DevicePlotRelationController { @DeleteMapping("/delete") @Operation(summary = "删除设备与地块关联") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:delete')") public CommonResult deleteDevicePlotRelation(@RequestParam("id") String id) { devicePlotRelationService.deleteDevicePlotRelation(id); return success(true); @@ -65,7 +66,6 @@ public class DevicePlotRelationController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除设备与地块关联") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:delete')") public CommonResult deleteDevicePlotRelationList(@RequestParam("ids") List ids) { devicePlotRelationService.deleteDevicePlotRelationListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class DevicePlotRelationController { @GetMapping("/get") @Operation(summary = "获得设备与地块关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:query')") public CommonResult getDevicePlotRelation(@RequestParam("id") String id) { DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id); return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class)); @@ -82,7 +81,6 @@ public class DevicePlotRelationController { @GetMapping("/page") @Operation(summary = "获得设备与地块关联分页") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:query')") public CommonResult> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) { PageResult pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class)); @@ -90,7 +88,6 @@ public class DevicePlotRelationController { @GetMapping("/export-excel") @Operation(summary = "导出设备与地块关联 Excel") - @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:export')") @ApiAccessLog(operateType = EXPORT) public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java index b4948fd8..aecf5c85 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java index 89caae11..2e01279b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java index 8323a102..4f11ae54 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 设备与地块关联新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java index 3b651ca9..7c54ff34 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.disasterdata; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.disasterdata.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService; @@ -40,14 +44,12 @@ public class DisasterDataController { @PostMapping("/create") @Operation(summary = "创建灾害数据") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:create')") public CommonResult createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) { return success(disasterDataService.createDisasterData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新灾害数据") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:update')") public CommonResult updateDisasterData(@Valid @RequestBody DisasterDataSaveReqVO updateReqVO) { disasterDataService.updateDisasterData(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class DisasterDataController { @DeleteMapping("/delete") @Operation(summary = "删除灾害数据") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:disaster-data:delete')") public CommonResult deleteDisasterData(@RequestParam("id") String id) { disasterDataService.deleteDisasterData(id); return success(true); @@ -65,7 +66,6 @@ public class DisasterDataController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除灾害数据") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:delete')") public CommonResult deleteDisasterDataList(@RequestParam("ids") List ids) { disasterDataService.deleteDisasterDataListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class DisasterDataController { @GetMapping("/get") @Operation(summary = "获得灾害数据") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:query')") public CommonResult getDisasterData(@RequestParam("id") String id) { DisasterDataDO disasterData = disasterDataService.getDisasterData(id); return success(BeanUtils.toBean(disasterData, DisasterDataRespVO.class)); @@ -82,7 +81,6 @@ public class DisasterDataController { @GetMapping("/page") @Operation(summary = "获得灾害数据分页") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:query')") public CommonResult> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) { PageResult pageResult = disasterDataService.getDisasterDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DisasterDataRespVO.class)); @@ -90,7 +88,6 @@ public class DisasterDataController { @GetMapping("/export-excel") @Operation(summary = "导出灾害数据 Excel") - @PreAuthorize("@ss.hasPermission('farm:disaster-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportDisasterDataExcel(@Valid DisasterDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java index 473b15af..405d5951 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java index ac845fcd..d51cae1d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java index b88c875c..25acfab8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 灾害数据新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java index 6ba10a6a..d83048fe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.environmentindexconfig.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.module.farm.service.environmentindexconfig.EnvironmentIndexConfigService; @@ -40,14 +44,12 @@ public class EnvironmentIndexConfigController { @PostMapping("/create") @Operation(summary = "创建环境指标配置") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:create')") public CommonResult createEnvironmentIndexConfig(@Valid @RequestBody EnvironmentIndexConfigSaveReqVO createReqVO) { return success(environmentIndexConfigService.createEnvironmentIndexConfig(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新环境指标配置") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:update')") public CommonResult updateEnvironmentIndexConfig(@Valid @RequestBody EnvironmentIndexConfigSaveReqVO updateReqVO) { environmentIndexConfigService.updateEnvironmentIndexConfig(updateReqVO); return success(true); @@ -56,7 +58,6 @@ public class EnvironmentIndexConfigController { @DeleteMapping("/delete") @Operation(summary = "删除环境指标配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:delete')") public CommonResult deleteEnvironmentIndexConfig(@RequestParam("id") String id) { environmentIndexConfigService.deleteEnvironmentIndexConfig(id); return success(true); @@ -65,7 +66,6 @@ public class EnvironmentIndexConfigController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除环境指标配置") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:delete')") public CommonResult deleteEnvironmentIndexConfigList(@RequestParam("ids") List ids) { environmentIndexConfigService.deleteEnvironmentIndexConfigListByIds(ids); return success(true); @@ -74,7 +74,6 @@ public class EnvironmentIndexConfigController { @GetMapping("/get") @Operation(summary = "获得环境指标配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:query')") public CommonResult getEnvironmentIndexConfig(@RequestParam("id") String id) { EnvironmentIndexConfigDO environmentIndexConfig = environmentIndexConfigService.getEnvironmentIndexConfig(id); return success(BeanUtils.toBean(environmentIndexConfig, EnvironmentIndexConfigRespVO.class)); @@ -82,7 +81,6 @@ public class EnvironmentIndexConfigController { @GetMapping("/page") @Operation(summary = "获得环境指标配置分页") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:query')") public CommonResult> getEnvironmentIndexConfigPage(@Valid EnvironmentIndexConfigPageReqVO pageReqVO) { PageResult pageResult = environmentIndexConfigService.getEnvironmentIndexConfigPage(pageReqVO); return success(BeanUtils.toBean(pageResult, EnvironmentIndexConfigRespVO.class)); @@ -90,7 +88,6 @@ public class EnvironmentIndexConfigController { @GetMapping("/export-excel") @Operation(summary = "导出环境指标配置 Excel") - @PreAuthorize("@ss.hasPermission('farm:environment-index-config:export')") @ApiAccessLog(operateType = EXPORT) public void exportEnvironmentIndexConfigExcel(@Valid EnvironmentIndexConfigPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java index 34ceef54..2407b4b2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java index 849acd45..673ce3aa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java index 29410308..0a814865 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 环境指标配置新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java index 518112e1..4a452c0d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance; +import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.farmingnamemaintenance.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.service.farmingnamemaintenance.FarmingNameMaintenanceService; @@ -36,66 +40,61 @@ import cn.iocoder.yudao.module.farm.service.farmingnamemaintenance.FarmingNameMa public class FarmingNameMaintenanceController { @Resource - private FarmingNameMaintenanceService ingNameMaintenanceService; + private FarmingNameMaintenanceService farmingNameMaintenanceService; @PostMapping("/create") @Operation(summary = "创建农事名称维护") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:create')") - public CommonResult createingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) { - return success(ingNameMaintenanceService.createingNameMaintenance(createReqVO)); + + public CommonResult createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) { + return success(farmingNameMaintenanceService.createFarmingNameMaintenance(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新农事名称维护") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:update')") - public CommonResult updateingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) { - ingNameMaintenanceService.updateingNameMaintenance(updateReqVO); + public CommonResult updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) { + farmingNameMaintenanceService.updateFarmingNameMaintenance(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除农事名称维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:delete')") - public CommonResult deleteingNameMaintenance(@RequestParam("id") String id) { - ingNameMaintenanceService.deleteingNameMaintenance(id); + public CommonResult deleteFarmingNameMaintenance(@RequestParam("id") String id) { + farmingNameMaintenanceService.deleteFarmingNameMaintenance(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除农事名称维护") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:delete')") - public CommonResult deleteingNameMaintenanceList(@RequestParam("ids") List ids) { - ingNameMaintenanceService.deleteingNameMaintenanceListByIds(ids); + public CommonResult deleteFarmingNameMaintenanceList(@RequestParam("ids") List ids) { + farmingNameMaintenanceService.deleteFarmingNameMaintenanceListByIds(ids); return success(true); } @GetMapping("/get") @Operation(summary = "获得农事名称维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:query')") - public CommonResult getingNameMaintenance(@RequestParam("id") String id) { - FarmingNameMaintenanceDO ingNameMaintenance = ingNameMaintenanceService.getingNameMaintenance(id); - return success(BeanUtils.toBean(ingNameMaintenance, FarmingNameMaintenanceRespVO.class)); + public CommonResult getFarmingNameMaintenance(@RequestParam("id") String id) { + FarmingNameMaintenanceDO farmingNameMaintenance = farmingNameMaintenanceService.getFarmingNameMaintenance(id); + return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得农事名称维护分页") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:query')") - public CommonResult> getingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) { - PageResult pageResult = ingNameMaintenanceService.getingNameMaintenancePage(pageReqVO); + public CommonResult> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) { + PageResult pageResult = farmingNameMaintenanceService.getFarmingNameMaintenancePage(pageReqVO); return success(BeanUtils.toBean(pageResult, FarmingNameMaintenanceRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出农事名称维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:export')") + @ApiAccessLog(operateType = EXPORT) - public void exportingNameMaintenanceExcel(@Valid FarmingNameMaintenancePageReqVO pageReqVO, + public void exportFarmingNameMaintenanceExcel(@Valid FarmingNameMaintenancePageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = ingNameMaintenanceService.getingNameMaintenancePage(pageReqVO).getList(); + List list = farmingNameMaintenanceService.getFarmingNameMaintenancePage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "农事名称维护.xls", "数据", FarmingNameMaintenanceRespVO.class, BeanUtils.toBean(list, FarmingNameMaintenanceRespVO.class)); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java index 9e3c3b10..59a3c945 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java index 1ec50e18..0a594c26 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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 4fd59153..d34335cf 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 @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 农事名称维护新增/修改 Request VO") @Data 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 947a4224..aa74f1e9 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 @@ -3,15 +3,14 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; +import jakarta.validation.Valid; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +22,11 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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 static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; +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.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; @@ -36,66 +37,66 @@ import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService; public class FarmingRecordController { @Resource - private FarmingRecordService ingRecordService; + private FarmingRecordService farmingRecordService; @PostMapping("/create") @Operation(summary = "创建种植中心-农事基地-农事记录") - @PreAuthorize("@ss.hasPermission('farm:ing-record:create')") - public CommonResult createingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) { - return success(ingRecordService.createingRecord(createReqVO)); + + public CommonResult createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) { + return success(farmingRecordService.createFarmingRecord(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新种植中心-农事基地-农事记录") - @PreAuthorize("@ss.hasPermission('farm:ing-record:update')") - public CommonResult updateingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { - ingRecordService.updateingRecord(updateReqVO); + + public CommonResult updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) { + farmingRecordService.updateFarmingRecord(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除种植中心-农事基地-农事记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:ing-record:delete')") - public CommonResult deleteingRecord(@RequestParam("id") String id) { - ingRecordService.deleteingRecord(id); + + public CommonResult deleteFarmingRecord(@RequestParam("id") String id) { + farmingRecordService.deleteFarmingRecord(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除种植中心-农事基地-农事记录") - @PreAuthorize("@ss.hasPermission('farm:ing-record:delete')") - public CommonResult deleteingRecordList(@RequestParam("ids") List ids) { - ingRecordService.deleteingRecordListByIds(ids); + + 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") - @PreAuthorize("@ss.hasPermission('farm:ing-record:query')") - public CommonResult getingRecord(@RequestParam("id") String id) { - FarmingRecordDO ingRecord = ingRecordService.getingRecord(id); - return success(BeanUtils.toBean(ingRecord, FarmingRecordRespVO.class)); + + public CommonResult getFarmingRecord(@RequestParam("id") String id) { + FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); + return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得种植中心-农事基地-农事记录分页") - @PreAuthorize("@ss.hasPermission('farm:ing-record:query')") - public CommonResult> getingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { - PageResult pageResult = ingRecordService.getingRecordPage(pageReqVO); + + public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { + PageResult pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出种植中心-农事基地-农事记录 Excel") - @PreAuthorize("@ss.hasPermission('farm:ing-record:export')") + @ApiAccessLog(operateType = EXPORT) - public void exportingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO, + public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = ingRecordService.getingRecordPage(pageReqVO).getList(); + List list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class, BeanUtils.toBean(list, FarmingRecordRespVO.class)); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java index 136bdff7..d9b77c3d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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 a32b4c80..a567c4b7 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 @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java index 42a9c05b..860a0564 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java index a2a8a109..7a43f715 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.farmingrecordinput.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.service.farmingrecordinput.FarmingRecordInputService; @@ -36,66 +40,66 @@ import cn.iocoder.yudao.module.farm.service.farmingrecordinput.FarmingRecordInpu public class FarmingRecordInputController { @Resource - private FarmingRecordInputService ingRecordInputService; + private FarmingRecordInputService farmingRecordInputService; @PostMapping("/create") @Operation(summary = "创建种植中心-农事基地-农事记录-投入品") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:create')") - public CommonResult createingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO createReqVO) { - return success(ingRecordInputService.createingRecordInput(createReqVO)); + + public CommonResult createFarmingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO createReqVO) { + return success(farmingRecordInputService.createFarmingRecordInput(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新种植中心-农事基地-农事记录-投入品") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:update')") - public CommonResult updateingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO updateReqVO) { - ingRecordInputService.updateingRecordInput(updateReqVO); + + public CommonResult updateFarmingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO updateReqVO) { + farmingRecordInputService.updateFarmingRecordInput(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除种植中心-农事基地-农事记录-投入品") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:delete')") - public CommonResult deleteingRecordInput(@RequestParam("id") String id) { - ingRecordInputService.deleteingRecordInput(id); + + public CommonResult deleteFarmingRecordInput(@RequestParam("id") String id) { + farmingRecordInputService.deleteFarmingRecordInput(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除种植中心-农事基地-农事记录-投入品") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:delete')") - public CommonResult deleteingRecordInputList(@RequestParam("ids") List ids) { - ingRecordInputService.deleteingRecordInputListByIds(ids); + + public CommonResult deleteFarmingRecordInputList(@RequestParam("ids") List ids) { + farmingRecordInputService.deleteFarmingRecordInputListByIds(ids); return success(true); } @GetMapping("/get") @Operation(summary = "获得种植中心-农事基地-农事记录-投入品") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:query')") - public CommonResult getingRecordInput(@RequestParam("id") String id) { - FarmingRecordInputDO ingRecordInput = ingRecordInputService.getingRecordInput(id); - return success(BeanUtils.toBean(ingRecordInput, FarmingRecordInputRespVO.class)); + + public CommonResult getFarmingRecordInput(@RequestParam("id") String id) { + FarmingRecordInputDO farmingRecordInput = farmingRecordInputService.getFarmingRecordInput(id); + return success(BeanUtils.toBean(farmingRecordInput, FarmingRecordInputRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得种植中心-农事基地-农事记录-投入品分页") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:query')") - public CommonResult> getingRecordInputPage(@Valid FarmingRecordInputPageReqVO pageReqVO) { - PageResult pageResult = ingRecordInputService.getingRecordInputPage(pageReqVO); + + public CommonResult> getFarmingRecordInputPage(@Valid FarmingRecordInputPageReqVO pageReqVO) { + PageResult pageResult = farmingRecordInputService.getFarmingRecordInputPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FarmingRecordInputRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出种植中心-农事基地-农事记录-投入品 Excel") - @PreAuthorize("@ss.hasPermission('farm:ing-record-input:export')") + @ApiAccessLog(operateType = EXPORT) - public void exportingRecordInputExcel(@Valid FarmingRecordInputPageReqVO pageReqVO, + public void exportFarmingRecordInputExcel(@Valid FarmingRecordInputPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = ingRecordInputService.getingRecordInputPage(pageReqVO).getList(); + List list = farmingRecordInputService.getFarmingRecordInputPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "种植中心-农事基地-农事记录-投入品.xls", "数据", FarmingRecordInputRespVO.class, BeanUtils.toBean(list, FarmingRecordInputRespVO.class)); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java index 50fe12cb..8c5f2984 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java index 5d7f32d9..433e9018 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java index c44b5407..32a6268a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 种植中心-农事基地-农事记录-投入品新增/修改 Request VO") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java index 7b8b0ed9..22ea0d28 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance; +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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.farmingtypemaintenance.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMaintenanceService; @@ -36,66 +40,66 @@ import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMa public class FarmingTypeMaintenanceController { @Resource - private FarmingTypeMaintenanceService ingTypeMaintenanceService; + private FarmingTypeMaintenanceService farmingTypeMaintenanceService; @PostMapping("/create") @Operation(summary = "创建农事类型维护") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:create')") - public CommonResult createingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO createReqVO) { - return success(ingTypeMaintenanceService.createingTypeMaintenance(createReqVO)); + + public CommonResult createFarmingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO createReqVO) { + return success(farmingTypeMaintenanceService.createFarmingTypeMaintenance(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新农事类型维护") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:update')") - public CommonResult updateingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO updateReqVO) { - ingTypeMaintenanceService.updateingTypeMaintenance(updateReqVO); + + public CommonResult updateFarmingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO updateReqVO) { + farmingTypeMaintenanceService.updateFarmingTypeMaintenance(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除农事类型维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:delete')") - public CommonResult deleteingTypeMaintenance(@RequestParam("id") String id) { - ingTypeMaintenanceService.deleteingTypeMaintenance(id); + + public CommonResult deleteFarmingTypeMaintenance(@RequestParam("id") String id) { + farmingTypeMaintenanceService.deleteFarmingTypeMaintenance(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除农事类型维护") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:delete')") - public CommonResult deleteingTypeMaintenanceList(@RequestParam("ids") List ids) { - ingTypeMaintenanceService.deleteingTypeMaintenanceListByIds(ids); + + public CommonResult deleteFarmingTypeMaintenanceList(@RequestParam("ids") List ids) { + farmingTypeMaintenanceService.deleteFarmingTypeMaintenanceListByIds(ids); return success(true); } @GetMapping("/get") @Operation(summary = "获得农事类型维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:query')") - public CommonResult getingTypeMaintenance(@RequestParam("id") String id) { - FarmingTypeMaintenanceDO ingTypeMaintenance = ingTypeMaintenanceService.getingTypeMaintenance(id); - return success(BeanUtils.toBean(ingTypeMaintenance, FarmingTypeMaintenanceRespVO.class)); + + public CommonResult getFarmingTypeMaintenance(@RequestParam("id") String id) { + FarmingTypeMaintenanceDO farmingTypeMaintenance = farmingTypeMaintenanceService.getFarmingTypeMaintenance(id); + return success(BeanUtils.toBean(farmingTypeMaintenance, FarmingTypeMaintenanceRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得农事类型维护分页") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:query')") - public CommonResult> getingTypeMaintenancePage(@Valid FarmingTypeMaintenancePageReqVO pageReqVO) { - PageResult pageResult = ingTypeMaintenanceService.getingTypeMaintenancePage(pageReqVO); + + public CommonResult> getFarmingTypeMaintenancePage(@Valid FarmingTypeMaintenancePageReqVO pageReqVO) { + PageResult pageResult = farmingTypeMaintenanceService.getFarmingTypeMaintenancePage(pageReqVO); return success(BeanUtils.toBean(pageResult, FarmingTypeMaintenanceRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出农事类型维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:export')") + @ApiAccessLog(operateType = EXPORT) - public void exportingTypeMaintenanceExcel(@Valid FarmingTypeMaintenancePageReqVO pageReqVO, + public void exportFarmingTypeMaintenanceExcel(@Valid FarmingTypeMaintenancePageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = ingTypeMaintenanceService.getingTypeMaintenancePage(pageReqVO).getList(); + List list = farmingTypeMaintenanceService.getFarmingTypeMaintenancePage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "农事类型维护.xls", "数据", FarmingTypeMaintenanceRespVO.class, BeanUtils.toBean(list, FarmingTypeMaintenanceRespVO.class)); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java index 16b074f2..60ea2b6a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java index 08bf09bc..e6c53de8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java index 0ec5ebf5..6de0ac86 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 农事类型维护新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java index f846c651..fc9362b3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java @@ -1,18 +1,21 @@ package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex; -import org.springframework.web.bind.annotation.*; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; + +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -23,11 +26,10 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.fertilizerindex.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.module.farm.service.fertilizerindex.FertilizerIndexService; +import org.springframework.web.bind.annotation.*; @Tag(name = "管理后台 - 化肥指标") @RestController @@ -40,14 +42,14 @@ public class FertilizerIndexController { @PostMapping("/create") @Operation(summary = "创建化肥指标") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:create')") + public CommonResult createFertilizerIndex(@Valid @RequestBody FertilizerIndexSaveReqVO createReqVO) { return success(fertilizerIndexService.createFertilizerIndex(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新化肥指标") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:update')") + public CommonResult updateFertilizerIndex(@Valid @RequestBody FertilizerIndexSaveReqVO updateReqVO) { fertilizerIndexService.updateFertilizerIndex(updateReqVO); return success(true); @@ -56,7 +58,7 @@ public class FertilizerIndexController { @DeleteMapping("/delete") @Operation(summary = "删除化肥指标") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:delete')") + public CommonResult deleteFertilizerIndex(@RequestParam("id") String id) { fertilizerIndexService.deleteFertilizerIndex(id); return success(true); @@ -65,7 +67,7 @@ public class FertilizerIndexController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除化肥指标") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:delete')") + public CommonResult deleteFertilizerIndexList(@RequestParam("ids") List ids) { fertilizerIndexService.deleteFertilizerIndexListByIds(ids); return success(true); @@ -74,7 +76,7 @@ public class FertilizerIndexController { @GetMapping("/get") @Operation(summary = "获得化肥指标") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:query')") + public CommonResult getFertilizerIndex(@RequestParam("id") String id) { FertilizerIndexDO fertilizerIndex = fertilizerIndexService.getFertilizerIndex(id); return success(BeanUtils.toBean(fertilizerIndex, FertilizerIndexRespVO.class)); @@ -82,7 +84,7 @@ public class FertilizerIndexController { @GetMapping("/page") @Operation(summary = "获得化肥指标分页") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:query')") + public CommonResult> getFertilizerIndexPage(@Valid FertilizerIndexPageReqVO pageReqVO) { PageResult pageResult = fertilizerIndexService.getFertilizerIndexPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FertilizerIndexRespVO.class)); @@ -90,7 +92,7 @@ public class FertilizerIndexController { @GetMapping("/export-excel") @Operation(summary = "导出化肥指标 Excel") - @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:export')") + @ApiAccessLog(operateType = EXPORT) public void exportFertilizerIndexExcel(@Valid FertilizerIndexPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java index 40546e58..42996077 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java index 036dbb0d..9efbbeb9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java index 101fea15..a1065fad 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 化肥指标新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java index 3165d57f..548b5274 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.foundationinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService; @@ -40,14 +44,14 @@ public class FoundationInfoController { @PostMapping("/create") @Operation(summary = "创建基础信息") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:create')") + public CommonResult createFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO createReqVO) { return success(foundationInfoService.createFoundationInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新基础信息") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:update')") + public CommonResult updateFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO updateReqVO) { foundationInfoService.updateFoundationInfo(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class FoundationInfoController { @DeleteMapping("/delete") @Operation(summary = "删除基础信息") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:foundation-info:delete')") + public CommonResult deleteFoundationInfo(@RequestParam("id") String id) { foundationInfoService.deleteFoundationInfo(id); return success(true); @@ -65,7 +69,7 @@ public class FoundationInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除基础信息") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:delete')") + public CommonResult deleteFoundationInfoList(@RequestParam("ids") List ids) { foundationInfoService.deleteFoundationInfoListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class FoundationInfoController { @GetMapping("/get") @Operation(summary = "获得基础信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:query')") + public CommonResult getFoundationInfo(@RequestParam("id") String id) { FoundationInfoDO foundationInfo = foundationInfoService.getFoundationInfo(id); return success(BeanUtils.toBean(foundationInfo, FoundationInfoRespVO.class)); @@ -82,7 +86,7 @@ public class FoundationInfoController { @GetMapping("/page") @Operation(summary = "获得基础信息分页") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:query')") + public CommonResult> getFoundationInfoPage(@Valid FoundationInfoPageReqVO pageReqVO) { PageResult pageResult = foundationInfoService.getFoundationInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FoundationInfoRespVO.class)); @@ -90,7 +94,7 @@ public class FoundationInfoController { @GetMapping("/export-excel") @Operation(summary = "导出基础信息 Excel") - @PreAuthorize("@ss.hasPermission('farm:foundation-info:export')") + @ApiAccessLog(operateType = EXPORT) public void exportFoundationInfoExcel(@Valid FoundationInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java index d6009986..12c18f1a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java index 44023f50..c345ee16 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java index 3c89161a..e708b3bb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 基础信息新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java index dbbf6254..bae5d776 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.inputlibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.module.farm.service.inputlibrary.InputLibraryService; @@ -40,14 +44,14 @@ public class InputLibraryController { @PostMapping("/create") @Operation(summary = "创建投入品库维护") - @PreAuthorize("@ss.hasPermission('farm:input-library:create')") + public CommonResult createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) { return success(inputLibraryService.createInputLibrary(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新投入品库维护") - @PreAuthorize("@ss.hasPermission('farm:input-library:update')") + public CommonResult updateInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO updateReqVO) { inputLibraryService.updateInputLibrary(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class InputLibraryController { @DeleteMapping("/delete") @Operation(summary = "删除投入品库维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:input-library:delete')") + public CommonResult deleteInputLibrary(@RequestParam("id") String id) { inputLibraryService.deleteInputLibrary(id); return success(true); @@ -65,7 +69,7 @@ public class InputLibraryController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除投入品库维护") - @PreAuthorize("@ss.hasPermission('farm:input-library:delete')") + public CommonResult deleteInputLibraryList(@RequestParam("ids") List ids) { inputLibraryService.deleteInputLibraryListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class InputLibraryController { @GetMapping("/get") @Operation(summary = "获得投入品库维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:input-library:query')") + public CommonResult getInputLibrary(@RequestParam("id") String id) { InputLibraryDO inputLibrary = inputLibraryService.getInputLibrary(id); return success(BeanUtils.toBean(inputLibrary, InputLibraryRespVO.class)); @@ -82,7 +86,7 @@ public class InputLibraryController { @GetMapping("/page") @Operation(summary = "获得投入品库维护分页") - @PreAuthorize("@ss.hasPermission('farm:input-library:query')") + public CommonResult> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) { PageResult pageResult = inputLibraryService.getInputLibraryPage(pageReqVO); return success(BeanUtils.toBean(pageResult, InputLibraryRespVO.class)); @@ -90,7 +94,7 @@ public class InputLibraryController { @GetMapping("/export-excel") @Operation(summary = "导出投入品库维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:input-library:export')") + @ApiAccessLog(operateType = EXPORT) public void exportInputLibraryExcel(@Valid InputLibraryPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java index 884b1b92..7c9dbfe0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java index b8be50de..203803de 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java index f9f5619e..a50f325b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 投入品库维护新增/修改 Request VO") 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/messagecenter/MessageCenterController.java index f4f30036..bcc6463c 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/messagecenter/MessageCenterController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.messagecenter; +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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.messagecenter.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.module.farm.service.messagecenter.MessageCenterService; @@ -40,14 +44,14 @@ public class MessageCenterController { @PostMapping("/create") @Operation(summary = "创建消息中心") - @PreAuthorize("@ss.hasPermission('farm:message-center:create')") + public CommonResult createMessageCenter(@Valid @RequestBody MessageCenterSaveReqVO createReqVO) { return success(messageCenterService.createMessageCenter(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新消息中心") - @PreAuthorize("@ss.hasPermission('farm:message-center:update')") + public CommonResult updateMessageCenter(@Valid @RequestBody MessageCenterSaveReqVO updateReqVO) { messageCenterService.updateMessageCenter(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class MessageCenterController { @DeleteMapping("/delete") @Operation(summary = "删除消息中心") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:message-center:delete')") + public CommonResult deleteMessageCenter(@RequestParam("id") String id) { messageCenterService.deleteMessageCenter(id); return success(true); @@ -65,7 +69,7 @@ public class MessageCenterController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除消息中心") - @PreAuthorize("@ss.hasPermission('farm:message-center:delete')") + public CommonResult deleteMessageCenterList(@RequestParam("ids") List ids) { messageCenterService.deleteMessageCenterListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class MessageCenterController { @GetMapping("/get") @Operation(summary = "获得消息中心") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:message-center:query')") + public CommonResult getMessageCenter(@RequestParam("id") String id) { MessageCenterDO messageCenter = messageCenterService.getMessageCenter(id); return success(BeanUtils.toBean(messageCenter, MessageCenterRespVO.class)); @@ -82,7 +86,7 @@ public class MessageCenterController { @GetMapping("/page") @Operation(summary = "获得消息中心分页") - @PreAuthorize("@ss.hasPermission('farm:message-center:query')") + public CommonResult> getMessageCenterPage(@Valid MessageCenterPageReqVO pageReqVO) { PageResult pageResult = messageCenterService.getMessageCenterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MessageCenterRespVO.class)); @@ -90,7 +94,7 @@ public class MessageCenterController { @GetMapping("/export-excel") @Operation(summary = "导出消息中心 Excel") - @PreAuthorize("@ss.hasPermission('farm:message-center:export')") + @ApiAccessLog(operateType = EXPORT) public void exportMessageCenterExcel(@Valid MessageCenterPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/messagecenter/vo/MessageCenterPageReqVO.java index e11f602d..ce44fb3e 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/messagecenter/vo/MessageCenterPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/messagecenter/vo/MessageCenterRespVO.java index ee6ab594..f7f28633 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/messagecenter/vo/MessageCenterRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -65,4 +65,4 @@ public class MessageCenterRespVO { private String plotName; @Schema(description = "租户id") 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/messagecenter/vo/MessageCenterSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterSaveReqVO.java index c55896c1..aa4b28c8 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/messagecenter/vo/MessageCenterSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; 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/modelcycle/ModelCycleController.java index c52e9559..ec2e16b0 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/modelcycle/ModelCycleController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelcycle.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; import cn.iocoder.yudao.module.farm.service.modelcycle.ModelCycleService; @@ -40,14 +44,14 @@ public class ModelCycleController { @PostMapping("/create") @Operation(summary = "创建模型管理-管理周期") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:create')") + public CommonResult createModelCycle(@Valid @RequestBody ModelCycleSaveReqVO createReqVO) { return success(modelCycleService.createModelCycle(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-管理周期") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:update')") + public CommonResult updateModelCycle(@Valid @RequestBody ModelCycleSaveReqVO updateReqVO) { modelCycleService.updateModelCycle(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelCycleController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-管理周期") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-cycle:delete')") + public CommonResult deleteModelCycle(@RequestParam("id") String id) { modelCycleService.deleteModelCycle(id); return success(true); @@ -65,7 +69,7 @@ public class ModelCycleController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-管理周期") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:delete')") + public CommonResult deleteModelCycleList(@RequestParam("ids") List ids) { modelCycleService.deleteModelCycleListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelCycleController { @GetMapping("/get") @Operation(summary = "获得模型管理-管理周期") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:query')") + public CommonResult getModelCycle(@RequestParam("id") String id) { ModelCycleDO modelCycle = modelCycleService.getModelCycle(id); return success(BeanUtils.toBean(modelCycle, ModelCycleRespVO.class)); @@ -82,7 +86,7 @@ public class ModelCycleController { @GetMapping("/page") @Operation(summary = "获得模型管理-管理周期分页") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:query')") + public CommonResult> getModelCyclePage(@Valid ModelCyclePageReqVO pageReqVO) { PageResult pageResult = modelCycleService.getModelCyclePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelCycleRespVO.class)); @@ -90,7 +94,7 @@ public class ModelCycleController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-管理周期 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-cycle:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelCycleExcel(@Valid ModelCyclePageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelcycle/vo/ModelCyclePageReqVO.java index 70fa7348..fb8905b9 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/modelcycle/vo/ModelCyclePageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/modelcycle/vo/ModelCycleRespVO.java index ad2d7de4..47b72d7e 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/modelcycle/vo/ModelCycleRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/modelcycle/vo/ModelCycleSaveReqVO.java index 56c5643a..642e2e27 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/modelcycle/vo/ModelCycleSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 模型管理-管理周期新增/修改 Request VO") @Data 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/modelenvironmentindex/ModelEnvironmentIndexController.java index e936d269..b9f84eb4 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/modelenvironmentindex/ModelEnvironmentIndexController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelenvironmentindex.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import cn.iocoder.yudao.module.farm.service.modelenvironmentindex.ModelEnvironmentIndexService; @@ -40,14 +44,14 @@ public class ModelEnvironmentIndexController { @PostMapping("/create") @Operation(summary = "创建模型管理-环境指标") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:create')") + public CommonResult createModelEnvironmentIndex(@Valid @RequestBody ModelEnvironmentIndexSaveReqVO createReqVO) { return success(modelEnvironmentIndexService.createModelEnvironmentIndex(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-环境指标") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:update')") + public CommonResult updateModelEnvironmentIndex(@Valid @RequestBody ModelEnvironmentIndexSaveReqVO updateReqVO) { modelEnvironmentIndexService.updateModelEnvironmentIndex(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelEnvironmentIndexController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-环境指标") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:delete')") + public CommonResult deleteModelEnvironmentIndex(@RequestParam("id") String id) { modelEnvironmentIndexService.deleteModelEnvironmentIndex(id); return success(true); @@ -65,7 +69,7 @@ public class ModelEnvironmentIndexController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-环境指标") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:delete')") + public CommonResult deleteModelEnvironmentIndexList(@RequestParam("ids") List ids) { modelEnvironmentIndexService.deleteModelEnvironmentIndexListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelEnvironmentIndexController { @GetMapping("/get") @Operation(summary = "获得模型管理-环境指标") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:query')") + public CommonResult getModelEnvironmentIndex(@RequestParam("id") String id) { ModelEnvironmentIndexDO modelEnvironmentIndex = modelEnvironmentIndexService.getModelEnvironmentIndex(id); return success(BeanUtils.toBean(modelEnvironmentIndex, ModelEnvironmentIndexRespVO.class)); @@ -82,7 +86,7 @@ public class ModelEnvironmentIndexController { @GetMapping("/page") @Operation(summary = "获得模型管理-环境指标分页") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:query')") + public CommonResult> getModelEnvironmentIndexPage(@Valid ModelEnvironmentIndexPageReqVO pageReqVO) { PageResult pageResult = modelEnvironmentIndexService.getModelEnvironmentIndexPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelEnvironmentIndexRespVO.class)); @@ -90,7 +94,7 @@ public class ModelEnvironmentIndexController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-环境指标 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-environment-index:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelEnvironmentIndexExcel(@Valid ModelEnvironmentIndexPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java index 5f3744ce..b2e5a120 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/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; 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/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java index b198a3eb..dd8e97f8 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/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; 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/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java index f72b9226..8e4eb1eb 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/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 模型管理-环境指标新增/修改 Request VO") 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/modelfarmingoperation/ModelFarmingOperationController.java index 00fa552e..ea1e0edb 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/modelfarmingoperation/ModelFarmingOperationController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelfarmingoperation.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.service.modelfarmingoperation.ModelFarmingOperationService; @@ -40,14 +44,14 @@ public class ModelFarmingOperationController { @PostMapping("/create") @Operation(summary = "创建模型管理-农事操作") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:create')") + public CommonResult createModelFarmingOperation(@Valid @RequestBody ModelFarmingOperationSaveReqVO createReqVO) { return success(modelFarmingOperationService.createModelFarmingOperation(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-农事操作") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:update')") + public CommonResult updateModelFarmingOperation(@Valid @RequestBody ModelFarmingOperationSaveReqVO updateReqVO) { modelFarmingOperationService.updateModelFarmingOperation(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelFarmingOperationController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-农事操作") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:delete')") + public CommonResult deleteModelFarmingOperation(@RequestParam("id") String id) { modelFarmingOperationService.deleteModelFarmingOperation(id); return success(true); @@ -65,7 +69,7 @@ public class ModelFarmingOperationController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-农事操作") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:delete')") + public CommonResult deleteModelFarmingOperationList(@RequestParam("ids") List ids) { modelFarmingOperationService.deleteModelFarmingOperationListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelFarmingOperationController { @GetMapping("/get") @Operation(summary = "获得模型管理-农事操作") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:query')") + public CommonResult getModelFarmingOperation(@RequestParam("id") String id) { ModelFarmingOperationDO modelFarmingOperation = modelFarmingOperationService.getModelFarmingOperation(id); return success(BeanUtils.toBean(modelFarmingOperation, ModelFarmingOperationRespVO.class)); @@ -82,7 +86,7 @@ public class ModelFarmingOperationController { @GetMapping("/page") @Operation(summary = "获得模型管理-农事操作分页") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:query')") + public CommonResult> getModelFarmingOperationPage(@Valid ModelFarmingOperationPageReqVO pageReqVO) { PageResult pageResult = modelFarmingOperationService.getModelFarmingOperationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelFarmingOperationRespVO.class)); @@ -90,7 +94,7 @@ public class ModelFarmingOperationController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-农事操作 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelFarmingOperationExcel(@Valid ModelFarmingOperationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java index 95934745..72cc8d57 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/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java index f3e3b107..6f7ee385 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/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java index c1cbfbc3..4685a7e3 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/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 模型管理-农事操作新增/修改 Request VO") @Data 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/modelfarmingoperationinput/ModelFarmingOperationInputController.java index 955c97ca..95b1179b 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/modelfarmingoperationinput/ModelFarmingOperationInputController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelfarmingoperationinput.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.service.modelfarmingoperationinput.ModelFarmingOperationInputService; @@ -40,14 +44,14 @@ public class ModelFarmingOperationInputController { @PostMapping("/create") @Operation(summary = "创建模型管理-农事操作-已选择投入品列") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:create')") + public CommonResult createModelFarmingOperationInput(@Valid @RequestBody ModelFarmingOperationInputSaveReqVO createReqVO) { return success(modelFarmingOperationInputService.createModelFarmingOperationInput(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-农事操作-已选择投入品列") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:update')") + public CommonResult updateModelFarmingOperationInput(@Valid @RequestBody ModelFarmingOperationInputSaveReqVO updateReqVO) { modelFarmingOperationInputService.updateModelFarmingOperationInput(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelFarmingOperationInputController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-农事操作-已选择投入品列") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:delete')") + public CommonResult deleteModelFarmingOperationInput(@RequestParam("id") String id) { modelFarmingOperationInputService.deleteModelFarmingOperationInput(id); return success(true); @@ -65,7 +69,7 @@ public class ModelFarmingOperationInputController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-农事操作-已选择投入品列") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:delete')") + public CommonResult deleteModelFarmingOperationInputList(@RequestParam("ids") List ids) { modelFarmingOperationInputService.deleteModelFarmingOperationInputListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelFarmingOperationInputController { @GetMapping("/get") @Operation(summary = "获得模型管理-农事操作-已选择投入品列") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:query')") + public CommonResult getModelFarmingOperationInput(@RequestParam("id") String id) { ModelFarmingOperationInputDO modelFarmingOperationInput = modelFarmingOperationInputService.getModelFarmingOperationInput(id); return success(BeanUtils.toBean(modelFarmingOperationInput, ModelFarmingOperationInputRespVO.class)); @@ -82,7 +86,7 @@ public class ModelFarmingOperationInputController { @GetMapping("/page") @Operation(summary = "获得模型管理-农事操作-已选择投入品列分页") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:query')") + public CommonResult> getModelFarmingOperationInputPage(@Valid ModelFarmingOperationInputPageReqVO pageReqVO) { PageResult pageResult = modelFarmingOperationInputService.getModelFarmingOperationInputPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelFarmingOperationInputRespVO.class)); @@ -90,7 +94,7 @@ public class ModelFarmingOperationInputController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-农事操作-已选择投入品列 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-farming-operation-input:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelFarmingOperationInputExcel(@Valid ModelFarmingOperationInputPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java index 2d758c8d..30d9a452 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java index 18834c86..0207bda7 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java index bdccb379..12f84274 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/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 模型管理-农事操作-已选择投入品列新增/修改 Request VO") 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/modelpestdiseaseweed/ModelPestDiseaseWeedController.java index ffe900d2..28f48105 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/modelpestdiseaseweed/ModelPestDiseaseWeedController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelpestdiseaseweed.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import cn.iocoder.yudao.module.farm.service.modelpestdiseaseweed.ModelPestDiseaseWeedService; @@ -40,14 +44,14 @@ public class ModelPestDiseaseWeedController { @PostMapping("/create") @Operation(summary = "创建模型管理-病虫草害") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:create')") + public CommonResult createModelPestDiseaseWeed(@Valid @RequestBody ModelPestDiseaseWeedSaveReqVO createReqVO) { return success(modelPestDiseaseWeedService.createModelPestDiseaseWeed(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-病虫草害") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:update')") + public CommonResult updateModelPestDiseaseWeed(@Valid @RequestBody ModelPestDiseaseWeedSaveReqVO updateReqVO) { modelPestDiseaseWeedService.updateModelPestDiseaseWeed(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelPestDiseaseWeedController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-病虫草害") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:delete')") + public CommonResult deleteModelPestDiseaseWeed(@RequestParam("id") String id) { modelPestDiseaseWeedService.deleteModelPestDiseaseWeed(id); return success(true); @@ -65,7 +69,7 @@ public class ModelPestDiseaseWeedController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-病虫草害") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:delete')") + public CommonResult deleteModelPestDiseaseWeedList(@RequestParam("ids") List ids) { modelPestDiseaseWeedService.deleteModelPestDiseaseWeedListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelPestDiseaseWeedController { @GetMapping("/get") @Operation(summary = "获得模型管理-病虫草害") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:query')") + public CommonResult getModelPestDiseaseWeed(@RequestParam("id") String id) { ModelPestDiseaseWeedDO modelPestDiseaseWeed = modelPestDiseaseWeedService.getModelPestDiseaseWeed(id); return success(BeanUtils.toBean(modelPestDiseaseWeed, ModelPestDiseaseWeedRespVO.class)); @@ -82,7 +86,7 @@ public class ModelPestDiseaseWeedController { @GetMapping("/page") @Operation(summary = "获得模型管理-病虫草害分页") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:query')") + public CommonResult> getModelPestDiseaseWeedPage(@Valid ModelPestDiseaseWeedPageReqVO pageReqVO) { PageResult pageResult = modelPestDiseaseWeedService.getModelPestDiseaseWeedPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelPestDiseaseWeedRespVO.class)); @@ -90,7 +94,7 @@ public class ModelPestDiseaseWeedController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-病虫草害 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-pest-disease-weed:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelPestDiseaseWeedExcel(@Valid ModelPestDiseaseWeedPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java index 9d773fe4..1a3880ad 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java index f7384770..e095b058 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java index 02036544..a3f71171 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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 模型管理-病虫草害新增/修改 Request VO") @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/modelweatherdisaster/ModelWeatherDisasterController.java index 8ca42921..195fb559 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/modelweatherdisaster/ModelWeatherDisasterController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.modelweatherdisaster.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; import cn.iocoder.yudao.module.farm.service.modelweatherdisaster.ModelWeatherDisasterService; @@ -40,14 +44,14 @@ public class ModelWeatherDisasterController { @PostMapping("/create") @Operation(summary = "创建模型管理-气象灾害") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:create')") + public CommonResult createModelWeatherDisaster(@Valid @RequestBody ModelWeatherDisasterSaveReqVO createReqVO) { return success(modelWeatherDisasterService.createModelWeatherDisaster(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新模型管理-气象灾害") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:update')") + public CommonResult updateModelWeatherDisaster(@Valid @RequestBody ModelWeatherDisasterSaveReqVO updateReqVO) { modelWeatherDisasterService.updateModelWeatherDisaster(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ModelWeatherDisasterController { @DeleteMapping("/delete") @Operation(summary = "删除模型管理-气象灾害") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:delete')") + public CommonResult deleteModelWeatherDisaster(@RequestParam("id") String id) { modelWeatherDisasterService.deleteModelWeatherDisaster(id); return success(true); @@ -65,7 +69,7 @@ public class ModelWeatherDisasterController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模型管理-气象灾害") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:delete')") + public CommonResult deleteModelWeatherDisasterList(@RequestParam("ids") List ids) { modelWeatherDisasterService.deleteModelWeatherDisasterListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ModelWeatherDisasterController { @GetMapping("/get") @Operation(summary = "获得模型管理-气象灾害") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:query')") + public CommonResult getModelWeatherDisaster(@RequestParam("id") String id) { ModelWeatherDisasterDO modelWeatherDisaster = modelWeatherDisasterService.getModelWeatherDisaster(id); return success(BeanUtils.toBean(modelWeatherDisaster, ModelWeatherDisasterRespVO.class)); @@ -82,7 +86,7 @@ public class ModelWeatherDisasterController { @GetMapping("/page") @Operation(summary = "获得模型管理-气象灾害分页") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:query')") + public CommonResult> getModelWeatherDisasterPage(@Valid ModelWeatherDisasterPageReqVO pageReqVO) { PageResult pageResult = modelWeatherDisasterService.getModelWeatherDisasterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelWeatherDisasterRespVO.class)); @@ -90,7 +94,7 @@ public class ModelWeatherDisasterController { @GetMapping("/export-excel") @Operation(summary = "导出模型管理-气象灾害 Excel") - @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:export')") + @ApiAccessLog(operateType = EXPORT) public void exportModelWeatherDisasterExcel(@Valid ModelWeatherDisasterPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java index 215c955f..287928ed 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/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java index 38c08d64..a4034db7 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/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java index da0ae4db..794c2191 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/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 模型管理-气象灾害新增/修改 Request VO") @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/personnelmanagement/PersonnelManagementController.java index 605c83c9..b33ab989 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/personnelmanagement/PersonnelManagementController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement; +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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.personnelmanagement.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagementService; @@ -40,14 +44,14 @@ public class PersonnelManagementController { @PostMapping("/create") @Operation(summary = "创建人员管理") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:create')") + public CommonResult createPersonnelManagement(@Valid @RequestBody PersonnelManagementSaveReqVO createReqVO) { return success(personnelManagementService.createPersonnelManagement(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新人员管理") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:update')") + public CommonResult updatePersonnelManagement(@Valid @RequestBody PersonnelManagementSaveReqVO updateReqVO) { personnelManagementService.updatePersonnelManagement(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class PersonnelManagementController { @DeleteMapping("/delete") @Operation(summary = "删除人员管理") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:personnel-management:delete')") + public CommonResult deletePersonnelManagement(@RequestParam("id") String id) { personnelManagementService.deletePersonnelManagement(id); return success(true); @@ -65,7 +69,7 @@ public class PersonnelManagementController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除人员管理") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:delete')") + public CommonResult deletePersonnelManagementList(@RequestParam("ids") List ids) { personnelManagementService.deletePersonnelManagementListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class PersonnelManagementController { @GetMapping("/get") @Operation(summary = "获得人员管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:query')") + public CommonResult getPersonnelManagement(@RequestParam("id") String id) { PersonnelManagementDO personnelManagement = personnelManagementService.getPersonnelManagement(id); return success(BeanUtils.toBean(personnelManagement, PersonnelManagementRespVO.class)); @@ -82,7 +86,7 @@ public class PersonnelManagementController { @GetMapping("/page") @Operation(summary = "获得人员管理分页") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:query')") + public CommonResult> getPersonnelManagementPage(@Valid PersonnelManagementPageReqVO pageReqVO) { PageResult pageResult = personnelManagementService.getPersonnelManagementPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PersonnelManagementRespVO.class)); @@ -90,7 +94,7 @@ public class PersonnelManagementController { @GetMapping("/export-excel") @Operation(summary = "导出人员管理 Excel") - @PreAuthorize("@ss.hasPermission('farm:personnel-management:export')") + @ApiAccessLog(operateType = EXPORT) public void exportPersonnelManagementExcel(@Valid PersonnelManagementPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/personnelmanagement/vo/PersonnelManagementPageReqVO.java index 8b119a5d..469e1937 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/personnelmanagement/vo/PersonnelManagementPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; 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/personnelmanagement/vo/PersonnelManagementRespVO.java index acea709c..0339302c 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/personnelmanagement/vo/PersonnelManagementRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; 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/personnelmanagement/vo/PersonnelManagementSaveReqVO.java index 3c729243..79518802 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/personnelmanagement/vo/PersonnelManagementSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 人员管理新增/修改 Request VO") @Data 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 39e353a1..3b7f66b2 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 @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibrarySaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.pestdiseaseweedlibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO; import cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary.PestDiseaseWeedLibraryService; @@ -40,14 +44,14 @@ public class PestDiseaseWeedLibraryController { @PostMapping("/create") @Operation(summary = "创建病虫草害库维护") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:create')") + public CommonResult createPestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO createReqVO) { return success(pestDiseaseWeedLibraryService.createPestDiseaseWeedLibrary(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新病虫草害库维护") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:update')") + public CommonResult updatePestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO updateReqVO) { pestDiseaseWeedLibraryService.updatePestDiseaseWeedLibrary(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class PestDiseaseWeedLibraryController { @DeleteMapping("/delete") @Operation(summary = "删除病虫草害库维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:delete')") + public CommonResult deletePestDiseaseWeedLibrary(@RequestParam("id") String id) { pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibrary(id); return success(true); @@ -65,7 +69,7 @@ public class PestDiseaseWeedLibraryController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除病虫草害库维护") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:delete')") + public CommonResult deletePestDiseaseWeedLibraryList(@RequestParam("ids") List ids) { pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibraryListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class PestDiseaseWeedLibraryController { @GetMapping("/get") @Operation(summary = "获得病虫草害库维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:query')") + public CommonResult getPestDiseaseWeedLibrary(@RequestParam("id") String id) { PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibrary(id); return success(BeanUtils.toBean(pestDiseaseWeedLibrary, PestDiseaseWeedLibraryRespVO.class)); @@ -82,7 +86,7 @@ public class PestDiseaseWeedLibraryController { @GetMapping("/page") @Operation(summary = "获得病虫草害库维护分页") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:query')") + public CommonResult> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) { PageResult pageResult = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PestDiseaseWeedLibraryRespVO.class)); @@ -90,7 +94,7 @@ public class PestDiseaseWeedLibraryController { @GetMapping("/export-excel") @Operation(summary = "导出病虫草害库维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:pest-disease-weed-library:export')") + @ApiAccessLog(operateType = EXPORT) public void exportPestDiseaseWeedLibraryExcel(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryPageReqVO.java index a88614c6..1a74c8bb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryRespVO.java index ea8f45a8..3b6eeb12 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibraryRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -61,4 +61,4 @@ public class PestDiseaseWeedLibraryRespVO { private String plotName; @Schema(description = "租户id") 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/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibrarySaveReqVO.java index 77db91f4..31ba0515 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibrarySaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/vo/PestDiseaseWeedLibrarySaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 病虫草害库维护新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java index a660d475..d031cfa6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.pesticideresidueindex.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.module.farm.service.pesticideresidueindex.PesticideResidueIndexService; @@ -40,14 +44,14 @@ public class PesticideResidueIndexController { @PostMapping("/create") @Operation(summary = "创建农残指标") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:create')") + public CommonResult createPesticideResidueIndex(@Valid @RequestBody PesticideResidueIndexSaveReqVO createReqVO) { return success(pesticideResidueIndexService.createPesticideResidueIndex(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新农残指标") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:update')") + public CommonResult updatePesticideResidueIndex(@Valid @RequestBody PesticideResidueIndexSaveReqVO updateReqVO) { pesticideResidueIndexService.updatePesticideResidueIndex(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class PesticideResidueIndexController { @DeleteMapping("/delete") @Operation(summary = "删除农残指标") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:delete')") + public CommonResult deletePesticideResidueIndex(@RequestParam("id") String id) { pesticideResidueIndexService.deletePesticideResidueIndex(id); return success(true); @@ -65,7 +69,7 @@ public class PesticideResidueIndexController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除农残指标") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:delete')") + public CommonResult deletePesticideResidueIndexList(@RequestParam("ids") List ids) { pesticideResidueIndexService.deletePesticideResidueIndexListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class PesticideResidueIndexController { @GetMapping("/get") @Operation(summary = "获得农残指标") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:query')") + public CommonResult getPesticideResidueIndex(@RequestParam("id") String id) { PesticideResidueIndexDO pesticideResidueIndex = pesticideResidueIndexService.getPesticideResidueIndex(id); return success(BeanUtils.toBean(pesticideResidueIndex, PesticideResidueIndexRespVO.class)); @@ -82,7 +86,7 @@ public class PesticideResidueIndexController { @GetMapping("/page") @Operation(summary = "获得农残指标分页") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:query')") + public CommonResult> getPesticideResidueIndexPage(@Valid PesticideResidueIndexPageReqVO pageReqVO) { PageResult pageResult = pesticideResidueIndexService.getPesticideResidueIndexPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PesticideResidueIndexRespVO.class)); @@ -90,7 +94,7 @@ public class PesticideResidueIndexController { @GetMapping("/export-excel") @Operation(summary = "导出农残指标 Excel") - @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:export')") + @ApiAccessLog(operateType = EXPORT) public void exportPesticideResidueIndexExcel(@Valid PesticideResidueIndexPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java index 0cdf6767..d985bc7b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java index 62ac58af..a8d09840 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -53,4 +53,4 @@ public class PesticideResidueIndexRespVO { private String plotName; @Schema(description = "租户id") 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/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java index 5cd85919..e4cc58a8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 农残指标新增/修改 Request VO") @Data 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/plotinfo/PlotInfoController.java index 9f2fc6e7..10bbc378 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/plotinfo/PlotInfoController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.plotinfo; +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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.plotinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; @@ -40,14 +44,14 @@ public class PlotInfoController { @PostMapping("/create") @Operation(summary = "创建地块") - @PreAuthorize("@ss.hasPermission('farm:plot-info:create')") + public CommonResult createPlotInfo(@Valid @RequestBody PlotInfoSaveReqVO createReqVO) { return success(plotInfoService.createPlotInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新地块") - @PreAuthorize("@ss.hasPermission('farm:plot-info:update')") + public CommonResult updatePlotInfo(@Valid @RequestBody PlotInfoSaveReqVO updateReqVO) { plotInfoService.updatePlotInfo(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class PlotInfoController { @DeleteMapping("/delete") @Operation(summary = "删除地块") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:plot-info:delete')") + public CommonResult deletePlotInfo(@RequestParam("id") String id) { plotInfoService.deletePlotInfo(id); return success(true); @@ -65,7 +69,7 @@ public class PlotInfoController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除地块") - @PreAuthorize("@ss.hasPermission('farm:plot-info:delete')") + public CommonResult deletePlotInfoList(@RequestParam("ids") List ids) { plotInfoService.deletePlotInfoListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class PlotInfoController { @GetMapping("/get") @Operation(summary = "获得地块") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:plot-info:query')") + public CommonResult getPlotInfo(@RequestParam("id") String id) { PlotInfoDO plotInfo = plotInfoService.getPlotInfo(id); return success(BeanUtils.toBean(plotInfo, PlotInfoRespVO.class)); @@ -82,7 +86,7 @@ public class PlotInfoController { @GetMapping("/page") @Operation(summary = "获得地块分页") - @PreAuthorize("@ss.hasPermission('farm:plot-info:query')") + public CommonResult> getPlotInfoPage(@Valid PlotInfoPageReqVO pageReqVO) { PageResult pageResult = plotInfoService.getPlotInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PlotInfoRespVO.class)); @@ -90,7 +94,7 @@ public class PlotInfoController { @GetMapping("/export-excel") @Operation(summary = "导出地块 Excel") - @PreAuthorize("@ss.hasPermission('farm:plot-info:export')") + @ApiAccessLog(operateType = EXPORT) public void exportPlotInfoExcel(@Valid PlotInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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/plotinfo/vo/PlotInfoPageReqVO.java index 8f105c3a..6165f844 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/plotinfo/vo/PlotInfoPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; 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/plotinfo/vo/PlotInfoRespVO.java index 504b6c00..0396015a 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/plotinfo/vo/PlotInfoRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -50,4 +50,4 @@ public class PlotInfoRespVO { private LocalDateTime createTime; @Schema(description = "租户id") 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/plotinfo/vo/PlotInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoSaveReqVO.java index 81178ae8..491f3e20 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/plotinfo/vo/PlotInfoSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 地块新增/修改 Request VO") 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 45ad714e..2c34e38f 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 @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.productionplan; +import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.productionplan.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; @@ -40,14 +44,14 @@ public class ProductionPlanController { @PostMapping("/create") @Operation(summary = "创建种植中心-生产计划-生产计划") - @PreAuthorize("@ss.hasPermission('farm:production-plan:create')") + public CommonResult createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) { return success(productionPlanService.createProductionPlan(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新种植中心-生产计划-生产计划") - @PreAuthorize("@ss.hasPermission('farm:production-plan:update')") + public CommonResult updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) { productionPlanService.updateProductionPlan(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ProductionPlanController { @DeleteMapping("/delete") @Operation(summary = "删除种植中心-生产计划-生产计划") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:production-plan:delete')") + public CommonResult deleteProductionPlan(@RequestParam("id") String id) { productionPlanService.deleteProductionPlan(id); return success(true); @@ -65,7 +69,7 @@ public class ProductionPlanController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除种植中心-生产计划-生产计划") - @PreAuthorize("@ss.hasPermission('farm:production-plan:delete')") + public CommonResult deleteProductionPlanList(@RequestParam("ids") List ids) { productionPlanService.deleteProductionPlanListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ProductionPlanController { @GetMapping("/get") @Operation(summary = "获得种植中心-生产计划-生产计划") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:production-plan:query')") + public CommonResult getProductionPlan(@RequestParam("id") String id) { ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id); return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class)); @@ -82,7 +86,7 @@ public class ProductionPlanController { @GetMapping("/page") @Operation(summary = "获得种植中心-生产计划-生产计划分页") - @PreAuthorize("@ss.hasPermission('farm:production-plan:query')") + public CommonResult> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) { PageResult pageResult = productionPlanService.getProductionPlanPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class)); @@ -90,7 +94,7 @@ public class ProductionPlanController { @GetMapping("/export-excel") @Operation(summary = "导出种植中心-生产计划-生产计划 Excel") - @PreAuthorize("@ss.hasPermission('farm:production-plan:export')") + @ApiAccessLog(operateType = EXPORT) public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java index b1429128..4581c1a8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanPageReqVO.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo; import lombok.*; import java.time.LocalDate; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java index ed943df8..7af6f541 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanRespVO.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDate; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -64,4 +64,4 @@ public class ProductionPlanRespVO { @Schema(description = "租户id") 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/productionplan/vo/ProductionPlanSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java index 53e4fde3..d7f0692b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/vo/ProductionPlanSaveReqVO.java @@ -4,8 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDate; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 种植中心-生产计划-生产计划新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java index 577a3718..ad4cdec6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.productmanagement; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.productmanagement.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.module.farm.service.productmanagement.ProductManagementService; @@ -40,14 +44,14 @@ public class ProductManagementController { @PostMapping("/create") @Operation(summary = "创建商品管理") - @PreAuthorize("@ss.hasPermission('farm:product-management:create')") + public CommonResult createProductManagement(@Valid @RequestBody ProductManagementSaveReqVO createReqVO) { return success(productManagementService.createProductManagement(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新商品管理") - @PreAuthorize("@ss.hasPermission('farm:product-management:update')") + public CommonResult updateProductManagement(@Valid @RequestBody ProductManagementSaveReqVO updateReqVO) { productManagementService.updateProductManagement(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class ProductManagementController { @DeleteMapping("/delete") @Operation(summary = "删除商品管理") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:product-management:delete')") + public CommonResult deleteProductManagement(@RequestParam("id") String id) { productManagementService.deleteProductManagement(id); return success(true); @@ -65,7 +69,7 @@ public class ProductManagementController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除商品管理") - @PreAuthorize("@ss.hasPermission('farm:product-management:delete')") + public CommonResult deleteProductManagementList(@RequestParam("ids") List ids) { productManagementService.deleteProductManagementListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class ProductManagementController { @GetMapping("/get") @Operation(summary = "获得商品管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:product-management:query')") + public CommonResult getProductManagement(@RequestParam("id") String id) { ProductManagementDO productManagement = productManagementService.getProductManagement(id); return success(BeanUtils.toBean(productManagement, ProductManagementRespVO.class)); @@ -82,7 +86,7 @@ public class ProductManagementController { @GetMapping("/page") @Operation(summary = "获得商品管理分页") - @PreAuthorize("@ss.hasPermission('farm:product-management:query')") + public CommonResult> getProductManagementPage(@Valid ProductManagementPageReqVO pageReqVO) { PageResult pageResult = productManagementService.getProductManagementPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductManagementRespVO.class)); @@ -90,7 +94,7 @@ public class ProductManagementController { @GetMapping("/export-excel") @Operation(summary = "导出商品管理 Excel") - @PreAuthorize("@ss.hasPermission('farm:product-management:export')") + @ApiAccessLog(operateType = EXPORT) public void exportProductManagementExcel(@Valid ProductManagementPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java index c0904cdf..d430bc7b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java index 99b77d2c..fdd486b8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -82,4 +82,4 @@ public class ProductManagementRespVO { @Schema(description = "租户id") 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/productmanagement/vo/ProductManagementSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java index 45db0621..7ffa818b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 商品管理新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java index 6479f14d..bbbef636 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary; +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 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService; @@ -40,14 +44,14 @@ public class SpeciesLibraryController { @PostMapping("/create") @Operation(summary = "创建物种库维护") - @PreAuthorize("@ss.hasPermission('farm:species-library:create')") + public CommonResult createSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO createReqVO) { return success(speciesLibraryService.createSpeciesLibrary(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物种库维护") - @PreAuthorize("@ss.hasPermission('farm:species-library:update')") + public CommonResult updateSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO updateReqVO) { speciesLibraryService.updateSpeciesLibrary(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class SpeciesLibraryController { @DeleteMapping("/delete") @Operation(summary = "删除物种库维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:species-library:delete')") + public CommonResult deleteSpeciesLibrary(@RequestParam("id") String id) { speciesLibraryService.deleteSpeciesLibrary(id); return success(true); @@ -65,7 +69,7 @@ public class SpeciesLibraryController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物种库维护") - @PreAuthorize("@ss.hasPermission('farm:species-library:delete')") + public CommonResult deleteSpeciesLibraryList(@RequestParam("ids") List ids) { speciesLibraryService.deleteSpeciesLibraryListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class SpeciesLibraryController { @GetMapping("/get") @Operation(summary = "获得物种库维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:species-library:query')") + public CommonResult getSpeciesLibrary(@RequestParam("id") String id) { SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(id); return success(BeanUtils.toBean(speciesLibrary, SpeciesLibraryRespVO.class)); @@ -82,7 +86,7 @@ public class SpeciesLibraryController { @GetMapping("/page") @Operation(summary = "获得物种库维护分页") - @PreAuthorize("@ss.hasPermission('farm:species-library:query')") + public CommonResult> getSpeciesLibraryPage(@Valid SpeciesLibraryPageReqVO pageReqVO) { PageResult pageResult = speciesLibraryService.getSpeciesLibraryPage(pageReqVO); return success(BeanUtils.toBean(pageResult, SpeciesLibraryRespVO.class)); @@ -90,7 +94,7 @@ public class SpeciesLibraryController { @GetMapping("/export-excel") @Operation(summary = "导出物种库维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:species-library:export')") + @ApiAccessLog(operateType = EXPORT) public void exportSpeciesLibraryExcel(@Valid SpeciesLibraryPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java index 89b7691e..61d54a01 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java index d3f71573..8b1e35c4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -66,4 +66,4 @@ public class SpeciesLibraryRespVO { @Schema(description = "租户id") 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/specieslibrary/vo/SpeciesLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java index fb6c4dca..6ff88248 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 物种库维护新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java index a1a0d02c..e972269e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.varietydata; +import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataSaveReqVO; import 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.varietydata.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; import cn.iocoder.yudao.module.farm.service.varietydata.VarietyDataService; @@ -40,14 +44,14 @@ public class VarietyDataController { @PostMapping("/create") @Operation(summary = "创建品种数据") - @PreAuthorize("@ss.hasPermission('farm:variety-data:create')") + public CommonResult createVarietyData(@Valid @RequestBody VarietyDataSaveReqVO createReqVO) { return success(varietyDataService.createVarietyData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新品种数据") - @PreAuthorize("@ss.hasPermission('farm:variety-data:update')") + public CommonResult updateVarietyData(@Valid @RequestBody VarietyDataSaveReqVO updateReqVO) { varietyDataService.updateVarietyData(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class VarietyDataController { @DeleteMapping("/delete") @Operation(summary = "删除品种数据") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:variety-data:delete')") + public CommonResult deleteVarietyData(@RequestParam("id") String id) { varietyDataService.deleteVarietyData(id); return success(true); @@ -65,7 +69,7 @@ public class VarietyDataController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除品种数据") - @PreAuthorize("@ss.hasPermission('farm:variety-data:delete')") + public CommonResult deleteVarietyDataList(@RequestParam("ids") List ids) { varietyDataService.deleteVarietyDataListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class VarietyDataController { @GetMapping("/get") @Operation(summary = "获得品种数据") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:variety-data:query')") + public CommonResult getVarietyData(@RequestParam("id") String id) { VarietyDataDO varietyData = varietyDataService.getVarietyData(id); return success(BeanUtils.toBean(varietyData, VarietyDataRespVO.class)); @@ -82,7 +86,7 @@ public class VarietyDataController { @GetMapping("/page") @Operation(summary = "获得品种数据分页") - @PreAuthorize("@ss.hasPermission('farm:variety-data:query')") + public CommonResult> getVarietyDataPage(@Valid VarietyDataPageReqVO pageReqVO) { PageResult pageResult = varietyDataService.getVarietyDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, VarietyDataRespVO.class)); @@ -90,7 +94,7 @@ public class VarietyDataController { @GetMapping("/export-excel") @Operation(summary = "导出品种数据 Excel") - @PreAuthorize("@ss.hasPermission('farm:variety-data:export')") + @ApiAccessLog(operateType = EXPORT) public void exportVarietyDataExcel(@Valid VarietyDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java index c42be307..4ea3668b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java index d1abb656..d23f9af7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -63,4 +63,4 @@ public class VarietyDataRespVO { @Schema(description = "租户id") 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/varietydata/vo/VarietyDataSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java index 7fe6a3d5..6c59c2a4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java @@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 品种数据新增/修改 Request VO") 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 27749c74..275119fe 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 @@ -1,17 +1,23 @@ package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary; +import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibraryRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibrarySaveReqVO; 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; + import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; + import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -23,9 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 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.weatherdisasterlibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; import cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary.WeatherDisasterLibraryService; @@ -40,14 +44,14 @@ public class WeatherDisasterLibraryController { @PostMapping("/create") @Operation(summary = "创建气象灾害库维护") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:create')") + public CommonResult createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) { return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新气象灾害库维护") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:update')") + public CommonResult updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) { weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO); return success(true); @@ -56,7 +60,7 @@ public class WeatherDisasterLibraryController { @DeleteMapping("/delete") @Operation(summary = "删除气象灾害库维护") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:delete')") + public CommonResult deleteWeatherDisasterLibrary(@RequestParam("id") String id) { weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id); return success(true); @@ -65,7 +69,7 @@ public class WeatherDisasterLibraryController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除气象灾害库维护") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:delete')") + public CommonResult deleteWeatherDisasterLibraryList(@RequestParam("ids") List ids) { weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids); return success(true); @@ -74,7 +78,7 @@ public class WeatherDisasterLibraryController { @GetMapping("/get") @Operation(summary = "获得气象灾害库维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:query')") + public CommonResult getWeatherDisasterLibrary(@RequestParam("id") String id) { WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id); return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class)); @@ -82,7 +86,7 @@ public class WeatherDisasterLibraryController { @GetMapping("/page") @Operation(summary = "获得气象灾害库维护分页") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:query')") + public CommonResult> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) { PageResult pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO); return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class)); @@ -90,7 +94,7 @@ public class WeatherDisasterLibraryController { @GetMapping("/export-excel") @Operation(summary = "导出气象灾害库维护 Excel") - @PreAuthorize("@ss.hasPermission('farm:weather-disaster-library:export')") + @ApiAccessLog(operateType = EXPORT) public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java index ee3856db..b3171f1d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java index b2df3ca5..2685f3c9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -58,4 +58,4 @@ public class WeatherDisasterLibraryRespVO { @Schema(description = "租户id") 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/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java index bcef78c0..0196d90f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java @@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 气象灾害库维护新增/修改 Request VO") @Data diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/baseinfo/BaseInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/baseinfo/BaseInfoDO.java index a03d3c48..587264cd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/baseinfo/BaseInfoDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/baseinfo/BaseInfoDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -46,4 +46,4 @@ public class BaseInfoDO extends BaseDO { private String point; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/companyinfo/CompanyInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/companyinfo/CompanyInfoDO.java index f198a5dd..4ece3a5d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/companyinfo/CompanyInfoDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/companyinfo/CompanyInfoDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -85,4 +85,4 @@ public class CompanyInfoDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cultivationarea/CultivationAreaDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cultivationarea/CultivationAreaDO.java index 70872ce1..4cb5715d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cultivationarea/CultivationAreaDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/cultivationarea/CultivationAreaDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; @@ -64,4 +64,4 @@ public class CultivationAreaDO extends BaseDO { private Boolean delStatus; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java index 2d4baa33..f5b66fcf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @@ -23,7 +24,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @NoArgsConstructor @AllArgsConstructor public class DeviceInfoDO extends BaseDO { - + private String id; /** * 设备全局唯一标识 */ @@ -155,4 +156,4 @@ public class DeviceInfoDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceplotrelation/DevicePlotRelationDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceplotrelation/DevicePlotRelationDO.java index 3e1b9344..010001e7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceplotrelation/DevicePlotRelationDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceplotrelation/DevicePlotRelationDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -69,4 +69,4 @@ public class DevicePlotRelationDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java index 702330e2..5f5e1965 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -65,4 +65,4 @@ public class DisasterDataDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindexconfig/EnvironmentIndexConfigDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindexconfig/EnvironmentIndexConfigDO.java index 96ae2835..2d8a7d05 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindexconfig/EnvironmentIndexConfigDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindexconfig/EnvironmentIndexConfigDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -61,4 +61,4 @@ public class EnvironmentIndexConfigDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingnamemaintenance/FarmingNameMaintenanceDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingnamemaintenance/FarmingNameMaintenanceDO.java index b3383c84..0b97e664 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingnamemaintenance/FarmingNameMaintenanceDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingnamemaintenance/FarmingNameMaintenanceDO.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance; import lombok.*; -import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -60,4 +59,4 @@ public class FarmingNameMaintenanceDO extends BaseDO { private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java index 6aafb901..53542fcd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -90,4 +90,4 @@ public class FarmingRecordDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java index 79053f5a..4ed1bbfb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -91,4 +91,4 @@ public class FarmingRecordInputDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingtypemaintenance/FarmingTypeMaintenanceDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingtypemaintenance/FarmingTypeMaintenanceDO.java index 2f3aba8b..70224b42 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingtypemaintenance/FarmingTypeMaintenanceDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingtypemaintenance/FarmingTypeMaintenanceDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -53,4 +53,4 @@ public class FarmingTypeMaintenanceDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/fertilizerindex/FertilizerIndexDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/fertilizerindex/FertilizerIndexDO.java index 75bfc15d..6825acd1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/fertilizerindex/FertilizerIndexDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/fertilizerindex/FertilizerIndexDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -61,4 +61,4 @@ public class FertilizerIndexDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/foundationinfo/FoundationInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/foundationinfo/FoundationInfoDO.java index ce1c4efa..25bf65c7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/foundationinfo/FoundationInfoDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/foundationinfo/FoundationInfoDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -65,4 +65,4 @@ public class FoundationInfoDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/inputlibrary/InputLibraryDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/inputlibrary/InputLibraryDO.java index e1808336..a703b52a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/inputlibrary/InputLibraryDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/inputlibrary/InputLibraryDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -103,4 +103,4 @@ public class InputLibraryDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/messagecenter/MessageCenterDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/messagecenter/MessageCenterDO.java index a1b7b924..bb855984 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/messagecenter/MessageCenterDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/messagecenter/MessageCenterDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -74,4 +74,4 @@ public class MessageCenterDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java index 9c346e00..a9efbe5b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -65,4 +65,4 @@ public class ModelCycleDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java index 1a45e41c..4447e370 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -71,4 +71,4 @@ public class ModelEnvironmentIndexDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java index e49b1355..dde844b9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -73,4 +73,4 @@ public class ModelFarmingOperationDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java index adf7dc3f..5d429cbc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -70,4 +70,4 @@ public class ModelFarmingOperationInputDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java index 8d94407b..514692fd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -65,4 +65,4 @@ public class ModelPestDiseaseWeedDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java index 6ccb96a3..8ecd7aee 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -65,4 +65,4 @@ public class ModelWeatherDisasterDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/PersonnelManagementDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/PersonnelManagementDO.java index d0708ba0..781a6b37 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/PersonnelManagementDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/PersonnelManagementDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -69,4 +69,4 @@ public class PersonnelManagementDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pestdiseaseweedlibrary/PestDiseaseWeedLibraryDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pestdiseaseweedlibrary/PestDiseaseWeedLibraryDO.java index aea5bd81..2741c789 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pestdiseaseweedlibrary/PestDiseaseWeedLibraryDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pestdiseaseweedlibrary/PestDiseaseWeedLibraryDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -69,4 +69,4 @@ public class PestDiseaseWeedLibraryDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pesticideresidueindex/PesticideResidueIndexDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pesticideresidueindex/PesticideResidueIndexDO.java index 34a42e84..f44ca41c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pesticideresidueindex/PesticideResidueIndexDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/pesticideresidueindex/PesticideResidueIndexDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -61,4 +61,4 @@ public class PesticideResidueIndexDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java index aef020d2..2651a6c2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -58,4 +58,4 @@ public class PlotInfoDO extends BaseDO { private String employeeId; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productionplan/ProductionPlanDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productionplan/ProductionPlanDO.java index 628e8a0f..bed560d2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productionplan/ProductionPlanDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productionplan/ProductionPlanDO.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.productionplan; import lombok.*; import java.time.LocalDate; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -71,4 +71,4 @@ public class ProductionPlanDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java index bd253592..49d72790 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -88,5 +88,4 @@ public class ProductManagementDO extends BaseDO { */ private String plotName; - } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/specieslibrary/SpeciesLibraryDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/specieslibrary/SpeciesLibraryDO.java index 779c7a86..8cdb28ee 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/specieslibrary/SpeciesLibraryDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/specieslibrary/SpeciesLibraryDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -73,4 +73,4 @@ public class SpeciesLibraryDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/varietydata/VarietyDataDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/varietydata/VarietyDataDO.java index 39fbba45..30b7bd58 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/varietydata/VarietyDataDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/varietydata/VarietyDataDO.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.varietydata; import lombok.*; -import java.util.*; import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; @@ -74,4 +73,4 @@ public class VarietyDataDO extends BaseDO { private String plotName; private String tenantId; -} +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/weatherdisasterlibrary/WeatherDisasterLibraryDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/weatherdisasterlibrary/WeatherDisasterLibraryDO.java index 295b2994..d49fdadf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/weatherdisasterlibrary/WeatherDisasterLibraryDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/weatherdisasterlibrary/WeatherDisasterLibraryDO.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary; import lombok.*; -import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -67,4 +66,4 @@ public class WeatherDisasterLibraryDO extends BaseDO { private String plotName; private String tenantId; -} +} \ 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 185fb710..bf41109b 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.baseinfo; -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.baseinfo.vo.BaseInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*; /** * 基地 Mapper 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 10421e72..67c8c163 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.companyinfo; -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.companyinfo.vo.CompanyInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.*; /** * 企业信息 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cultivationarea/CultivationAreaMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cultivationarea/CultivationAreaMapper.java index 9def6290..e74b0b1c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cultivationarea/CultivationAreaMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/cultivationarea/CultivationAreaMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.cultivationarea; -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.cultivationarea.vo.CultivationAreaPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.*; /** * 种植区域 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceinfo/DeviceInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceinfo/DeviceInfoMapper.java index 2d63de44..ccec91a3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceinfo/DeviceInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceinfo/DeviceInfoMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.deviceinfo; -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.deviceinfo.vo.DeviceInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.*; /** * 设备信息 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceplotrelation/DevicePlotRelationMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceplotrelation/DevicePlotRelationMapper.java index 54abfd4b..c4d245e3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceplotrelation/DevicePlotRelationMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceplotrelation/DevicePlotRelationMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.deviceplotrelation; -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.deviceplotrelation.vo.DevicePlotRelationPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.*; /** * 设备与地块关联 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java index 5924f7a9..7897f279 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.disasterdata; -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.disasterdata.vo.DisasterDataPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.*; /** * 灾害数据 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java index aaa38aa3..1f8efa6f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.environmentindexconfig; -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.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.*; /** * 环境指标配置 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java index 727d4519..f70ddf3c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance; -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.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.*; /** * 农事名称维护 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 4fa3a4a3..b8046173 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord; -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.farmingrecord.vo.FarmingRecordPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.*; /** * 种植中心-农事基地-农事记录 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java index f09cbe3c..53266694 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput; -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.farmingrecordinput.vo.FarmingRecordInputPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.*; /** * 种植中心-农事基地-农事记录-投入品 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java index c07cec54..ff4e89eb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance; -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.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.*; /** * 农事类型维护 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java index 14e947fd..69041976 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.fertilizerindex; -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.fertilizerindex.vo.FertilizerIndexPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.*; /** * 化肥指标 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java index 62744d33..2f409233 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo; -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.foundationinfo.vo.FoundationInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.*; /** * 基础信息 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java index ea032663..87cc635e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary; -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.inputlibrary.vo.InputLibraryPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.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 66f7eb0d..f4ff2c61 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.messagecenter; -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.messagecenter.vo.MessageCenterPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.*; /** * 消息中心 Mapper 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 4af6212d..87c8e477 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelcycle; -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.modelcycle.vo.ModelCyclePageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.*; /** * 模型管理-管理周期 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 485668a8..f5a75be2 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex; -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.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.*; /** * 模型管理-环境指标 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 5bfaf684..92e0c5ac 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation; -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.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.*; /** * 模型管理-农事操作 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 089b9b94..7b012560 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput; -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.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.*; /** * 模型管理-农事操作-已选择投入品列 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 f8277645..f6cab0d4 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed; -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.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.*; /** * 模型管理-病虫草害 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 16c3cf5a..e9dbd23a 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster; -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.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.*; /** * 模型管理-气象灾害 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 46f17f56..de7e239a 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement; -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.personnelmanagement.vo.PersonnelManagementPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.*; /** * 人员管理 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pestdiseaseweedlibrary/PestDiseaseWeedLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pestdiseaseweedlibrary/PestDiseaseWeedLibraryMapper.java index 817de076..7ad2ba34 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pestdiseaseweedlibrary/PestDiseaseWeedLibraryMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pestdiseaseweedlibrary/PestDiseaseWeedLibraryMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.pestdiseaseweedlibrary; -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.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.*; /** * 病虫草害库维护 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java index 8103034a..68947a9e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.pesticideresidueindex; -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.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.*; /** * 农残指标 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 c1a4750f..7b3b660c 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.plotinfo; -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.plotinfo.vo.PlotInfoPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.*; /** * 地块 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 28243593..eccde486 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 @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.productionplan; -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.productionplan.vo.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.*; /** * 种植中心-生产计划-生产计划 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java index 17ba937d..7d8fec7a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.productmanagement; -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.productmanagement.vo.ProductManagementPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.*; /** * 商品管理 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java index 6b4dd5c0..fc156db5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary; -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.SpeciesLibraryPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; /** * 物种库维护 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java index 1ee44989..5906db2b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/varietydata/VarietyDataMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.varietydata; -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.varietydata.vo.VarietyDataPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.*; /** * 品种数据 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/weatherdisasterlibrary/WeatherDisasterLibraryMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/weatherdisasterlibrary/WeatherDisasterLibraryMapper.java index c9c75302..b04917d6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/weatherdisasterlibrary/WeatherDisasterLibraryMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/weatherdisasterlibrary/WeatherDisasterLibraryMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.mysql.weatherdisasterlibrary; -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.weatherdisasterlibrary.vo.WeatherDisasterLibraryPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.*; /** * 气象灾害库维护 Mapper diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java index b809f0db..dd2b1a88 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java @@ -99,4 +99,4 @@ public interface ErrorCodeConstants { // ========== 消息中心 1-050-029-000 ========== ErrorCode MESSAGE_CENTER_NOT_EXISTS = new ErrorCode(1_050_029_000, "消息中心信息不存在"); -} +} \ 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 4e9bdfaf..af6d9298 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 @@ -60,8 +60,7 @@ public class BaseInfoServiceImpl implements BaseInfoService { baseInfoMapper.deleteByIds(ids); } - - private void validateBaseInfoExists(String id) { +private void validateBaseInfoExists(String id) { if (baseInfoMapper.selectById(id) == null) { throw exception(BASE_INFO_NOT_EXISTS); } 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 22bbe7ca..963ec453 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 @@ -60,8 +60,7 @@ public class CompanyInfoServiceImpl implements CompanyInfoService { companyInfoMapper.deleteByIds(ids); } - - private void validateCompanyInfoExists(String id) { +private void validateCompanyInfoExists(String id) { if (companyInfoMapper.selectById(id) == null) { throw exception(COMPANY_INFO_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaService.java index 9d1fbe08..6cee38fa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.cultivationarea; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 种植区域 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaServiceImpl.java index 2b8e2da2..9405f251 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cultivationarea/CultivationAreaServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.cultivationarea; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo.CultivationAreaSaveReqVO; 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.cultivationarea.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.cultivationarea.CultivationAreaMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.CULTIVATION_AREA_NOT_EXISTS; /** * 种植区域 Service 实现类 @@ -65,8 +67,7 @@ public class CultivationAreaServiceImpl implements CultivationAreaService { cultivationAreaMapper.deleteByIds(ids); } - - private void validateCultivationAreaExists(String id) { +private void validateCultivationAreaExists(String id) { if (cultivationAreaMapper.selectById(id) == null) { throw exception(CULTIVATION_AREA_NOT_EXISTS); } 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 464a15f1..288a13ef 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 @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.deviceinfo; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.*; +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.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 设备信息 Service 接口 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 a4daff37..229a99ad 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.deviceinfo; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO; 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.deviceinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.deviceinfo.DeviceInfoMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.DEVICE_INFO_NOT_EXISTS; /** * 设备信息 Service 实现类 @@ -65,8 +67,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { deviceInfoMapper.deleteByIds(ids); } - - private void validateDeviceInfoExists(String id) { +private void validateDeviceInfoExists(String id) { if (deviceInfoMapper.selectById(id) == null) { throw exception(DEVICE_INFO_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationService.java index 27db8720..503d081c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.deviceplotrelation; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 设备与地块关联 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationServiceImpl.java index 944d4034..ca3907dd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceplotrelation/DevicePlotRelationServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.deviceplotrelation; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo.DevicePlotRelationSaveReqVO; 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.deviceplotrelation.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.deviceplotrelation.DevicePlotRelationMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.DEVICE_PLOT_RELATION_NOT_EXISTS; /** * 设备与地块关联 Service 实现类 @@ -65,8 +67,7 @@ public class DevicePlotRelationServiceImpl implements DevicePlotRelationService devicePlotRelationMapper.deleteByIds(ids); } - - private void validateDevicePlotRelationExists(String id) { +private void validateDevicePlotRelationExists(String id) { if (devicePlotRelationMapper.selectById(id) == null) { throw exception(DEVICE_PLOT_RELATION_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java index 19d12d6a..44b7eebe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.disasterdata; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 灾害数据 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java index be6256b5..a0005776 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.disasterdata; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO; 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.disasterdata.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.DISASTER_DATA_NOT_EXISTS; /** * 灾害数据 Service 实现类 @@ -65,8 +67,7 @@ public class DisasterDataServiceImpl implements DisasterDataService { disasterDataMapper.deleteByIds(ids); } - - private void validateDisasterDataExists(String id) { +private void validateDisasterDataExists(String id) { if (disasterDataMapper.selectById(id) == null) { throw exception(DISASTER_DATA_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java index 0efd53bb..503c4db7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.environmentindexconfig; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 环境指标配置 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java index ca12965b..4d782992 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/environmentindexconfig/EnvironmentIndexConfigServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.environmentindexconfig; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO; 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.environmentindexconfig.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.environmentindexconfig.EnvironmentIndexConfigMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.ENVIRONMENT_INDEX_CONFIG_NOT_EXISTS; /** * 环境指标配置 Service 实现类 @@ -65,8 +67,7 @@ public class EnvironmentIndexConfigServiceImpl implements EnvironmentIndexConfig environmentIndexConfigMapper.deleteByIds(ids); } - - private void validateEnvironmentIndexConfigExists(String id) { +private void validateEnvironmentIndexConfigExists(String id) { if (environmentIndexConfigMapper.selectById(id) == null) { throw exception(ENVIRONMENT_INDEX_CONFIG_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java index cb106004..2ed3e80b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingnamemaintenance/FarmingNameMaintenanceService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingnamemaintenance; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 农事名称维护 Service 接口 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 7440f0ab..189114d2 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 @@ -60,8 +60,7 @@ public class FarmingNameMaintenanceServiceImpl implements FarmingNameMaintenance farmingNameMaintenanceMapper.deleteByIds(ids); } - - private void validateFarmingNameMaintenanceExists(String id) { +private void validateFarmingNameMaintenanceExists(String id) { if (farmingNameMaintenanceMapper.selectById(id) == null) { throw exception(FARMING_NAME_MAINTENANCE_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java index dadd3f84..7b9b5c50 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingrecord; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 种植中心-农事基地-农事记录 Service 接口 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 f9da330a..84ad423f 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 @@ -60,8 +60,7 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { farmingRecordMapper.deleteByIds(ids); } - - private void validateFarmingRecordExists(String id) { +private void validateFarmingRecordExists(String id) { if (farmingRecordMapper.selectById(id) == null) { throw exception(FARMING_RECORD_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java index 75c1dae1..6c6df5ab 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingrecordinput; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 种植中心-农事基地-农事记录-投入品 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java index 88ca7e1e..850001a7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecordinput/FarmingRecordInputServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingrecordinput; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_RECORD_INPUT_NOT_EXISTS; /** * 种植中心-农事基地-农事记录-投入品 Service 实现类 @@ -65,8 +67,7 @@ public class FarmingRecordInputServiceImpl implements FarmingRecordInputService farmingRecordInputMapper.deleteByIds(ids); } - - private void validateFarmingRecordInputExists(String id) { +private void validateFarmingRecordInputExists(String id) { if (farmingRecordInputMapper.selectById(id) == null) { throw exception(FARMING_RECORD_INPUT_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java index 6868d156..84d01308 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingtypemaintenance; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 农事类型维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java index d106593d..e724ada4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingtypemaintenance/FarmingTypeMaintenanceServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.farmingtypemaintenance; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO; 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.farmingtypemaintenance.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance.FarmingTypeMaintenanceMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FARMING_TYPE_MAINTENANCE_NOT_EXISTS; /** * 农事类型维护 Service 实现类 @@ -65,8 +67,7 @@ public class FarmingTypeMaintenanceServiceImpl implements FarmingTypeMaintenance farmingTypeMaintenanceMapper.deleteByIds(ids); } - - private void validateFarmingTypeMaintenanceExists(String id) { +private void validateFarmingTypeMaintenanceExists(String id) { if (farmingTypeMaintenanceMapper.selectById(id) == null) { throw exception(FARMING_TYPE_MAINTENANCE_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java index a7317cf4..0a58ec78 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.fertilizerindex; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 化肥指标 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java index 9c4c79e9..c6e59444 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.fertilizerindex; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO; 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.fertilizerindex.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.fertilizerindex.FertilizerIndexMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FERTILIZER_INDEX_NOT_EXISTS; /** * 化肥指标 Service 实现类 @@ -65,8 +67,7 @@ public class FertilizerIndexServiceImpl implements FertilizerIndexService { fertilizerIndexMapper.deleteByIds(ids); } - - private void validateFertilizerIndexExists(String id) { +private void validateFertilizerIndexExists(String id) { if (fertilizerIndexMapper.selectById(id) == null) { throw exception(FERTILIZER_INDEX_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java index f195c699..de3f7ef0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.foundationinfo; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 基础信息 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java index fc27f2a7..4b7ea340 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.foundationinfo; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; 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.foundationinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.FoundationInfoMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.FOUNDATION_INFO_NOT_EXISTS; /** * 基础信息 Service 实现类 @@ -65,8 +67,7 @@ public class FoundationInfoServiceImpl implements FoundationInfoService { foundationInfoMapper.deleteByIds(ids); } - - private void validateFoundationInfoExists(String id) { +private void validateFoundationInfoExists(String id) { if (foundationInfoMapper.selectById(id) == null) { throw exception(FOUNDATION_INFO_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java index bab8196a..75b8dee6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.inputlibrary; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 投入品库维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java index 2bbdca5f..4249c9f7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/inputlibrary/InputLibraryServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.inputlibrary; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO; 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.inputlibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary.InputLibraryMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.INPUT_LIBRARY_NOT_EXISTS; /** * 投入品库维护 Service 实现类 @@ -65,8 +67,7 @@ public class InputLibraryServiceImpl implements InputLibraryService { inputLibraryMapper.deleteByIds(ids); } - - private void validateInputLibraryExists(String id) { +private void validateInputLibraryExists(String id) { if (inputLibraryMapper.selectById(id) == null) { throw exception(INPUT_LIBRARY_NOT_EXISTS); } 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 bdc11feb..bf426f66 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.messagecenter; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.*; +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.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 消息中心 Service 接口 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 c60304d7..df1d7160 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.messagecenter; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO; 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.messagecenter.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.messagecenter.MessageCenterMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MESSAGE_CENTER_NOT_EXISTS; /** * 消息中心 Service 实现类 @@ -65,8 +67,7 @@ public class MessageCenterServiceImpl implements MessageCenterService { messageCenterMapper.deleteByIds(ids); } - - private void validateMessageCenterExists(String id) { +private void validateMessageCenterExists(String id) { if (messageCenterMapper.selectById(id) == null) { throw exception(MESSAGE_CENTER_NOT_EXISTS); } 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 ad0f5f94..7346eb5f 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelcycle; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.*; +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.dal.dataobject.modelcycle.ModelCycleDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 模型管理-管理周期 Service 接口 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 f2767937..e0439224 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,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelcycle; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.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 java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.*; 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; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.modelcycle.ModelCycleMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_CYCLE_NOT_EXISTS; /** * 模型管理-管理周期 Service 实现类 @@ -65,8 +67,7 @@ public class ModelCycleServiceImpl implements ModelCycleService { modelCycleMapper.deleteByIds(ids); } - - private void validateModelCycleExists(String id) { +private void validateModelCycleExists(String id) { if (modelCycleMapper.selectById(id) == null) { throw exception(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 4aaec290..a5a7ef6a 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelenvironmentindex; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.*; +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.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; /** * 模型管理-环境指标 Service 接口 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 375a7a0f..9e638429 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelenvironmentindex; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; 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.modelenvironmentindex.vo.*; 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; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex.ModelEnvironmentIndexMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_ENVIRONMENT_INDEX_NOT_EXISTS; /** * 模型管理-环境指标 Service 实现类 @@ -65,8 +67,7 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe modelEnvironmentIndexMapper.deleteByIds(ids); } - - private void validateModelEnvironmentIndexExists(String id) { +private void validateModelEnvironmentIndexExists(String id) { if (modelEnvironmentIndexMapper.selectById(id) == null) { throw exception(MODEL_ENVIRONMENT_INDEX_NOT_EXISTS); } 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 79e6a4d0..3a64f353 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,13 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperation; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.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; /** * 模型管理-农事操作 Service 接口 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 01a8cc23..66e0eb21 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 @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperation; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.*; -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 cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation.ModelFarmingOperationMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_FARMING_OPERATION_NOT_EXISTS; /** * 模型管理-农事操作 Service 实现类 @@ -65,8 +60,7 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe modelFarmingOperationMapper.deleteByIds(ids); } - - private void validateModelFarmingOperationExists(String id) { +private void validateModelFarmingOperationExists(String id) { if (modelFarmingOperationMapper.selectById(id) == null) { throw exception(MODEL_FARMING_OPERATION_NOT_EXISTS); } 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 a2927142..db32eab0 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperationinput; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.*; +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.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; /** * 模型管理-农事操作-已选择投入品列 Service 接口 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 0d78c18f..3350f1b2 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 @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.modelfarmingoperationinput; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.*; -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 cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +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.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFarmingOperationInputMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_FARMING_OPERATION_INPUT_NOT_EXISTS; /** * 模型管理-农事操作-已选择投入品列 Service 实现类 @@ -65,8 +60,7 @@ public class ModelFarmingOperationInputServiceImpl implements ModelFarmingOperat modelFarmingOperationInputMapper.deleteByIds(ids); } - - private void validateModelFarmingOperationInputExists(String id) { +private void validateModelFarmingOperationInputExists(String id) { if (modelFarmingOperationInputMapper.selectById(id) == null) { throw exception(MODEL_FARMING_OPERATION_INPUT_NOT_EXISTS); } 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 9dcc052a..1e544d4e 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelpestdiseaseweed; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.*; +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.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; /** * 模型管理-病虫草害 Service 接口 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 6af510da..e9743959 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 @@ -1,24 +1,19 @@ package cn.iocoder.yudao.module.farm.service.modelpestdiseaseweed; -import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.*; -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 cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +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.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed.ModelPestDiseaseWeedMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_PEST_DISEASE_WEED_NOT_EXISTS; /** * 模型管理-病虫草害 Service 实现类 @@ -65,8 +60,7 @@ public class ModelPestDiseaseWeedServiceImpl implements ModelPestDiseaseWeedServ modelPestDiseaseWeedMapper.deleteByIds(ids); } - - private void validateModelPestDiseaseWeedExists(String id) { +private void validateModelPestDiseaseWeedExists(String id) { if (modelPestDiseaseWeedMapper.selectById(id) == null) { throw exception(MODEL_PEST_DISEASE_WEED_NOT_EXISTS); } 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 ac6664d6..a4ace7b5 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelweatherdisaster; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.*; +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.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; /** * 模型管理-气象灾害 Service 接口 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 ba183d32..4eb96023 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.modelweatherdisaster; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; 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.modelweatherdisaster.vo.*; 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; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherDisasterMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_WEATHER_DISASTER_NOT_EXISTS; /** * 模型管理-气象灾害 Service 实现类 @@ -65,8 +67,7 @@ public class ModelWeatherDisasterServiceImpl implements ModelWeatherDisasterServ modelWeatherDisasterMapper.deleteByIds(ids); } - - private void validateModelWeatherDisasterExists(String id) { +private void validateModelWeatherDisasterExists(String id) { if (modelWeatherDisasterMapper.selectById(id) == null) { throw exception(MODEL_WEATHER_DISASTER_NOT_EXISTS); } 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 39ee0c82..5887de3e 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.personnelmanagement; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.*; +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.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 人员管理 Service 接口 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 45fb4abc..a515e7d6 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.personnelmanagement; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; 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.personnelmanagement.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManagementMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PERSONNEL_MANAGEMENT_NOT_EXISTS; /** * 人员管理 Service 实现类 @@ -65,8 +67,7 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic personnelManagementMapper.deleteByIds(ids); } - - private void validatePersonnelManagementExists(String id) { +private void validatePersonnelManagementExists(String id) { if (personnelManagementMapper.selectById(id) == null) { throw exception(PERSONNEL_MANAGEMENT_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryService.java index 014b4a07..e39075a9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibrarySaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 病虫草害库维护 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryServiceImpl.java index bb9fcb75..a5dd0857 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pestdiseaseweedlibrary/PestDiseaseWeedLibraryServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibraryPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pestdiseaseweedlibrary.vo.PestDiseaseWeedLibrarySaveReqVO; 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.pestdiseaseweedlibrary.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.pestdiseaseweedlibrary.PestDiseaseWeedLibraryMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PEST_DISEASE_WEED_LIBRARY_NOT_EXISTS; /** * 病虫草害库维护 Service 实现类 @@ -65,8 +67,7 @@ public class PestDiseaseWeedLibraryServiceImpl implements PestDiseaseWeedLibrary pestDiseaseWeedLibraryMapper.deleteByIds(ids); } - - private void validatePestDiseaseWeedLibraryExists(String id) { +private void validatePestDiseaseWeedLibraryExists(String id) { if (pestDiseaseWeedLibraryMapper.selectById(id) == null) { throw exception(PEST_DISEASE_WEED_LIBRARY_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java index dcc51dc4..aed3c4fc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.pesticideresidueindex; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 农残指标 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java index 94784003..b0dba75d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/pesticideresidueindex/PesticideResidueIndexServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.pesticideresidueindex; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.pesticideresidueindex.PesticideResidueIndexMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PESTICIDE_RESIDUE_INDEX_NOT_EXISTS; /** * 农残指标 Service 实现类 @@ -65,8 +67,7 @@ public class PesticideResidueIndexServiceImpl implements PesticideResidueIndexSe pesticideResidueIndexMapper.deleteByIds(ids); } - - private void validatePesticideResidueIndexExists(String id) { +private void validatePesticideResidueIndexExists(String id) { if (pesticideResidueIndexMapper.selectById(id) == null) { throw exception(PESTICIDE_RESIDUE_INDEX_NOT_EXISTS); } 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 8d108fd1..330f4a03 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,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.plotinfo; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.*; +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.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 地块 Service 接口 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 d68269d0..3bbfbf36 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.plotinfo; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO; 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.plotinfo.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.plotinfo.PlotInfoMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PLOT_INFO_NOT_EXISTS; /** * 地块 Service 实现类 @@ -65,8 +67,7 @@ public class PlotInfoServiceImpl implements PlotInfoService { plotInfoMapper.deleteByIds(ids); } - - private void validatePlotInfoExists(String id) { +private void validatePlotInfoExists(String id) { if (plotInfoMapper.selectById(id) == null) { throw exception(PLOT_INFO_NOT_EXISTS); } 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 28a56b67..d6b59fa9 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 @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.productionplan; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.*; +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; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 种植中心-生产计划-生产计划 Service 接口 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 7e11a15e..a4d1cef1 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 @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.productionplan; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.productionplan.vo.ProductionPlanSaveReqVO; 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.productionplan.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PRODUCTION_PLAN_NOT_EXISTS; /** * 种植中心-生产计划-生产计划 Service 实现类 @@ -65,8 +67,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { productionPlanMapper.deleteByIds(ids); } - - private void validateProductionPlanExists(String id) { +private void validateProductionPlanExists(String id) { if (productionPlanMapper.selectById(id) == null) { throw exception(PRODUCTION_PLAN_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java index 043f995c..6ac2dd8b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.service.productmanagement; -import java.util.*; -import jakarta.validation.*; -import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.*; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import jakarta.validation.Valid; + +import java.util.List; /** * 商品管理 Service 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java index 23ccff9d..4087507c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productmanagement/ProductManagementServiceImpl.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.farm.service.productmanagement; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO; 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.productmanagement.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -15,10 +15,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.dal.mysql.productmanagement.ProductManagementMapper; +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.module.farm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PRODUCT_MANAGEMENT_NOT_EXISTS; /** * 商品管理 Service 实现类 @@ -65,8 +67,7 @@ public class ProductManagementServiceImpl implements ProductManagementService { productManagementMapper.deleteByIds(ids); } - - private void validateProductManagementExists(String id) { +private void validateProductManagementExists(String id) { if (productManagementMapper.selectById(id) == null) { throw exception(PRODUCT_MANAGEMENT_NOT_EXISTS); } 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 5c1e6144..2db132e4 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 @@ -60,8 +60,7 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService { speciesLibraryMapper.deleteByIds(ids); } - - private void validateSpeciesLibraryExists(String id) { +private void validateSpeciesLibraryExists(String id) { if (speciesLibraryMapper.selectById(id) == null) { throw exception(SPECIES_LIBRARY_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java index 4d8b95e5..dc3d015e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/varietydata/VarietyDataServiceImpl.java @@ -60,8 +60,7 @@ public class VarietyDataServiceImpl implements VarietyDataService { varietyDataMapper.deleteByIds(ids); } - - private void validateVarietyDataExists(String id) { +private void validateVarietyDataExists(String id) { if (varietyDataMapper.selectById(id) == null) { throw exception(VARIETY_DATA_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java index 70d1e965..401964a5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/weatherdisasterlibrary/WeatherDisasterLibraryServiceImpl.java @@ -60,8 +60,7 @@ public class WeatherDisasterLibraryServiceImpl implements WeatherDisasterLibrary weatherDisasterLibraryMapper.deleteByIds(ids); } - - private void validateWeatherDisasterLibraryExists(String id) { +private void validateWeatherDisasterLibraryExists(String id) { if (weatherDisasterLibraryMapper.selectById(id) == null) { throw exception(WEATHER_DISASTER_LIBRARY_NOT_EXISTS); }