diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java index a47edfaf..8b280e42 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java @@ -38,7 +38,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; * @author: binda * @date: 2025/8/19 10:39 */ -@Tag(name = "种植中心") +@Tag(name = "种植中心 (生产计划 & 农事记录)") @RestController @RequestMapping("/farm/farming-center") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java index c7072f71..55f25b98 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java @@ -34,7 +34,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.service.farmingrecordinput.FarmingRecordInputService; -@Tag(name = "管理后台 - 种植中心-农事基地-农事记录-投入品") +@Tag(name = "生产中心-农事计划-投入品") @RestController @RequestMapping("/farm/ing-record-input") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java deleted file mode 100644 index 513e6362..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/CultivationAreaController.java +++ /dev/null @@ -1,101 +0,0 @@ -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 io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -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 cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO; -import cn.iocoder.yudao.module.farm.service.cultivationarea.CultivationAreaService; - -//@Tag(name = "管理后台 - 种植区域") -//@RestController -//@RequestMapping("/farm/cultivation-area") -//@Validated -public class CultivationAreaController { - -// @Resource -// private CultivationAreaService cultivationAreaService; -// -// @PostMapping("/create") -// @Operation(summary = "创建种植区域") -// public CommonResult createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) { -// return success(cultivationAreaService.createCultivationArea(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新种植区域") -// public CommonResult updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) { -// cultivationAreaService.updateCultivationArea(updateReqVO); -// return success(true); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "删除种植区域") -// @Parameter(name = "id", description = "编号", required = true) -// public CommonResult deleteCultivationArea(@RequestParam("id") String id) { -// cultivationAreaService.deleteCultivationArea(id); -// return success(true); -// } -// -// @DeleteMapping("/delete-list") -// @Parameter(name = "ids", description = "编号", required = true) -// @Operation(summary = "批量删除种植区域") -// public CommonResult deleteCultivationAreaList(@RequestParam("ids") List ids) { -// cultivationAreaService.deleteCultivationAreaListByIds(ids); -// return success(true); -// } -// -// @GetMapping("/get") -// @Operation(summary = "获得种植区域") -// @Parameter(name = "id", description = "编号", required = true, example = "1024") -// public CommonResult getCultivationArea(@RequestParam("id") String id) { -// CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id); -// return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class)); -// } -// -// @GetMapping("/page") -// @Operation(summary = "获得种植区域分页") -// public CommonResult> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) { -// PageResult pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class)); -// } -// -// @GetMapping("/export-excel") -// @Operation(summary = "导出种植区域 Excel") -// @ApiAccessLog(operateType = EXPORT) -// public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO, -// HttpServletResponse response) throws IOException { -// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); -// List list = cultivationAreaService.getCultivationAreaPage(pageReqVO).getList(); -// // 导出 Excel -// ExcelUtils.write(response, "种植区域.xls", "数据", CultivationAreaRespVO.class, -// BeanUtils.toBean(list, CultivationAreaRespVO.class)); -// } - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java deleted file mode 100644 index 487235a8..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaPageReqVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; - -import lombok.*; - -import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 种植区域分页 Request VO") -@Data -public class CultivationAreaPageReqVO extends PageParam { - - @Schema(description = "基地id", example = "20870") - private String baseId; - - @Schema(description = "基地", example = "王五") - private String baseName; - - @Schema(description = "地块ID", example = "1564") - private String plotId; - - @Schema(description = "地块", example = "张三") - private String plotName; - - @Schema(description = "计划面积") - private BigDecimal planArea; - - @Schema(description = "总面积") - private BigDecimal totalArea; - - @Schema(description = "剩余面积") - private BigDecimal surplusArea; - - @Schema(description = "逻辑删除标识符", example = "1") - private Boolean delStatus; - - @Schema(description = "租户id", example = "11840") - private String tenantId; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java deleted file mode 100644 index ccb07e1a..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaRespVO.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 种植区域 Response VO") -@Data -@ExcelIgnoreUnannotated -public class CultivationAreaRespVO { - - @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8369") - @ExcelProperty("基础id") - private String id; - - @Schema(description = "基地id", example = "20870") - @ExcelProperty("基地id") - private String baseId; - - @Schema(description = "基地", example = "王五") - @ExcelProperty("基地") - private String baseName; - - @Schema(description = "地块ID", example = "1564") - @ExcelProperty("地块ID") - private String plotId; - - @Schema(description = "地块", example = "张三") - @ExcelProperty("地块") - private String plotName; - - @Schema(description = "计划面积") - @ExcelProperty("计划面积") - private BigDecimal planArea; - - @Schema(description = "总面积") - @ExcelProperty("总面积") - private BigDecimal totalArea; - - @Schema(description = "剩余面积") - @ExcelProperty("剩余面积") - private BigDecimal surplusArea; - - @Schema(description = "逻辑删除标识符", example = "1") - @ExcelProperty("逻辑删除标识符") - private Boolean delStatus; - - @Schema(description = "租户id", example = "11840") - @ExcelProperty("租户id") - private String tenantId; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java deleted file mode 100644 index 4ac507eb..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cultivationarea/vo/CultivationAreaSaveReqVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.cultivationarea.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.math.BigDecimal; - -@Schema(description = "管理后台 - 种植区域新增/修改 Request VO") -@Data -public class CultivationAreaSaveReqVO { - - @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8369") - private String id; - - @Schema(description = "基地id", example = "20870") - private String baseId; - - @Schema(description = "基地", example = "王五") - private String baseName; - - @Schema(description = "地块ID", example = "1564") - private String plotId; - - @Schema(description = "地块", example = "张三") - private String plotName; - - @Schema(description = "计划面积") - private BigDecimal planArea; - - @Schema(description = "总面积") - private BigDecimal totalArea; - - @Schema(description = "剩余面积") - private BigDecimal surplusArea; - - @Schema(description = "逻辑删除标识符", example = "1") - private Boolean delStatus; - - @Schema(description = "租户id", example = "11840") - private String tenantId; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java deleted file mode 100644 index 2fc9fc4f..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java +++ /dev/null @@ -1,101 +0,0 @@ -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 io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -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 cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; -import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService; - -//@Tag(name = "管理后台 - 设备与地块关联") -//@RestController -//@RequestMapping("/farm/device-plot-relation") -//@Validated -public class DevicePlotRelationController { - -// @Resource -// private DevicePlotRelationService devicePlotRelationService; -// -// @PostMapping("/create") -// @Operation(summary = "创建设备与地块关联") -// public CommonResult createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) { -// return success(devicePlotRelationService.createDevicePlotRelation(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新设备与地块关联") -// public CommonResult updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) { -// devicePlotRelationService.updateDevicePlotRelation(updateReqVO); -// return success(true); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "删除设备与地块关联") -// @Parameter(name = "id", description = "编号", required = true) -// public CommonResult deleteDevicePlotRelation(@RequestParam("id") String id) { -// devicePlotRelationService.deleteDevicePlotRelation(id); -// return success(true); -// } -// -// @DeleteMapping("/delete-list") -// @Parameter(name = "ids", description = "编号", required = true) -// @Operation(summary = "批量删除设备与地块关联") -// public CommonResult deleteDevicePlotRelationList(@RequestParam("ids") List ids) { -// devicePlotRelationService.deleteDevicePlotRelationListByIds(ids); -// return success(true); -// } -// -// @GetMapping("/get") -// @Operation(summary = "获得设备与地块关联") -// @Parameter(name = "id", description = "编号", required = true, example = "1024") -// public CommonResult getDevicePlotRelation(@RequestParam("id") String id) { -// DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id); -// return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class)); -// } -// -// @GetMapping("/page") -// @Operation(summary = "获得设备与地块关联分页") -// public CommonResult> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) { -// PageResult pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class)); -// } -// -// @GetMapping("/export-excel") -// @Operation(summary = "导出设备与地块关联 Excel") -// @ApiAccessLog(operateType = EXPORT) -// public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO, -// HttpServletResponse response) throws IOException { -// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); -// List list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList(); -// // 导出 Excel -// ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class, -// BeanUtils.toBean(list, DevicePlotRelationRespVO.class)); -// } - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java deleted file mode 100644 index aecf5c85..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationPageReqVO.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; - -import lombok.*; - -import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 设备与地块关联分页 Request VO") -@Data -public class DevicePlotRelationPageReqVO extends PageParam { - - @Schema(description = "设备ID", example = "19588") - private String deviceUniqueId; - - @Schema(description = "设备厂商") - private String vendor; - - @Schema(description = "设备名称", example = "赵六") - private String deviceName; - - @Schema(description = "LP产品标识") - private String lpProductKey; - - @Schema(description = "用户id", example = "30466") - private String userId; - - @Schema(description = "是否存在物联网卡") - private Boolean isIotCardExisted; - - @Schema(description = "基地id", example = "30062") - private String baseId; - - @Schema(description = "基地", example = "李四") - private String baseName; - - @Schema(description = "地块ID", example = "20813") - private String plotId; - - @Schema(description = "地块", example = "李四") - private String plotName; - - @Schema(description = "租户id", example = "8518") - private String tenantId; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java deleted file mode 100644 index 2e01279b..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationRespVO.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 设备与地块关联 Response VO") -@Data -@ExcelIgnoreUnannotated -public class DevicePlotRelationRespVO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7806") - @ExcelProperty("id") - private String id; - - @Schema(description = "设备ID", example = "19588") - @ExcelProperty("设备ID") - private String deviceUniqueId; - - @Schema(description = "设备厂商") - @ExcelProperty("设备厂商") - private String vendor; - - @Schema(description = "设备名称", example = "赵六") - @ExcelProperty("设备名称") - private String deviceName; - - @Schema(description = "LP产品标识") - @ExcelProperty("LP产品标识") - private String lpProductKey; - - @Schema(description = "用户id", example = "30466") - @ExcelProperty("用户id") - private String userId; - - @Schema(description = "是否存在物联网卡") - @ExcelProperty("是否存在物联网卡") - private Boolean isIotCardExisted; - - @Schema(description = "基地id", example = "30062") - @ExcelProperty("基地id") - private String baseId; - - @Schema(description = "基地", example = "李四") - @ExcelProperty("基地") - private String baseName; - - @Schema(description = "地块ID", example = "20813") - @ExcelProperty("地块ID") - private String plotId; - - @Schema(description = "地块", example = "李四") - @ExcelProperty("地块") - private String plotName; - - @Schema(description = "租户id", example = "8518") - @ExcelProperty("租户id") - private String tenantId; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java deleted file mode 100644 index 4f11ae54..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/vo/DevicePlotRelationSaveReqVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.deviceplotrelation.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 设备与地块关联新增/修改 Request VO") -@Data -public class DevicePlotRelationSaveReqVO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7806") - private String id; - - @Schema(description = "设备ID", example = "19588") - private String deviceUniqueId; - - @Schema(description = "设备厂商") - private String vendor; - - @Schema(description = "设备名称", example = "赵六") - private String deviceName; - - @Schema(description = "LP产品标识") - private String lpProductKey; - - @Schema(description = "用户id", example = "30466") - private String userId; - - @Schema(description = "是否存在物联网卡") - private Boolean isIotCardExisted; - - @Schema(description = "基地id", example = "30062") - private String baseId; - - @Schema(description = "基地", example = "李四") - private String baseName; - - @Schema(description = "地块ID", example = "20813") - private String plotId; - - @Schema(description = "地块", example = "李四") - private String plotName; - - @Schema(description = "租户id", example = "8518") - private String tenantId; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java index d84a6e2c..853ca89f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java @@ -30,7 +30,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService; -@Tag(name = "管理后台 - 基地") +@Tag(name = "管理中心 - 基地规划 - 基地") @RestController @RequestMapping("/farm/base-info") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java index 313a22c6..455a22c8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java @@ -30,7 +30,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO; import cn.iocoder.yudao.module.farm.service.gridinfo.GridInfoService; -@Tag(name = "管理后台 - 网格") +@Tag(name = "管理中心 - 基地规划 - 基地/地块/网格") @RestController @RequestMapping("/farm/grid-info") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java index 750fa09c..105acbc9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java @@ -35,7 +35,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO; import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; -@Tag(name = "管理后台 - 地块") +@Tag(name = "管理中心 - 基地规划 - 基地/地块") @RestController @RequestMapping("/farm/plot-info") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java index 43c3a451..800d4585 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java @@ -25,7 +25,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 设备分类") +@Tag(name = "管理心中 - 基础数据管理 - 设备分类") @RestController @RequestMapping("/farm/device-classify") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java index 36014436..893bff03 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java @@ -32,7 +32,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService; -@Tag(name = "管理后台 - 灾害数据") +@Tag(name = "管理心中 - 基础数据管理 - 灾害库维护 & 气象灾害库维护") @RestController @RequestMapping("/farm/disaster-data") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java index 404a04d5..02537e03 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java @@ -27,7 +27,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 环境指标维护") +@Tag(name = "管理心中 - 基础数据管理 - 设备环境指标维护") @RestController @RequestMapping("/farm/environment-indicators") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java index d5c47664..861a6d84 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java @@ -32,7 +32,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.service.farmingnamemaintenance.FarmingNameMaintenanceService; -@Tag(name = "管理后台 - 农事名称维护") +@Tag(name = "管理心中 - 基础数据管理 - 农事名称维护") @RestController @RequestMapping("/farm/ing-name-maintenance") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java index aafc335c..0e7fe561 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java @@ -26,7 +26,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 农事类型维护") +@Tag(name = "管理心中 - 基础数据管理 - 农事类型维护") @RestController @RequestMapping("/farm/ing-type-maintenance") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java index f2590bae..d99d04b7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.module.farm.service.inputlibrary.InputLibraryService; -@Tag(name = "管理后台 - 投入品库维护") +@Tag(name = "管理心中 - 基础数据管理 - 投入品库维护") @RestController @RequestMapping("/farm/input-library") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java index ddde13a4..7dd71a5d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java @@ -24,7 +24,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 物种库维护") +@Tag(name = "管理心中 - 基础数据管理 - 物种库维护") @RestController @RequestMapping("/farm/species-library") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java index 931a2f9d..aec1e0a5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatam import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO; import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService; -@Tag(name = "管理后台 - 二级字典") +@Tag(name = "管理心中 - 基础数据管理 - 物种类型维护") @RestController @RequestMapping("/farm/two-dict") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java index 7800edb0..725a7930 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.service.companyinfo.CompanyInfoService; -@Tag(name = "管理后台 - 企业信息") +@Tag(name = "管理中心 - 企业信息管理") @RestController @RequestMapping("/farm/company-info") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java index 56379b7f..a784433b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerInd import cn.iocoder.yudao.module.farm.service.fertilizerindex.FertilizerIndexService; import org.springframework.web.bind.annotation.*; -@Tag(name = "管理后台 - 化肥指标") +@Tag(name = "管理中心 - 大屏数据维护 - 化肥指标") @RestController @RequestMapping("/farm/fertilizer-index") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java index 0789d4b7..8d981c0e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java @@ -26,7 +26,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 基础信息") +@Tag(name = "管理中心 - 大屏数据维护 - 基础信息") @RestController @RequestMapping("/farm/foundation-info") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java index b0c1b61e..3ea7df1b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.module.farm.service.pesticideresidueindex.PesticideResidueIndexService; -@Tag(name = "管理后台 - 农残指标") +@Tag(name = "管理中心 - 大屏数据维护 - 农残指标") @RestController @RequestMapping("/farm/pesticide-residue-index") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java index aeeded90..6999206e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java @@ -30,7 +30,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO; import cn.iocoder.yudao.module.farm.service.screendisasterdata.ScreenDisasterDataService; -@Tag(name = "管理后台 - 大屏数据-灾害数据") +@Tag(name = "管理中心 - 大屏数据维护 - 灾害数据") @RestController @RequestMapping("/farm/screen-disaster-data") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java index 2216b39b..925bb566 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO; import cn.iocoder.yudao.module.farm.service.varietydata.VarietyDataService; -@Tag(name = "管理后台 - 品种数据") +@Tag(name = "管理中心 - 大屏数据维护 - 品种数据") @RestController @RequestMapping("/farm/variety-data") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java index 311c1868..2b61f7da 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java @@ -27,7 +27,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 消息中心") +@Tag(name = "管理中心 - 消息中心") @RestController @RequestMapping("/farm/message-center") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java index 17e4fa81..50ee4309 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java @@ -27,7 +27,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPOR import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 人员管理") +@Tag(name = "管理中心 - 人员管理") @RestController @RequestMapping("/farm/personnel-management") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java index 945a5d49..b4a4c5ee 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.module.farm.service.environmentindexconfig.EnvironmentIndexConfigService; -@Tag(name = "管理后台 - 环境指标配置") +@Tag(name = "溯源 - 环境指标配置") @RestController @RequestMapping("/farm/environment-index-config") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java index d69e6996..223094aa 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.module.farm.service.productmanagement.ProductManagementService; -@Tag(name = "管理后台 - 商品管理") +@Tag(name = "溯源 - 商品管理") @RestController @RequestMapping("/farm/product-management") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java index a1164be2..42d8f983 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java @@ -27,7 +27,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 溯源-溯源码") +@Tag(name = "溯源 - 溯源码管理 & 溯源码查询 & 溯源统计") @RestController @RequestMapping("/farm/traceability-code") @Validated diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java deleted file mode 100644 index 963af043..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java +++ /dev/null @@ -1,108 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary; - -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibraryPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibraryRespVO; -import cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo.WeatherDisasterLibrarySaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; -import jakarta.validation.Valid; -import jakarta.validation.Valid; -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; - -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -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 cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO; -import cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary.WeatherDisasterLibraryService; - -//@Tag(name = "管理后台 - 气象灾害库维护") -//@RestController -//@RequestMapping("/farm/weather-disaster-library") -//@Validated -public class WeatherDisasterLibraryController { - -// @Resource -// private WeatherDisasterLibraryService weatherDisasterLibraryService; -// -// @PostMapping("/create") -// @Operation(summary = "创建气象灾害库维护") -// -// public CommonResult createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) { -// return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新气象灾害库维护") -// -// public CommonResult updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) { -// weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO); -// return success(true); -// } -// -// @DeleteMapping("/delete") -// @Operation(summary = "删除气象灾害库维护") -// @Parameter(name = "id", description = "编号", required = true) -// -// public CommonResult deleteWeatherDisasterLibrary(@RequestParam("id") String id) { -// weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id); -// return success(true); -// } -// -// @DeleteMapping("/delete-list") -// @Parameter(name = "ids", description = "编号", required = true) -// @Operation(summary = "批量删除气象灾害库维护") -// -// public CommonResult deleteWeatherDisasterLibraryList(@RequestParam("ids") List ids) { -// weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids); -// return success(true); -// } -// -// @GetMapping("/get") -// @Operation(summary = "获得气象灾害库维护") -// @Parameter(name = "id", description = "编号", required = true, example = "1024") -// -// public CommonResult getWeatherDisasterLibrary(@RequestParam("id") String id) { -// WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id); -// return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class)); -// } -// -// @GetMapping("/page") -// @Operation(summary = "获得气象灾害库维护分页") -// -// public CommonResult> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) { -// PageResult pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class)); -// } -// -// @GetMapping("/export-excel") -// @Operation(summary = "导出气象灾害库维护 Excel") -// -// @ApiAccessLog(operateType = EXPORT) -// public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO, -// HttpServletResponse response) throws IOException { -// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); -// List list = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO).getList(); -// // 导出 Excel -// ExcelUtils.write(response, "气象灾害库维护.xls", "数据", WeatherDisasterLibraryRespVO.class, -// BeanUtils.toBean(list, WeatherDisasterLibraryRespVO.class)); -// } - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java deleted file mode 100644 index b3171f1d..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryPageReqVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; - -import lombok.*; - -import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 气象灾害库维护分页 Request VO") -@Data -public class WeatherDisasterLibraryPageReqVO extends PageParam { - - @Schema(description = "灾害名称") - private String name; - - @Schema(description = "灾害描述") - private String description; - - @Schema(description = "防治建议") - private String propose; - - @Schema(description = "图片") - private String images; - - @Schema(description = "0=启用，1=停用") - private Integer useStatus; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "基地id") - private Long baseId; - - @Schema(description = "基地") - private String baseName; - - @Schema(description = "地块ID") - private String plotId; - - @Schema(description = "地块") - private String plotName; - - @Schema(description = "租户id") - private String tenantId; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java deleted file mode 100644 index 2685f3c9..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibraryRespVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 气象灾害库维护 Response VO") -@Data -@ExcelIgnoreUnannotated -public class WeatherDisasterLibraryRespVO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("id") - private String id; - - @Schema(description = "灾害名称") - @ExcelProperty("灾害名称") - private String name; - - @Schema(description = "灾害描述") - @ExcelProperty("灾害描述") - private String description; - - @Schema(description = "防治建议") - @ExcelProperty("防治建议") - private String propose; - - @Schema(description = "图片") - @ExcelProperty("图片") - private String images; - - @Schema(description = "0=启用，1=停用") - @ExcelProperty("0=启用，1=停用") - private Integer useStatus; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "基地id") - @ExcelProperty("基地id") - private Long baseId; - - @Schema(description = "基地") - @ExcelProperty("基地") - private String baseName; - - @Schema(description = "地块ID") - @ExcelProperty("地块ID") - private String plotId; - - @Schema(description = "地块") - @ExcelProperty("地块") - private String plotName; - @Schema(description = "租户id") - private String tenantId; - -} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java deleted file mode 100644 index 0196d90f..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/vo/WeatherDisasterLibrarySaveReqVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.weatherdisasterlibrary.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 气象灾害库维护新增/修改 Request VO") -@Data -public class WeatherDisasterLibrarySaveReqVO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) - private String id; - - @Schema(description = "灾害名称") - private String name; - - @Schema(description = "灾害描述") - private String description; - - @Schema(description = "防治建议") - private String propose; - - @Schema(description = "图片") - private String images; - - @Schema(description = "0=启用，1=停用") - private Integer useStatus; - - @Schema(description = "基地id") - private Long baseId; - - @Schema(description = "基地") - private String baseName; - - @Schema(description = "地块ID") - private String plotId; - - @Schema(description = "地块") - private String plotName; - - @Schema(description = "租户id") - private String tenantId; - -} \ No newline at end of file