From c1c6f8c8974701318eb43ae70048abc2cf31f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Mon, 15 Sep 2025 19:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BA=AF=E6=BA=90=E7=A0=81=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/EnvironmentIndicatorsPageReqVO.java | 2 +- .../vo/EnvironmentIndicatorsRespVO.java | 2 +- .../vo/EnvironmentIndicatorsSaveReqVO.java | 2 +- .../TraceabilityCodePageWithStatsRespVO.java | 51 +++++++++++++++++++ .../EnvironmentIndicatorsDO.java | 2 +- 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java index 37a34e78..11c2844c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java @@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ public class EnvironmentIndicatorsPageReqVO extends PageParam { @Schema(description = "设备分类id", example = "5134") - private String deviceCategoryId; + private Integer deviceCategoryId; @Schema(description = "设备分类名称", example = "芋艿") private String deviceCategoryName; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java index 9e65c747..8fb62fab 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java @@ -18,7 +18,7 @@ public class EnvironmentIndicatorsRespVO { @Schema(description = "设备分类id", example = "5134") @ExcelProperty("设备分类id") - private String deviceCategoryId; + private Integer deviceCategoryId; @Schema(description = "设备分类名称", example = "芋艿") @ExcelProperty("设备分类名称") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java index 0ddf8a06..9efde774 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java @@ -13,7 +13,7 @@ public class EnvironmentIndicatorsSaveReqVO { private Integer id; @Schema(description = "设备分类id", example = "5134") - private String deviceCategoryId; + private Integer deviceCategoryId; @Schema(description = "设备分类名称", example = "芋艿") private String deviceCategoryName; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java new file mode 100644 index 00000000..191b274f --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Schema(description = "管理后台 - 溯源-溯源码分页结果（含统计信息） Response VO") +@Data +public class TraceabilityCodePageWithStatsRespVO { + + @Schema(description = "分页数据列表") + private List list; + + @Schema(description = "总记录数") + private Long total; + + @Schema(description = "统计信息") + private StatisticsInfo statistics; + + @Data + @Schema(description = "统计信息") + public static class StatisticsInfo { + + @Schema(description = "总量", example = "1000") + private Long totalAmount; + + @Schema(description = "正常码量", example = "800") + private Long normalAmount; + + @Schema(description = "废弃码量", example = "200") + private Long wasteAmount; + + public StatisticsInfo() {} + + public StatisticsInfo(Long totalAmount, Long normalAmount, Long wasteAmount) { + this.totalAmount = totalAmount; + this.normalAmount = normalAmount; + this.wasteAmount = wasteAmount; + } + } + + public TraceabilityCodePageWithStatsRespVO() {} + + public TraceabilityCodePageWithStatsRespVO(PageResult pageResult, StatisticsInfo statistics) { + this.list = pageResult.getList(); + this.total = pageResult.getTotal(); + this.statistics = statistics; + } +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindicators/EnvironmentIndicatorsDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindicators/EnvironmentIndicatorsDO.java index 95e54c88..51bb7215 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindicators/EnvironmentIndicatorsDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/environmentindicators/EnvironmentIndicatorsDO.java @@ -30,7 +30,7 @@ public class EnvironmentIndicatorsDO extends BaseDO { /** * 设备分类id */ - private String deviceCategoryId; + private Integer deviceCategoryId; /** * 设备分类名称 */