farm模块-修复空包引入，类型错误

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<String> createBaseInfo(@Valid @RequestBody BaseInfoSaveReqVO createReqVO) {
         return success(baseInfoService.createBaseInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新基地")
-    @PreAuthorize("@ss.hasPermission('farm:base-info:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteBaseInfoList(@RequestParam("ids") List<String> 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<BaseInfoRespVO> 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<PageResult<BaseInfoRespVO>> getBaseInfoPage(@Valid BaseInfoPageReqVO pageReqVO) {
         PageResult<BaseInfoDO> 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 {

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;

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;

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")

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<String> createCompanyInfo(@Valid @RequestBody CompanyInfoSaveReqVO createReqVO) {
         return success(companyInfoService.createCompanyInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新企业信息")
-    @PreAuthorize("@ss.hasPermission('farm:company-info:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteCompanyInfoList(@RequestParam("ids") List<String> 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<CompanyInfoRespVO> 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<PageResult<CompanyInfoRespVO>> getCompanyInfoPage(@Valid CompanyInfoPageReqVO pageReqVO) {
         PageResult<CompanyInfoDO> 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 {

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;

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.*;

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

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<String> createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) {
         return success(cultivationAreaService.createCultivationArea(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新种植区域")
-    @PreAuthorize("@ss.hasPermission('farm:cultivation-area:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteCultivationAreaList(@RequestParam("ids") List<String> 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<CultivationAreaRespVO> 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<PageResult<CultivationAreaRespVO>> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) {
         PageResult<CultivationAreaDO> 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 {

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;

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;

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")

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<String> createDeviceInfo(@Valid @RequestBody DeviceInfoSaveReqVO createReqVO) {
         return success(deviceInfoService.createDeviceInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新设备信息")
-    @PreAuthorize("@ss.hasPermission('farm:device-info:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteDeviceInfoList(@RequestParam("ids") List<String> 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<DeviceInfoRespVO> 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<PageResult<DeviceInfoRespVO>> getDeviceInfoPage(@Valid DeviceInfoPageReqVO pageReqVO) {
         PageResult<DeviceInfoDO> 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 {

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;

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.*;

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;
 

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<String> createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) {
         return success(devicePlotRelationService.createDevicePlotRelation(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新设备与地块关联")
-    @PreAuthorize("@ss.hasPermission('farm:device-plot-relation:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteDevicePlotRelationList(@RequestParam("ids") List<String> 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<DevicePlotRelationRespVO> 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<PageResult<DevicePlotRelationRespVO>> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) {
         PageResult<DevicePlotRelationDO> 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 {

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;

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.*;

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

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<String> createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) {
         return success(disasterDataService.createDisasterData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新灾害数据")
-    @PreAuthorize("@ss.hasPermission('farm:disaster-data:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteDisasterDataList(@RequestParam("ids") List<String> 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<DisasterDataRespVO> 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<PageResult<DisasterDataRespVO>> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) {
         PageResult<DisasterDataDO> 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 {

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;

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.*;

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

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<String> createEnvironmentIndexConfig(@Valid @RequestBody EnvironmentIndexConfigSaveReqVO createReqVO) {
         return success(environmentIndexConfigService.createEnvironmentIndexConfig(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新环境指标配置")
-    @PreAuthorize("@ss.hasPermission('farm:environment-index-config:update')")
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteEnvironmentIndexConfigList(@RequestParam("ids") List<String> 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<EnvironmentIndexConfigRespVO> 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<PageResult<EnvironmentIndexConfigRespVO>> getEnvironmentIndexConfigPage(@Valid EnvironmentIndexConfigPageReqVO pageReqVO) {
         PageResult<EnvironmentIndexConfigDO> 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 {

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;

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.*;

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

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<String> createingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) {
+    public CommonResult<String> createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) {
-        return success(ingNameMaintenanceService.createingNameMaintenance(createReqVO));
+        return success(farmingNameMaintenanceService.createFarmingNameMaintenance(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新农事名称维护")
-    @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:update')")
+    public CommonResult<Boolean> updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) {
-    public CommonResult<Boolean> updateingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) {
+        farmingNameMaintenanceService.updateFarmingNameMaintenance(updateReqVO);
-        ingNameMaintenanceService.updateingNameMaintenance(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除农事名称维护")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:delete')")
+    public CommonResult<Boolean> deleteFarmingNameMaintenance(@RequestParam("id") String id) {
-    public CommonResult<Boolean> deleteingNameMaintenance(@RequestParam("id") String id) {
+        farmingNameMaintenanceService.deleteFarmingNameMaintenance(id);
-        ingNameMaintenanceService.deleteingNameMaintenance(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<Boolean> deleteFarmingNameMaintenanceList(@RequestParam("ids") List<String> ids) {
-    public CommonResult<Boolean> deleteingNameMaintenanceList(@RequestParam("ids") List<String> ids) {
+        farmingNameMaintenanceService.deleteFarmingNameMaintenanceListByIds(ids);
-        ingNameMaintenanceService.deleteingNameMaintenanceListByIds(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<FarmingNameMaintenanceRespVO> getFarmingNameMaintenance(@RequestParam("id") String id) {
-    public CommonResult<FarmingNameMaintenanceRespVO> getingNameMaintenance(@RequestParam("id") String id) {
+        FarmingNameMaintenanceDO farmingNameMaintenance = farmingNameMaintenanceService.getFarmingNameMaintenance(id);
-        FarmingNameMaintenanceDO ingNameMaintenance = ingNameMaintenanceService.getingNameMaintenance(id);
+        return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class));
-        return success(BeanUtils.toBean(ingNameMaintenance, FarmingNameMaintenanceRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得农事名称维护分页")
-    @PreAuthorize("@ss.hasPermission('farm:ing-name-maintenance:query')")
+    public CommonResult<PageResult<FarmingNameMaintenanceRespVO>> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) {
-    public CommonResult<PageResult<FarmingNameMaintenanceRespVO>> getingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) {
+        PageResult<FarmingNameMaintenanceDO> pageResult = farmingNameMaintenanceService.getFarmingNameMaintenancePage(pageReqVO);
-        PageResult<FarmingNameMaintenanceDO> pageResult = ingNameMaintenanceService.getingNameMaintenancePage(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<FarmingNameMaintenanceDO> list = ingNameMaintenanceService.getingNameMaintenancePage(pageReqVO).getList();
+        List<FarmingNameMaintenanceDO> list = farmingNameMaintenanceService.getFarmingNameMaintenancePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "农事名称维护.xls", "数据", FarmingNameMaintenanceRespVO.class,
                         BeanUtils.toBean(list, FarmingNameMaintenanceRespVO.class));

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;

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.*;

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

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<String> createingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) {
+    public CommonResult<String> createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) {
-        return success(ingRecordService.createingRecord(createReqVO));
+        return success(farmingRecordService.createFarmingRecord(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新种植中心-农事基地-农事记录")
-    @PreAuthorize("@ss.hasPermission('farm:ing-record:update')")
+    
-    public CommonResult<Boolean> updateingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) {
-        ingRecordService.updateingRecord(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<Boolean> deleteingRecord(@RequestParam("id") String id) {
+    public CommonResult<Boolean> deleteFarmingRecord(@RequestParam("id") String id) {
-        ingRecordService.deleteingRecord(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<Boolean> deleteingRecordList(@RequestParam("ids") List<String> ids) {
+    public CommonResult<Boolean> deleteFarmingRecordList(@RequestParam("ids") List<String> ids) {
-        ingRecordService.deleteingRecordListByIds(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<FarmingRecordRespVO> getingRecord(@RequestParam("id") String id) {
+    public CommonResult<FarmingRecordRespVO> getFarmingRecord(@RequestParam("id") String id) {
-        FarmingRecordDO ingRecord = ingRecordService.getingRecord(id);
+        FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id);
-        return success(BeanUtils.toBean(ingRecord, FarmingRecordRespVO.class));
+        return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得种植中心-农事基地-农事记录分页")
-    @PreAuthorize("@ss.hasPermission('farm:ing-record:query')")
+    
-    public CommonResult<PageResult<FarmingRecordRespVO>> getingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) {
+    public CommonResult<PageResult<FarmingRecordRespVO>> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) {
-        PageResult<FarmingRecordDO> pageResult = ingRecordService.getingRecordPage(pageReqVO);
+        PageResult<FarmingRecordDO> 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<FarmingRecordDO> list = ingRecordService.getingRecordPage(pageReqVO).getList();
+        List<FarmingRecordDO> list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class,
                         BeanUtils.toBean(list, FarmingRecordRespVO.class));

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;

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.*;

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;
 

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<String> createingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO createReqVO) {
+    public CommonResult<String> createFarmingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO createReqVO) {
-        return success(ingRecordInputService.createingRecordInput(createReqVO));
+        return success(farmingRecordInputService.createFarmingRecordInput(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新种植中心-农事基地-农事记录-投入品")
-    @PreAuthorize("@ss.hasPermission('farm:ing-record-input:update')")
+    
-    public CommonResult<Boolean> updateingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateFarmingRecordInput(@Valid @RequestBody FarmingRecordInputSaveReqVO updateReqVO) {
-        ingRecordInputService.updateingRecordInput(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<Boolean> deleteingRecordInput(@RequestParam("id") String id) {
+    public CommonResult<Boolean> deleteFarmingRecordInput(@RequestParam("id") String id) {
-        ingRecordInputService.deleteingRecordInput(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<Boolean> deleteingRecordInputList(@RequestParam("ids") List<String> ids) {
+    public CommonResult<Boolean> deleteFarmingRecordInputList(@RequestParam("ids") List<String> ids) {
-        ingRecordInputService.deleteingRecordInputListByIds(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<FarmingRecordInputRespVO> getingRecordInput(@RequestParam("id") String id) {
+    public CommonResult<FarmingRecordInputRespVO> getFarmingRecordInput(@RequestParam("id") String id) {
-        FarmingRecordInputDO ingRecordInput = ingRecordInputService.getingRecordInput(id);
+        FarmingRecordInputDO farmingRecordInput = farmingRecordInputService.getFarmingRecordInput(id);
-        return success(BeanUtils.toBean(ingRecordInput, FarmingRecordInputRespVO.class));
+        return success(BeanUtils.toBean(farmingRecordInput, FarmingRecordInputRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得种植中心-农事基地-农事记录-投入品分页")
-    @PreAuthorize("@ss.hasPermission('farm:ing-record-input:query')")
+    
-    public CommonResult<PageResult<FarmingRecordInputRespVO>> getingRecordInputPage(@Valid FarmingRecordInputPageReqVO pageReqVO) {
+    public CommonResult<PageResult<FarmingRecordInputRespVO>> getFarmingRecordInputPage(@Valid FarmingRecordInputPageReqVO pageReqVO) {
-        PageResult<FarmingRecordInputDO> pageResult = ingRecordInputService.getingRecordInputPage(pageReqVO);
+        PageResult<FarmingRecordInputDO> 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<FarmingRecordInputDO> list = ingRecordInputService.getingRecordInputPage(pageReqVO).getList();
+        List<FarmingRecordInputDO> list = farmingRecordInputService.getFarmingRecordInputPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "种植中心-农事基地-农事记录-投入品.xls", "数据", FarmingRecordInputRespVO.class,
                         BeanUtils.toBean(list, FarmingRecordInputRespVO.class));

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;

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;

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")

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<String> createingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO createReqVO) {
+    public CommonResult<String> createFarmingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO createReqVO) {
-        return success(ingTypeMaintenanceService.createingTypeMaintenance(createReqVO));
+        return success(farmingTypeMaintenanceService.createFarmingTypeMaintenance(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新农事类型维护")
-    @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:update')")
+    
-    public CommonResult<Boolean> updateingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateFarmingTypeMaintenance(@Valid @RequestBody FarmingTypeMaintenanceSaveReqVO updateReqVO) {
-        ingTypeMaintenanceService.updateingTypeMaintenance(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<Boolean> deleteingTypeMaintenance(@RequestParam("id") String id) {
+    public CommonResult<Boolean> deleteFarmingTypeMaintenance(@RequestParam("id") String id) {
-        ingTypeMaintenanceService.deleteingTypeMaintenance(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<Boolean> deleteingTypeMaintenanceList(@RequestParam("ids") List<String> ids) {
+    public CommonResult<Boolean> deleteFarmingTypeMaintenanceList(@RequestParam("ids") List<String> ids) {
-        ingTypeMaintenanceService.deleteingTypeMaintenanceListByIds(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<FarmingTypeMaintenanceRespVO> getingTypeMaintenance(@RequestParam("id") String id) {
+    public CommonResult<FarmingTypeMaintenanceRespVO> getFarmingTypeMaintenance(@RequestParam("id") String id) {
-        FarmingTypeMaintenanceDO ingTypeMaintenance = ingTypeMaintenanceService.getingTypeMaintenance(id);
+        FarmingTypeMaintenanceDO farmingTypeMaintenance = farmingTypeMaintenanceService.getFarmingTypeMaintenance(id);
-        return success(BeanUtils.toBean(ingTypeMaintenance, FarmingTypeMaintenanceRespVO.class));
+        return success(BeanUtils.toBean(farmingTypeMaintenance, FarmingTypeMaintenanceRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得农事类型维护分页")
-    @PreAuthorize("@ss.hasPermission('farm:ing-type-maintenance:query')")
+    
-    public CommonResult<PageResult<FarmingTypeMaintenanceRespVO>> getingTypeMaintenancePage(@Valid FarmingTypeMaintenancePageReqVO pageReqVO) {
+    public CommonResult<PageResult<FarmingTypeMaintenanceRespVO>> getFarmingTypeMaintenancePage(@Valid FarmingTypeMaintenancePageReqVO pageReqVO) {
-        PageResult<FarmingTypeMaintenanceDO> pageResult = ingTypeMaintenanceService.getingTypeMaintenancePage(pageReqVO);
+        PageResult<FarmingTypeMaintenanceDO> 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<FarmingTypeMaintenanceDO> list = ingTypeMaintenanceService.getingTypeMaintenancePage(pageReqVO).getList();
+        List<FarmingTypeMaintenanceDO> list = farmingTypeMaintenanceService.getFarmingTypeMaintenancePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "农事类型维护.xls", "数据", FarmingTypeMaintenanceRespVO.class,
                         BeanUtils.toBean(list, FarmingTypeMaintenanceRespVO.class));

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;

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.*;

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

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<String> createFertilizerIndex(@Valid @RequestBody FertilizerIndexSaveReqVO createReqVO) {
         return success(fertilizerIndexService.createFertilizerIndex(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新化肥指标")
-    @PreAuthorize("@ss.hasPermission('farm:fertilizer-index:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteFertilizerIndexList(@RequestParam("ids") List<String> 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<FertilizerIndexRespVO> 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<PageResult<FertilizerIndexRespVO>> getFertilizerIndexPage(@Valid FertilizerIndexPageReqVO pageReqVO) {
         PageResult<FertilizerIndexDO> 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 {

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;

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.*;

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

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<String> createFoundationInfo(@Valid @RequestBody FoundationInfoSaveReqVO createReqVO) {
         return success(foundationInfoService.createFoundationInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新基础信息")
-    @PreAuthorize("@ss.hasPermission('farm:foundation-info:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteFoundationInfoList(@RequestParam("ids") List<String> 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<FoundationInfoRespVO> 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<PageResult<FoundationInfoRespVO>> getFoundationInfoPage(@Valid FoundationInfoPageReqVO pageReqVO) {
         PageResult<FoundationInfoDO> 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 {

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;

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.*;

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

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<String> createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) {
         return success(inputLibraryService.createInputLibrary(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新投入品库维护")
-    @PreAuthorize("@ss.hasPermission('farm:input-library:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteInputLibraryList(@RequestParam("ids") List<String> 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<InputLibraryRespVO> 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<PageResult<InputLibraryRespVO>> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) {
         PageResult<InputLibraryDO> 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 {

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;

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;

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")

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<String> createMessageCenter(@Valid @RequestBody MessageCenterSaveReqVO createReqVO) {
         return success(messageCenterService.createMessageCenter(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新消息中心")
-    @PreAuthorize("@ss.hasPermission('farm:message-center:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteMessageCenterList(@RequestParam("ids") List<String> 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<MessageCenterRespVO> 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<PageResult<MessageCenterRespVO>> getMessageCenterPage(@Valid MessageCenterPageReqVO pageReqVO) {
         PageResult<MessageCenterDO> 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 {

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;

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.*;

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;
 

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<String> createModelCycle(@Valid @RequestBody ModelCycleSaveReqVO createReqVO) {
         return success(modelCycleService.createModelCycle(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模型管理-管理周期")
-    @PreAuthorize("@ss.hasPermission('farm:model-cycle:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteModelCycleList(@RequestParam("ids") List<String> 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<ModelCycleRespVO> 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<PageResult<ModelCycleRespVO>> getModelCyclePage(@Valid ModelCyclePageReqVO pageReqVO) {
         PageResult<ModelCycleDO> 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 {

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;

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.*;

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

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<String> createModelEnvironmentIndex(@Valid @RequestBody ModelEnvironmentIndexSaveReqVO createReqVO) {
         return success(modelEnvironmentIndexService.createModelEnvironmentIndex(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模型管理-环境指标")
-    @PreAuthorize("@ss.hasPermission('farm:model-environment-index:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteModelEnvironmentIndexList(@RequestParam("ids") List<String> 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<ModelEnvironmentIndexRespVO> 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<PageResult<ModelEnvironmentIndexRespVO>> getModelEnvironmentIndexPage(@Valid ModelEnvironmentIndexPageReqVO pageReqVO) {
         PageResult<ModelEnvironmentIndexDO> 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 {

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;

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;

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")

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<String> createModelFarmingOperation(@Valid @RequestBody ModelFarmingOperationSaveReqVO createReqVO) {
         return success(modelFarmingOperationService.createModelFarmingOperation(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模型管理-农事操作")
-    @PreAuthorize("@ss.hasPermission('farm:model-farming-operation:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteModelFarmingOperationList(@RequestParam("ids") List<String> 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<ModelFarmingOperationRespVO> 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<PageResult<ModelFarmingOperationRespVO>> getModelFarmingOperationPage(@Valid ModelFarmingOperationPageReqVO pageReqVO) {
         PageResult<ModelFarmingOperationDO> 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 {

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;

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.*;

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

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<String> 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<Boolean> 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<Boolean> 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<Boolean> deleteModelFarmingOperationInputList(@RequestParam("ids") List<String> 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<ModelFarmingOperationInputRespVO> 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<PageResult<ModelFarmingOperationInputRespVO>> getModelFarmingOperationInputPage(@Valid ModelFarmingOperationInputPageReqVO pageReqVO) {
         PageResult<ModelFarmingOperationInputDO> 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 {

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;

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;

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")

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<String> 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<Boolean> 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<Boolean> 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<Boolean> deleteModelPestDiseaseWeedList(@RequestParam("ids") List<String> 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<ModelPestDiseaseWeedRespVO> 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<PageResult<ModelPestDiseaseWeedRespVO>> getModelPestDiseaseWeedPage(@Valid ModelPestDiseaseWeedPageReqVO pageReqVO) {
         PageResult<ModelPestDiseaseWeedDO> 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 {

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;

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.*;

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

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<String> createModelWeatherDisaster(@Valid @RequestBody ModelWeatherDisasterSaveReqVO createReqVO) {
         return success(modelWeatherDisasterService.createModelWeatherDisaster(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模型管理-气象灾害")
-    @PreAuthorize("@ss.hasPermission('farm:model-weather-disaster:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deleteModelWeatherDisasterList(@RequestParam("ids") List<String> 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<ModelWeatherDisasterRespVO> 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<PageResult<ModelWeatherDisasterRespVO>> getModelWeatherDisasterPage(@Valid ModelWeatherDisasterPageReqVO pageReqVO) {
         PageResult<ModelWeatherDisasterDO> 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 {

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;

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.*;

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

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<String> createPersonnelManagement(@Valid @RequestBody PersonnelManagementSaveReqVO createReqVO) {
         return success(personnelManagementService.createPersonnelManagement(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新人员管理")
-    @PreAuthorize("@ss.hasPermission('farm:personnel-management:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deletePersonnelManagementList(@RequestParam("ids") List<String> 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<PersonnelManagementRespVO> 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<PageResult<PersonnelManagementRespVO>> getPersonnelManagementPage(@Valid PersonnelManagementPageReqVO pageReqVO) {
         PageResult<PersonnelManagementDO> 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 {

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;

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.*;

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

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<String> 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<Boolean> 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<Boolean> 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<Boolean> deletePestDiseaseWeedLibraryList(@RequestParam("ids") List<String> 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<PestDiseaseWeedLibraryRespVO> 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<PageResult<PestDiseaseWeedLibraryRespVO>> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) {
         PageResult<PestDiseaseWeedLibraryDO> 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 {

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;

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.*;

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

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<String> createPesticideResidueIndex(@Valid @RequestBody PesticideResidueIndexSaveReqVO createReqVO) {
         return success(pesticideResidueIndexService.createPesticideResidueIndex(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新农残指标")
-    @PreAuthorize("@ss.hasPermission('farm:pesticide-residue-index:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deletePesticideResidueIndexList(@RequestParam("ids") List<String> 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<PesticideResidueIndexRespVO> 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<PageResult<PesticideResidueIndexRespVO>> getPesticideResidueIndexPage(@Valid PesticideResidueIndexPageReqVO pageReqVO) {
         PageResult<PesticideResidueIndexDO> 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 {

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;

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.*;

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

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<String> createPlotInfo(@Valid @RequestBody PlotInfoSaveReqVO createReqVO) {
         return success(plotInfoService.createPlotInfo(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新地块")
-    @PreAuthorize("@ss.hasPermission('farm:plot-info:update')")
+    
     public CommonResult<Boolean> 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<Boolean> 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<Boolean> deletePlotInfoList(@RequestParam("ids") List<String> 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<PlotInfoRespVO> 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<PageResult<PlotInfoRespVO>> getPlotInfoPage(@Valid PlotInfoPageReqVO pageReqVO) {
         PageResult<PlotInfoDO> 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 {

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;

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;

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")