From 693c73f30e1cf4c756546b4f636ac19b9e710f4f Mon Sep 17 00:00:00 2001 From: piaobo <1913856125@qq.com> Date: Fri, 25 Jul 2025 10:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8lombok=20@data,=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2get=EF=BC=8Cset=EF=BC=8CtoString=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/base/domain/BasSheepGroup.java | 81 +----- .../base/domain/BasSheepGroupMapping.java | 44 +-- .../zhyc/module/base/domain/BasSheepType.java | 32 +-- .../module/base/domain/BasSheepVariety.java | 33 +-- .../zhyc/module/base/domain/DaSheepfold.java | 98 +------ .../zhyc/module/base/domain/SheepFile.java | 4 + .../zhyc/module/biosafety/domain/Deworm.java | 4 + .../module/biosafety/domain/Diagnosis.java | 4 + .../module/biosafety/domain/Disinfect.java | 103 +------ .../zhyc/module/biosafety/domain/Health.java | 34 ++- .../module/biosafety/domain/Immunity.java | 35 ++- .../biosafety/domain/QuarantineItems.java | 33 +-- .../biosafety/domain/QuarantineReport.java | 4 + .../biosafety/domain/QuarantineSample.java | 33 +-- .../module/biosafety/domain/SwDisease.java | 54 +--- .../module/biosafety/domain/SwMedicType.java | 6 + .../module/biosafety/domain/SwMedicine.java | 4 + .../biosafety/domain/SwMedicineUsage.java | 4 + .../domain/SwMedicineUsageDetails.java | 4 + .../module/biosafety/domain/SwPresDetail.java | 7 + .../biosafety/domain/SwPrescription.java | 7 + .../zhyc/module/biosafety/domain/SwUnit.java | 4 + .../zhyc/module/biosafety/domain/SwUsage.java | 4 + .../module/biosafety/domain/Treatment.java | 4 + .../dairyProducts/domain/NpFreshMilkInsp.java | 189 +------------ .../dairyProducts/domain/NpRawMilkInspe.java | 203 +------------- .../dairyProducts/domain/NpYogurtInsp.java | 189 +------------ .../domain/XzDryMatterCorrection.java | 31 +-- .../domain/XzParityCorrection.java | 44 +-- .../domain/XzWegihCorrection.java | 74 +---- .../produce/breed/domain/RawSpermRecord.java | 166 +---------- .../produce/breed/domain/ScBreedPlan.java | 55 +--- .../breed/domain/ScBreedPlanGenerate.java | 136 +-------- .../produce/breed/domain/ScBreedPlanTemp.java | 111 +------- .../produce/breed/domain/ScBreedRecord.java | 257 +----------------- .../produce/breed/domain/ScDryMilk.java | 128 +-------- .../produce/breed/domain/ScLambDetail.java | 160 +---------- .../produce/breed/domain/ScLambingRecord.java | 14 - .../breed/domain/ScPregnancyRecord.java | 229 +--------------- .../produce/breed/domain/ScWeanRecord.java | 174 +----------- .../produce/breed/domain/SheepLambInfo.java | 25 ++ 41 files changed, 268 insertions(+), 2557 deletions(-) create mode 100644 zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java index bd1a9f4..810cad1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java @@ -2,6 +2,9 @@ package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.TreeEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author wyt * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepGroup extends TreeEntity { private static final long serialVersionUID = 1L; @@ -35,79 +41,4 @@ public class BasSheepGroup extends TreeEntity @Excel(name = "祖级列表名称") private String ancestorNames; - public void setAncestorNames(String ancestorNames) { - this.ancestorNames = ancestorNames; - } - - public String getAncestorNames() { - return ancestorNames; - } - - @Override - public String getAncestors() { - return ancestors; - } - - @Override - public void setAncestors(String ancestors) { - this.ancestors = ancestors; - } - - /** 是否为叶子节点 */ - private Boolean isLeaf; - - // ... getter 和 setter - public Boolean getIsLeaf() { - return isLeaf; - } - - public void setIsLeaf(Boolean isLeaf) { - this.isLeaf = isLeaf; - } - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - - public void setGroupName(String groupName) - { - this.groupName = groupName; - } - - public String getGroupName() - { - return groupName; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("groupId", getGroupId()) - .append("parentId", getParentId()) - .append("groupName", getGroupName()) - .append("ancestors", getAncestors()) - .append("ancestorNames", getAncestorNames()) // 新增这一行 - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java index 2dfdd71..eed7c36 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author wyt * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepGroupMapping extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,42 +33,4 @@ public class BasSheepGroupMapping extends BaseEntity @Excel(name = "分组ID") private Long groupId; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("groupId", getGroupId()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java index f0a46a2..edf709e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-22 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepType extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,31 +27,5 @@ public class BasSheepType extends BaseEntity /** 羊只类型 */ private String name; - public void setId(Integer id) - { - this.id = id; - } - public Integer getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java index df8c797..56e8a36 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepVariety extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class BasSheepVariety extends BaseEntity @Excel(name = "品种") private String variety; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("variety", getVariety()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java index 75bf6c4..0216feb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java @@ -2,6 +2,9 @@ package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author wyt * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class DaSheepfold extends BaseEntity { private static final long serialVersionUID = 1L; @@ -47,97 +53,5 @@ public class DaSheepfold extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setRanchId(Long ranchId) - { - this.ranchId = ranchId; - } - - public Long getRanchId() - { - return ranchId; - } - - public void setSheepfoldName(String sheepfoldName) - { - this.sheepfoldName = sheepfoldName; - } - - public String getSheepfoldName() - { - return sheepfoldName; - } - - public void setSheepfoldTypeId(Long sheepfoldTypeId) - { - this.sheepfoldTypeId = sheepfoldTypeId; - } - - public Long getSheepfoldTypeId() - { - return sheepfoldTypeId; - } - - public void setSheepfoldNo(String sheepfoldNo) - { - this.sheepfoldNo = sheepfoldNo; - } - - public String getSheepfoldNo() - { - return sheepfoldNo; - } - - public void setRowNo(String rowNo) - { - this.rowNo = rowNo; - } - - public String getRowNo() - { - return rowNo; - } - - public void setColumns(String columns) - { - this.columns = columns; - } - - public String getColumns() - { - return columns; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ranchId", getRanchId()) - .append("sheepfoldName", getSheepfoldName()) - .append("sheepfoldTypeId", getSheepfoldTypeId()) - .append("sheepfoldNo", getSheepfoldNo()) - .append("rowNo", getRowNo()) - .append("columns", getColumns()) - .append("comment", getComment()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java index 8a2cf3a..acefce9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java @@ -3,7 +3,9 @@ package com.zhyc.module.base.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -16,6 +18,8 @@ import java.util.Date; * @date 2025-07-13 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SheepFile extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index 12cb640..c3b60c5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -4,7 +4,9 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -17,6 +19,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class Deworm extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java index bc3c8a0..05fe6ad 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java @@ -2,7 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -15,6 +17,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class Diagnosis extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java index 4b30dd3..478c0e7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java @@ -2,6 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class Disinfect extends BaseEntity { private static final long serialVersionUID = 1L; @@ -49,101 +55,4 @@ public class Disinfect extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnician(String technician) - { - this.technician = technician; - } - - public String getTechnician() - { - return technician; - } - - public void setWay(String way) - { - this.way = way; - } - - public String getWay() - { - return way; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setRatio(String ratio) - { - this.ratio = ratio; - } - - public String getRatio() - { - return ratio; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepfoldId", getSheepfoldId()) - .append("datetime", getDatetime()) - .append("technician", getTechnician()) - .append("way", getWay()) - .append("usageId", getUsageId()) - .append("ratio", getRatio()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java index ddd2ac1..258f3ec 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java @@ -1,10 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; @@ -31,33 +31,29 @@ public class Health extends BaseEntity @Excel(name = "羊只id") private Long sheepId; - /** 用药记录 */ - @Excel(name = "用药记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") private String variety; - - /** 羊只类别 */ @Excel(name = "羊只类别") private String sheepType; - - /** 性别 */ - @Excel(name = "性别") + @Excel(name = "羊只性别") private String gender; - - /** 月龄 */ @Excel(name = "月龄") - private String monthAge; - + private Long monthAge; + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; - /** 羊舍id */ - @Excel(name = "繁殖状态") - private String breed; + /** 用药记录 */ + @Excel(name = "用药记录") + private Long usageId; + /** 技术员 */ @Excel(name = "技术员") @@ -67,4 +63,6 @@ public class Health extends BaseEntity @Excel(name = "备注") private String comment; + // 药品使用 + private List usageDetails; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index 6e48483..d53b9a2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -1,8 +1,12 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -15,6 +19,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class Immunity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,33 +32,33 @@ public class Immunity extends BaseEntity @Excel(name = "羊只id") private Long sheepId; - /** 使用记录 */ - @Excel(name = "使用记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") + private String variety; + @Excel(name = "羊只类别") + private String sheepType; - /** 羊只类型 */ - @Excel(name = "羊只类型") - private Long sheepType; - - /** 羊只性别 */ @Excel(name = "羊只性别") private String gender; - /** 月龄 */ @Excel(name = "月龄") private Long monthAge; + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; - /** 羊舍id */ - @Excel(name = "繁殖状态") - private String breed; + /** 使用记录 */ + @Excel(name = "使用记录") + private Long usageId; + /** 免疫日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -67,4 +73,7 @@ public class Immunity extends BaseEntity @Excel(name = "备注") private String comment; + // 药品使用 + private List usageDetails; + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java index eb57ab0..807962a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class QuarantineItems extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class QuarantineItems extends BaseEntity @Excel(name = "名称") private String name; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java index 9d3dd21..0fa8f88 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java @@ -2,7 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -16,6 +18,8 @@ import org.apache.ibatis.type.Alias; * @date 2025-07-14 */ @Data +@NoArgsConstructor +@AllArgsConstructor @Alias("QuarantineReport") public class QuarantineReport extends BaseEntity { diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java index e9e3ba3..e128a0e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class QuarantineSample extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class QuarantineSample extends BaseEntity @Excel(name = "样品类型") private String name; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java index 5cb14ab..65ab2c1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.TreeEntity; * @author ruoyi * @date 2025-07-09 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwDisease extends TreeEntity { private static final long serialVersionUID = 1L; @@ -30,53 +36,5 @@ public class SwDisease extends TreeEntity @Excel(name = "") private Long pid; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - public void setPid(Long pid) - { - this.pid = pid; - } - - public Long getPid() - { - return pid; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("comment", getComment()) - .append("pid", getPid()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java index 7bfcc56..46893c5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicType extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java index 8536c1b..247ef20 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -14,6 +16,8 @@ import com.zhyc.common.core.domain.BaseEntity; */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicine extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index 56f3997..95a6aea 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -2,7 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.List; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -15,6 +17,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-12 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicineUsage extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java index 7a02bdc..86eb829 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-12 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicineUsageDetails extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java index ba52c9e..e03540b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java @@ -1,6 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.math.BigDecimal; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -12,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwPresDetail extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java index b8466e1..ae22e43 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java @@ -1,6 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -12,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwPrescription extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java index c4452b1..9820928 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-11 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwUnit extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java index c52907f..450c220 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-11 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwUsage extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index 20d7306..e4217fc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -5,7 +5,9 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -18,6 +20,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class Treatment extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java index 15e6314..64e71f6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-18 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpFreshMilkInsp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -81,187 +87,4 @@ public class NpFreshMilkInsp extends BaseEntity @Excel(name = "备注") private String commnet; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSource(String source) - { - this.source = source; - } - - public String getSource() - { - return source; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFat(Double fat) - { - this.fat = fat; - } - - public Double getFat() - { - return fat; - } - - public void setProtein(Double protein) - { - this.protein = protein; - } - - public Double getProtein() - { - return protein; - } - - public void setNonFat(Double nonFat) - { - this.nonFat = nonFat; - } - - public Double getNonFat() - { - return nonFat; - } - - public void setAcidity(Double acidity) - { - this.acidity = acidity; - } - - public Double getAcidity() - { - return acidity; - } - - public void setBacterialColony1(Double bacterialColony1) - { - this.bacterialColony1 = bacterialColony1; - } - - public Double getBacterialColony1() - { - return bacterialColony1; - } - - public void setBacterialColony2(Double bacterialColony2) - { - this.bacterialColony2 = bacterialColony2; - } - - public Double getBacterialColony2() - { - return bacterialColony2; - } - - public void setBacterialColony3(Double bacterialColony3) - { - this.bacterialColony3 = bacterialColony3; - } - - public Double getBacterialColony3() - { - return bacterialColony3; - } - - public void setBacterialColony4(Double bacterialColony4) - { - this.bacterialColony4 = bacterialColony4; - } - - public Double getBacterialColony4() - { - return bacterialColony4; - } - - public void setBacterialColony5(Double bacterialColony5) - { - this.bacterialColony5 = bacterialColony5; - } - - public Double getBacterialColony5() - { - return bacterialColony5; - } - - public void setColi(Double coli) - { - this.coli = coli; - } - - public Double getColi() - { - return coli; - } - - public void setLactoferrin(Double lactoferrin) - { - this.lactoferrin = lactoferrin; - } - - public Double getLactoferrin() - { - return lactoferrin; - } - - public void setIg(Double ig) - { - this.ig = ig; - } - - public Double getIg() - { - return ig; - } - - public void setCommnet(String commnet) - { - this.commnet = commnet; - } - - public String getCommnet() - { - return commnet; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("source", getSource()) - .append("datetime", getDatetime()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("acidity", getAcidity()) - .append("bacterialColony1", getBacterialColony1()) - .append("bacterialColony2", getBacterialColony2()) - .append("bacterialColony3", getBacterialColony3()) - .append("bacterialColony4", getBacterialColony4()) - .append("bacterialColony5", getBacterialColony5()) - .append("coli", getColi()) - .append("lactoferrin", getLactoferrin()) - .append("ig", getIg()) - .append("commnet", getCommnet()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java index 5b140c6..0c71d35 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java @@ -344,6 +344,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -355,6 +358,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpRawMilkInspe extends BaseEntity { private static final long serialVersionUID = 1L; @@ -447,201 +453,4 @@ public class NpRawMilkInspe extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - // Getters and Setters - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setDatetime(Date datetime) { - this.datetime = datetime; - } - - public Date getDatetime() { - return datetime; - } - - public void setSource(String source) { - this.source = source; - } - - public String getSource() { - return source; - } - - public void setFreeze(Double freeze) { - this.freeze = freeze; - } - - public Double getFreeze() { - return freeze; - } - - public void setDensity(Double density) { - this.density = density; - } - - public Double getDensity() { - return density; - } - - public void setFat(Double fat) { - this.fat = fat; - } - - public Double getFat() { - return fat; - } - - public void setProtein(Double protein) { - this.protein = protein; - } - - public Double getProtein() { - return protein; - } - - public void setNonFat(Double nonFat) { - this.nonFat = nonFat; - } - - public Double getNonFat() { - return nonFat; - } - - public void setDryMatter(Double dryMatter) { - this.dryMatter = dryMatter; - } - - public Double getDryMatter() { - return dryMatter; - } - - public void setImpurityDegree(Double impurityDegree) { - this.impurityDegree = impurityDegree; - } - - public Double getImpurityDegree() { - return impurityDegree; - } - - public void setLactose(Double lactose) { - this.lactose = lactose; - } - - public Double getLactose() { - return lactose; - } - - public void setAshContent(Double ashContent) { - this.ashContent = ashContent; - } - - public Double getAshContent() { - return ashContent; - } - - public void setAcidity(Double acidity) { - this.acidity = acidity; - } - - public Double getAcidity() { - return acidity; - } - - public void setPh(Double ph) { - this.ph = ph; - } - - public Double getPh() { - return ph; - } - - public void setBacterialColony(Double bacterialColony) { - this.bacterialColony = bacterialColony; - } - - public Double getBacterialColony() { - return bacterialColony; - } - - public void setLactoferrin(Double lactoferrin) { - this.lactoferrin = lactoferrin; - } - - public Double getLactoferrin() { - return lactoferrin; - } - - public void setIg(Double ig) { - this.ig = ig; - } - - public Double getIg() { - return ig; - } - - public void setSomaticCell(Double somaticCell) { - this.somaticCell = somaticCell; - } - - public Double getSomaticCell() { - return somaticCell; - } - - public void setUsea(Double usea) { - this.usea = usea; - } - - public Double getUsea() { - return usea; - } - - public void setFatRatio(Double fatRatio) { - this.fatRatio = fatRatio; - } - - public Double getFatRatio() { - return fatRatio; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getComment() { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("source", getSource()) - .append("freeze", getFreeze()) - .append("density", getDensity()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("dryMatter", getDryMatter()) - .append("impurityDegree", getImpurityDegree()) - .append("lactose", getLactose()) - .append("ashContent", getAshContent()) - .append("acidity", getAcidity()) - .append("ph", getPh()) - .append("bacterialColony", getBacterialColony()) - .append("lactoferrin", getLactoferrin()) - .append("ig", getIg()) - .append("somaticCell", getSomaticCell()) - .append("usea", getUsea()) - .append("fatRatio", getFatRatio()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java index cb57bbc..e284508 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-17 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpYogurtInsp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -82,187 +88,4 @@ public class NpYogurtInsp extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSource(String source) - { - this.source = source; - } - - public String getSource() - { - return source; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFat(Double fat) - { - this.fat = fat; - } - - public Double getFat() - { - return fat; - } - - public void setProtein(Double protein) - { - this.protein = protein; - } - - public Double getProtein() - { - return protein; - } - - public void setNonFat(Double nonFat) - { - this.nonFat = nonFat; - } - - public Double getNonFat() - { - return nonFat; - } - - public void setAcidity(Double acidity) - { - this.acidity = acidity; - } - - public Double getAcidity() - { - return acidity; - } - - public void setBacterialColony1(Double bacterialColony1) - { - this.bacterialColony1 = bacterialColony1; - } - - public Double getBacterialColony1() - { - return bacterialColony1; - } - - public void setBacterialClony2(Double bacterialClony2) - { - this.bacterialClony2 = bacterialClony2; - } - - public Double getBacterialClony2() - { - return bacterialClony2; - } - - public void setBacterialClony3(Double bacterialClony3) - { - this.bacterialClony3 = bacterialClony3; - } - - public Double getBacterialClony3() - { - return bacterialClony3; - } - - public void setBacterialClony4(Double bacterialClony4) - { - this.bacterialClony4 = bacterialClony4; - } - - public Double getBacterialClony4() - { - return bacterialClony4; - } - - public void setBacterialClony5(Double bacterialClony5) - { - this.bacterialClony5 = bacterialClony5; - } - - public Double getBacterialClony5() - { - return bacterialClony5; - } - - public void setYeast(Double yeast) - { - this.yeast = yeast; - } - - public Double getYeast() - { - return yeast; - } - - public void setMould(Double mould) - { - this.mould = mould; - } - - public Double getMould() - { - return mould; - } - - public void setLacto(Double lacto) - { - this.lacto = lacto; - } - - public Double getLacto() - { - return lacto; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("source", getSource()) - .append("datetime", getDatetime()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("acidity", getAcidity()) - .append("bacterialColony1", getBacterialColony1()) - .append("bacterialClony2", getBacterialClony2()) - .append("bacterialClony3", getBacterialClony3()) - .append("bacterialClony4", getBacterialClony4()) - .append("bacterialClony5", getBacterialClony5()) - .append("yeast", getYeast()) - .append("mould", getMould()) - .append("lacto", getLacto()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java index e7b1e13..a211abb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java @@ -2,11 +2,17 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzDryMatterCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -28,29 +34,4 @@ public class XzDryMatterCorrection extends BaseEntity { @Excel(name = "干物质系数") private Double coefficient; - // getters and setters... - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public Date getDatetime() { return datetime; } - public void setDatetime(Date datetime) { this.datetime = datetime; } - public String getFactory() { return factory; } - public void setFactory(String factory) { this.factory = factory; } - public Double getContent() { return content; } - public void setContent(Double content) { this.content = content; } - public Double getStandard() { return standard; } - public void setStandard(Double standard) { this.standard = standard; } - public Double getCoefficient() { return coefficient; } - public void setCoefficient(Double coefficient) { this.coefficient = coefficient; } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", id) - .append("datetime", datetime) - .append("factory", factory) - .append("content", content) - .append("standard", standard) - .append("coefficient", coefficient) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java index f74f452..d1a93e6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java @@ -1,5 +1,8 @@ package com.zhyc.module.dairyProducts.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzParityCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,42 +32,4 @@ public class XzParityCorrection extends BaseEntity @Excel(name = "系数") private Double coef; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setParity(Integer parity) - { - this.parity = parity; - } - - public Integer getParity() - { - return parity; - } - - public void setCoef(Double coef) - { - this.coef = coef; - } - - public Double getCoef() - { - return coef; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("parity", getParity()) - .append("coef", getCoef()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java index a44abe3..6bba703 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-12 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzWegihCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -41,73 +47,5 @@ public class XzWegihCorrection extends BaseEntity @Excel(name = "称重系数") private Double coefficient; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFactory(String factory) - { - this.factory = factory; - } - - public String getFactory() - { - return factory; - } - - public void setActual(Double actual) - { - this.actual = actual; - } - - public Double getActual() - { - return actual; - } - - public void setSystemMilk(Double systemMilk) - { - this.systemMilk = systemMilk; - } - - public Double getSystemMilk() - { - return systemMilk; - } - - public Double getCoefficient() { - return coefficient; - } - - public void setCoefficient(Double coefficient) { - this.coefficient = coefficient; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("factory", getFactory()) - .append("actual", getActual()) - .append("systemMilk", getSystemMilk()) - .append("coefficient", getCoefficient()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java index d4ca49f..2f1c625 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java @@ -2,6 +2,9 @@ package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-23 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class RawSpermRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -73,165 +79,5 @@ public class RawSpermRecord extends BaseEntity @Excel(name = "采集备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setManageTags(String manageTags) - { - this.manageTags = manageTags; - } - - public String getManageTags() - { - return manageTags; - } - - public void setElectronicTags(String electronicTags) - { - this.electronicTags = electronicTags; - } - - public String getElectronicTags() - { - return electronicTags; - } - - public void setMonthAge(Long monthAge) - { - this.monthAge = monthAge; - } - - public Long getMonthAge() - { - return monthAge; - } - - public void setPickDate(Date pickDate) - { - this.pickDate = pickDate; - } - - public Date getPickDate() - { - return pickDate; - } - - public void setAmount(Long amount) - { - this.amount = amount; - } - - public Long getAmount() - { - return amount; - } - - public void setDensity(String density) - { - this.density = density; - } - - public String getDensity() - { - return density; - } - - public void setVitallity(String vitallity) - { - this.vitallity = vitallity; - } - - public String getVitallity() - { - return vitallity; - } - - public void setControlled(Long controlled) - { - this.controlled = controlled; - } - - public Long getControlled() - { - return controlled; - } - - public void setSexualStatus(String sexualStatus) - { - this.sexualStatus = sexualStatus; - } - - public String getSexualStatus() - { - return sexualStatus; - } - - public void setInfo(String info) - { - this.info = info; - } - - public String getInfo() - { - return info; - } - - public void setTechnician(String technician) - { - this.technician = technician; - } - - public String getTechnician() - { - return technician; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("manageTags", getManageTags()) - .append("electronicTags", getElectronicTags()) - .append("monthAge", getMonthAge()) - .append("pickDate", getPickDate()) - .append("amount", getAmount()) - .append("density", getDensity()) - .append("vitallity", getVitallity()) - .append("controlled", getControlled()) - .append("sexualStatus", getSexualStatus()) - .append("info", getInfo()) - .append("technician", getTechnician()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java index c888a03..1989341 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java @@ -1,5 +1,8 @@ package com.zhyc.module.produce.breed.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlan extends BaseEntity { private static final long serialVersionUID = 1L; @@ -30,53 +36,4 @@ public class ScBreedPlan extends BaseEntity @Excel(name = "配种类型") private Long breedType; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setRamId(String ramId) - { - this.ramId = ramId; - } - - public String getRamId() - { - return ramId; - } - - public void setEweId(String eweId) - { - this.eweId = eweId; - } - - public String getEweId() - { - return eweId; - } - - public void setBreedType(Long breedType) - { - this.breedType = breedType; - } - - public Long getBreedType() - { - return breedType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ramId", getRamId()) - .append("eweId", getEweId()) - .append("breedType", getBreedType()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java index 1622ae6..db6f059 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java @@ -2,6 +2,9 @@ package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlanGenerate extends BaseEntity { private static final long serialVersionUID = 1L; @@ -61,134 +67,4 @@ public class ScBreedPlanGenerate extends BaseEntity /** 审批意见 */ private String approveRemark; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setPlanName(String planName) - { - this.planName = planName; - } - - public String getPlanName() - { - return planName; - } - - public void setPlanType(Integer planType) - { - this.planType = planType; - } - - public Integer getPlanType() - { - return planType; - } - - public void setPlanDate(Date planDate) - { - this.planDate = planDate; - } - - public Date getPlanDate() - { - return planDate; - } - - public void setTotalEweCount(Integer totalEweCount) - { - this.totalEweCount = totalEweCount; - } - - public Integer getTotalEweCount() - { - return totalEweCount; - } - - public void setTotalRamCount(Integer totalRamCount) - { - this.totalRamCount = totalRamCount; - } - - public Integer getTotalRamCount() - { - return totalRamCount; - } - - public void setBreedRatio(String breedRatio) - { - this.breedRatio = breedRatio; - } - - public String getBreedRatio() - { - return breedRatio; - } - - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - public void setApprover(String approver) - { - this.approver = approver; - } - - public String getApprover() - { - return approver; - } - - public void setApproveTime(Date approveTime) - { - this.approveTime = approveTime; - } - - public Date getApproveTime() - { - return approveTime; - } - - public void setApproveRemark(String approveRemark) - { - this.approveRemark = approveRemark; - } - - public String getApproveRemark() - { - return approveRemark; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("planName", getPlanName()) - .append("planType", getPlanType()) - .append("planDate", getPlanDate()) - .append("totalEweCount", getTotalEweCount()) - .append("totalRamCount", getTotalRamCount()) - .append("breedRatio", getBreedRatio()) - .append("status", getStatus()) - .append("approver", getApprover()) - .append("approveTime", getApproveTime()) - .append("approveRemark", getApproveRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java index 132ce77..4380caf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java @@ -1,5 +1,8 @@ package com.zhyc.module.produce.breed.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlanTemp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -63,110 +69,5 @@ public class ScBreedPlanTemp extends BaseEntity return id; } - public void setPlanGenerateId(Long planGenerateId) - { - this.planGenerateId = planGenerateId; - } - public Long getPlanGenerateId() - { - return planGenerateId; - } - - public void setRamId(String ramId) - { - this.ramId = ramId; - } - - public String getRamId() - { - return ramId; - } - - public void setEweId(String eweId) - { - this.eweId = eweId; - } - - public String getEweId() - { - return eweId; - } - - public void setBreedType(Long breedType) - { - this.breedType = breedType; - } - - public Long getBreedType() - { - return breedType; - } - - public void setRamManageTags(String ramManageTags) - { - this.ramManageTags = ramManageTags; - } - - public String getRamManageTags() - { - return ramManageTags; - } - - public void setRamVariety(String ramVariety) - { - this.ramVariety = ramVariety; - } - - public String getRamVariety() - { - return ramVariety; - } - - public void setEweManageTags(String eweManageTags) - { - this.eweManageTags = eweManageTags; - } - - public String getEweManageTags() - { - return eweManageTags; - } - - public void setEweVariety(String eweVariety) - { - this.eweVariety = eweVariety; - } - - public String getEweVariety() - { - return eweVariety; - } - - public void setEweWeight(Double eweWeight) - { - this.eweWeight = eweWeight; - } - - public Double getEweWeight() - { - return eweWeight; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("planGenerateId", getPlanGenerateId()) - .append("ramId", getRamId()) - .append("eweId", getEweId()) - .append("breedType", getBreedType()) - .append("ramManageTags", getRamManageTags()) - .append("ramVariety", getRamVariety()) - .append("eweManageTags", getEweManageTags()) - .append("eweVariety", getEweVariety()) - .append("eweWeight", getEweWeight()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java index 0d1d9c4..c5f548d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java @@ -2,6 +2,10 @@ package com.zhyc.module.produce.breed.domain; import java.math.BigDecimal; import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +17,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-23 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -105,255 +112,5 @@ public class ScBreedRecord extends BaseEntity /** 牧场ID */ private Long ranchId; - // ============ Getter/Setter 方法 ============ - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setRamId(String ramId) - { - this.ramId = ramId; - } - - public String getRamId() - { - return ramId; - } - - public void setEweId(String eweId) - { - this.eweId = eweId; - } - - public String getEweId() - { - return eweId; - } - - public void setTechnician(String technician) - { - this.technician = technician; - } - - public String getTechnician() - { - return technician; - } - - public void setBreedDrugs(String breedDrugs) - { - this.breedDrugs = breedDrugs; - } - - public String getBreedDrugs() - { - return breedDrugs; - } - - public String getEweManageTags() - { - return eweManageTags; - } - - public void setEweManageTags(String eweManageTags) - { - this.eweManageTags = eweManageTags; - } - - public String getEweVariety() - { - return eweVariety; - } - - public void setEweVariety(String eweVariety) - { - this.eweVariety = eweVariety; - } - - public String getRamManageTags() - { - return ramManageTags; - } - - public void setRamManageTags(String ramManageTags) - { - this.ramManageTags = ramManageTags; - } - - public String getRamVariety() - { - return ramVariety; - } - - public void setRamVariety(String ramVariety) - { - this.ramVariety = ramVariety; - } - - public Integer getEweParity() - { - return eweParity; - } - - public void setEweParity(Integer eweParity) - { - this.eweParity = eweParity; - } - - public Integer getEweMonthAge() - { - return eweMonthAge; - } - - public void setEweMonthAge(Integer eweMonthAge) - { - this.eweMonthAge = eweMonthAge; - } - - public String getEweSheepfoldName() - { - return eweSheepfoldName; - } - - public void setEweSheepfoldName(String eweSheepfoldName) - { - this.eweSheepfoldName = eweSheepfoldName; - } - - public String getEweBreedStatus() - { - return eweBreedStatus; - } - - public void setEweBreedStatus(String eweBreedStatus) - { - this.eweBreedStatus = eweBreedStatus; - } - - public Integer getEweControlled() - { - return eweControlled; - } - - public void setEweControlled(Integer eweControlled) - { - this.eweControlled = eweControlled; - } - - public String getEweComment() - { - return eweComment; - } - - public void setEweComment(String eweComment) - { - this.eweComment = eweComment; - } - - public String getRanchName() - { - return ranchName; - } - - public void setRanchName(String ranchName) - { - this.ranchName = ranchName; - } - - public String getMatingType() - { - return matingType; - } - - public void setMatingType(String matingType) - { - this.matingType = matingType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public Integer getMatingCount() - { - return matingCount; - } - - public void setMatingCount(Integer matingCount) - { - this.matingCount = matingCount; - } - - public Long getTimeSincePlanning() - { - return timeSincePlanning; - } - - public void setTimeSincePlanning(Long timeSincePlanning) - { - this.timeSincePlanning = timeSincePlanning; - } - - public Long getRanchId() - { - return ranchId; - } - - public void setRanchId(Long ranchId) - { - this.ranchId = ranchId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("ramId", getRamId()) - .append("eweId", getEweId()) - .append("technician", getTechnician()) - .append("breedDrugs", getBreedDrugs()) - .append("eweManageTags", getEweManageTags()) - .append("eweVariety", getEweVariety()) - .append("ramManageTags", getRamManageTags()) - .append("ramVariety", getRamVariety()) - .append("eweParity", getEweParity()) - .append("eweMonthAge", getEweMonthAge()) - .append("eweSheepfoldName", getEweSheepfoldName()) - .append("eweBreedStatus", getEweBreedStatus()) - .append("eweControlled", getEweControlled()) - .append("eweComment", getEweComment()) - .append("ranchName", getRanchName()) - .append("matingType", getMatingType()) - .append("sheepType", getSheepType()) - .append("matingCount", getMatingCount()) - .append("timeSincePlanning", getTimeSincePlanning()) - .append("ranchId", getRanchId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java index 7ffa127..07f0fb8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java @@ -2,6 +2,9 @@ package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScDryMilk extends BaseEntity { private static final long serialVersionUID = 1L; @@ -63,127 +69,5 @@ public class ScDryMilk extends BaseEntity @Excel(name = "事件类型") private String eventType; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - public void setSheepId(String sheepId) - { - this.sheepId = sheepId; - } - - public String getSheepId() - { - return sheepId; - } - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setSheepfold(Long sheepfold) - { - this.sheepfold = sheepfold; - } - - public Long getSheepfold() - { - return sheepfold; - } - public void setTecahnician(String tecahnician) - { - this.tecahnician = tecahnician; - } - - public String getTecahnician() - { - return tecahnician; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - public void setManageTags(String manageTags) - { - this.manageTags = manageTags; - } - - public String getManageTags() - { - return manageTags; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepfoldName(String sheepfoldName) - { - this.sheepfoldName = sheepfoldName; - } - - public String getSheepfoldName() - { - return sheepfoldName; - } - - public void setEventType(String eventType) - { - this.eventType = eventType; - } - - public String getEventType() - { - return eventType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("datetime", getDatetime()) - .append("status", getStatus()) - .append("sheepfold", getSheepfold()) - .append("tecahnician", getTecahnician()) - .append("comment", getComment()) - .append("manageTags", getManageTags()) - .append("variety", getVariety()) - .append("sheepfoldName", getSheepfoldName()) - .append("eventType", getEventType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java index f2bcb3a..69044e4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java @@ -5,6 +5,9 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -16,6 +19,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScLambDetail extends BaseEntity { private static final long serialVersionUID = 1L; @@ -84,159 +90,5 @@ public class ScLambDetail extends BaseEntity return id; } - public void setLambingRecordId(Long lambingRecordId) - { - this.lambingRecordId = lambingRecordId; - } - public Long getLambingRecordId() - { - return lambingRecordId; - } - - public void setLambEarNumber(String lambEarNumber) - { - this.lambEarNumber = lambEarNumber; - } - - public String getLambEarNumber() - { - return lambEarNumber; - } - - public void setLambBreed(Integer lambBreed) // 改为Integer类型 - { - this.lambBreed = lambBreed; - } - - public Integer getLambBreed() // 改为Integer类型 - { - return lambBreed; - } - - public void setGender(Integer gender) - { - this.gender = gender; - } - - public Integer getGender() - { - return gender; - } - - public void setBirthWeight(BigDecimal birthWeight) - { - this.birthWeight = birthWeight; - } - - public BigDecimal getBirthWeight() - { - return birthWeight; - } - - public void setIsRetained(Boolean isRetained) - { - this.isRetained = isRetained; - } - - public Boolean getIsRetained() - { - return isRetained; - } - - public void setLineage(String lineage) - { - this.lineage = lineage; - } - - public String getLineage() - { - return lineage; - } - - public void setBirthday(Date birthday) - { - this.birthday = birthday; - } - - public Date getBirthday() - { - return birthday; - } - - public List getLambDetails() - { - return lambDetails; - } - - public void setLambDetails(List lambDetails) - { - this.lambDetails = lambDetails; - } - - public Long getMotherId() - { - return motherId; - } - - public void setMotherId(Long motherId) - { - this.motherId = motherId; - } - - public Long getFatherId() - { - return fatherId; - } - - public void setFatherId(Long fatherId) - { - this.fatherId = fatherId; - } - - public Integer getRanchId() - { - return ranchId; - } - - public void setRanchId(Integer ranchId) - { - this.ranchId = ranchId; - } - - public Integer getSheepfoldId() - { - return sheepfoldId; - } - - public void setSheepfoldId(Integer sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Integer getParity() - { - return parity; - } - - public void setParity(Integer parity) - { - this.parity = parity; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("lambingRecordId", getLambingRecordId()) - .append("lambEarNumber", getLambEarNumber()) - .append("lambBreed", getLambBreed()) - .append("gender", getGender()) - .append("birthWeight", getBirthWeight()) - .append("isRetained", getIsRetained()) - .append("lineage", getLineage()) - .append("birthday", getBirthday()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java index 895ad55..bfb27a0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java @@ -385,17 +385,3 @@ public class ScLambingRecord extends BaseEntity } } -/** - * 羊只羔羊信息对象（用于产羔详情显示） - */ -class SheepLambInfo { - private String lambEarNumber; // 羔羊耳号 - private String lambBreed; // 羔羊品种 - private Integer gender; // 性别 - private Double birthWeight; // 出生重量 - private Boolean isRetained; // 是否留养 - private String lineage; // 家系 - private Date birthday; // 生日 - - // getter和setter方法... -} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java index 0f3ed36..f02d38f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java @@ -3,6 +3,9 @@ package com.zhyc.module.produce.breed.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -14,6 +17,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author zhyc * @date 2025-01-21 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScPregnancyRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -113,227 +119,4 @@ public class ScPregnancyRecord extends BaseEntity @Excel(name = "所在牧场") private String ranchName; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setManageTags(String manageTags) - { - this.manageTags = manageTags; - } - - public String getManageTags() - { - return manageTags; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setResult(String result) - { - this.result = result; - } - - public String getResult() - { - return result; - } - - public void setFetusCount(Integer fetusCount) - { - this.fetusCount = fetusCount; - } - - public Integer getFetusCount() - { - return fetusCount; - } - - public void setTechnician(String technician) - { - this.technician = technician; - } - - public String getTechnician() - { - return technician; - } - - public void setWay(String way) - { - this.way = way; - } - - public String getWay() - { - return way; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public String getRemark() - { - return remark; - } - - public void setIsDelete(Integer isDelete) - { - this.isDelete = isDelete; - } - - public Integer getIsDelete() - { - return isDelete; - } - - public String getVariety() { - return variety; - } - - public void setVariety(String variety) { - this.variety = variety; - } - - public Long getMonthAge() { - return monthAge; - } - - public void setMonthAge(Long monthAge) { - this.monthAge = monthAge; - } - - public Integer getParity() { - return parity; - } - - public void setParity(Integer parity) { - this.parity = parity; - } - - public Integer getMatingCounts() { - return matingCounts; - } - - public void setMatingCounts(Integer matingCounts) { - this.matingCounts = matingCounts; - } - - public String getSheepfoldName() { - return sheepfoldName; - } - - public void setSheepfoldName(String sheepfoldName) { - this.sheepfoldName = sheepfoldName; - } - - public String getBreedStatus() { - return breedStatus; - } - - public void setBreedStatus(String breedStatus) { - this.breedStatus = breedStatus; - } - - public String getFatherManageTags() { - return fatherManageTags; - } - - public void setFatherManageTags(String fatherManageTags) { - this.fatherManageTags = fatherManageTags; - } - - public String getFatherVariety() { - return fatherVariety; - } - - public void setFatherVariety(String fatherVariety) { - this.fatherVariety = fatherVariety; - } - - public String getMatingTypeName() { - return matingTypeName; - } - - public void setMatingTypeName(String matingTypeName) { - this.matingTypeName = matingTypeName; - } - - public Date getMatingDate() { - return matingDate; - } - - public void setMatingDate(Date matingDate) { - this.matingDate = matingDate; - } - - public Date getExpectedDate() { - return expectedDate; - } - - public void setExpectedDate(Date expectedDate) { - this.expectedDate = expectedDate; - } - - public Date getLastEventDate() { - return lastEventDate; - } - - public void setLastEventDate(Date lastEventDate) { - this.lastEventDate = lastEventDate; - } - - public String getRanchName() { - return ranchName; - } - - public void setRanchName(String ranchName) { - this.ranchName = ranchName; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("manageTags", getManageTags()) - .append("datetime", getDatetime()) - .append("result", getResult()) - .append("fetusCount", getFetusCount()) - .append("technician", getTechnician()) - .append("way", getWay()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("isDelete", getIsDelete()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java index 06ca783..79c70ce 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java @@ -5,6 +5,9 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +17,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author zhyc * @date 2024-01-01 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScWeanRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -90,173 +96,5 @@ public class ScWeanRecord extends BaseEntity { @Excel(name = "繁育状态") private String breedingStatus; - public void setId(Long id) { - this.id = id; - } - public Long getId() { - return id; - } - - public void setSheepId(Long sheepId) { - this.sheepId = sheepId; - } - - public Long getSheepId() { - return sheepId; - } - - public void setDatetime(Date datetime) { - this.datetime = datetime; - } - - public Date getDatetime() { - return datetime; - } - - public void setWeight(BigDecimal weight) { - this.weight = weight; - } - - public BigDecimal getWeight() { - return weight; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatus() { - return status; - } - - public void setTechnician(String technician) { - this.technician = technician; - } - - public String getTechnician() { - return technician; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getComment() { - return comment; - } - - public void setElectronicTags(String electronicTags) { - this.electronicTags = electronicTags; - } - - public String getElectronicTags() { - return electronicTags; - } - - public void setEarNumber(String earNumber) { - this.earNumber = earNumber; - } - - public String getEarNumber() { - return earNumber; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public String getBreed() { - return breed; - } - - public void setEventType(String eventType) { - this.eventType = eventType; - } - - public String getEventType() { - return eventType; - } - - public void setGender(String gender) { - this.gender = gender; - } - - public String getGender() { - return gender; - } - - public void setFatherNumber(String fatherNumber) { - this.fatherNumber = fatherNumber; - } - - public String getFatherNumber() { - return fatherNumber; - } - - public void setMotherNumber(String motherNumber) { - this.motherNumber = motherNumber; - } - - public String getMotherNumber() { - return motherNumber; - } - - public void setMonthAge(Integer monthAge) { - this.monthAge = monthAge; - } - - public Integer getMonthAge() { - return monthAge; - } - - public void setBirthWeight(BigDecimal birthWeight) { - this.birthWeight = birthWeight; - } - - public BigDecimal getBirthWeight() { - return birthWeight; - } - - public void setSheepPen(String sheepPen) { - this.sheepPen = sheepPen; - } - - public String getSheepPen() { - return sheepPen; - } - - public void setBreedingStatus(String breedingStatus) { - this.breedingStatus = breedingStatus; - } - - public String getBreedingStatus() { - return breedingStatus; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("datetime", getDatetime()) - .append("weight", getWeight()) - .append("status", getStatus()) - .append("technician", getTechnician()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("electronicTags", getElectronicTags()) - .append("earNumber", getEarNumber()) - .append("breed", getBreed()) - .append("eventType", getEventType()) - .append("gender", getGender()) - .append("fatherNumber", getFatherNumber()) - .append("motherNumber", getMotherNumber()) - .append("monthAge", getMonthAge()) - .append("birthWeight", getBirthWeight()) - .append("sheepPen", getSheepPen()) - .append("breedingStatus", getBreedingStatus()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java new file mode 100644 index 0000000..e8b79f7 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java @@ -0,0 +1,25 @@ +package com.zhyc.module.produce.breed.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 羊只羔羊信息对象（用于产羔详情显示） + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +class SheepLambInfo { + private String lambEarNumber; // 羔羊耳号 + private String lambBreed; // 羔羊品种 + private Integer gender; // 性别 + private Double birthWeight; // 出生重量 + private Boolean isRetained; // 是否留养 + private String lineage; // 家系 + private Date birthday; // 生日 + + +}