From 3214ecd2528f1b0ff26e19ecbdead89228f67781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Fri, 15 Aug 2025 10:04:51 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=B2=A1=E6=9C=89=E7=A7=9F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductManagementDO.java | 183 +++++++++--------- .../FertilizerIndexServiceImpl.java | 6 +- .../ModelWeatherDisasterServiceImpl.java | 1 + 3 files changed, 96 insertions(+), 94 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java index 49d72790..3871410e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/productmanagement/ProductManagementDO.java @@ -1,91 +1,92 @@ -package cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement; - -import lombok.*; - -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 商品管理 DO - * - * @author 芋道源码 - */ -@TableName("farm_product_management") -@KeySequence("farm_product_management_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ProductManagementDO extends BaseDO { - - /** - * id - */ - @TableId(type = IdType.INPUT) - private String id; - /** - * 商品名称 - */ - private String productName; - /** - * 商品规格 - */ - private String packingSpec; - /** - * 重量 - */ - private String measuringUnit; - /** - * 单位 - */ - private String packingUnit; - /** - * 商品图片 - */ - private String image; - /** - * 商品介绍 - */ - private String introduce; - /** - * 商品条码 - */ - private String barCode; - /** - * 生产许可证 - */ - private String permit; - /** - * 商标名称 - */ - private String brandName; - /** - * 商标图片 - */ - private String brandImage; - /** - * 商品认证 - */ - private String brandAuthentication; - /** - * 基地id - */ - private String baseId; - /** - * 基地 - */ - private String baseName; - /** - * 地块ID - */ - private String plotId; - /** - * 地块 - */ - private String plotName; - -} \ No newline at end of file +package cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement; + +import lombok.*; + +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 商品管理 DO + * + * @author 芋道源码 + */ +@TableName("farm_product_management") +@KeySequence("farm_product_management_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProductManagementDO extends BaseDO { + + /** + * id + */ + @TableId(type = IdType.INPUT) + private String id; + /** + * 商品名称 + */ + private String productName; + /** + * 商品规格 + */ + private String packingSpec; + /** + * 重量 + */ + private String measuringUnit; + /** + * 单位 + */ + private String packingUnit; + /** + * 商品图片 + */ + private String image; + /** + * 商品介绍 + */ + private String introduce; + /** + * 商品条码 + */ + private String barCode; + /** + * 生产许可证 + */ + private String permit; + /** + * 商标名称 + */ + private String brandName; + /** + * 商标图片 + */ + private String brandImage; + /** + * 商品认证 + */ + private String brandAuthentication; + /** + * 基地id + */ + private String baseId; + /** + * 基地 + */ + private String baseName; + /** + * 地块ID + */ + private String plotId; + /** + * 地块 + */ + private String plotName; + + private String tenantId; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java index 2a7bfcde..470fd07a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/fertilizerindex/FertilizerIndexServiceImpl.java @@ -66,12 +66,12 @@ public class FertilizerIndexServiceImpl implements FertilizerIndexService { } @Override - public void deleteFertilizerIndexListByIds(List ids) { + public void deleteFertilizerIndexListByIds(List ids) { // 删除 fertilizerIndexMapper.deleteByIds(ids); - } + } -private void validateFertilizerIndexExists(String id) { + private void validateFertilizerIndexExists(String id) { if (fertilizerIndexMapper.selectById(id) == null) { throw exception(FERTILIZER_INDEX_NOT_EXISTS); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java index 13ef5ffd..675958e6 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelweatherdisaster/ModelWeatherDisasterServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.service.modelweatherdisaster; import cn.hutool.core.util.IdUtil; +import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO; import org.springframework.stereotype.Service;