完成食材管理页面

2020-12-23 20:44:23 +08:00
parent 347ff618d0
commit fa5264b908
12 changed files with 979 additions and 172 deletions
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java
@@ -1,67 +1,91 @@
 package com.stdiet.custom.domain;

-import java.math.BigDecimal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
 import com.stdiet.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;

 /**
 * 食材对象 sys_ingredient
- * 
+ *
 * @author wonder
 * @date 2020-12-15
 */
-public class SysIngredient extends BaseEntity
-{
+public class SysIngredient extends BaseEntity {
    private static final long serialVersionUID = 1L;

-    /** id */
+    /**
+     * id
+     */
    private Long id;

-    /** 食材名称 */
+    /**
+     * 食材名称
+     */
    @Excel(name = "食材名称")
    private String name;

-    /** 食材类别 */
+    /**
+     * 食材类别
+     */
    @Excel(name = "食材类别")
    private String type;

-    /** 推荐分量估算 */
+    /**
+     * 推荐分量估算
+     */
    @Excel(name = "推荐分量估算")
    private Long recEstimation;

-    /** 推荐分量估算单位id */
+    /**
+     * 推荐分量估算单位id
+     */
    @Excel(name = "推荐分量估算单位id")
    private Long recEstUnit;

-    /** 推荐分量 */
+    /**
+     * 推荐分量
+     */
    @Excel(name = "推荐分量")
    private Long recPortion;

-    /** 蛋白质比例 */
+    /**
+     * 蛋白质比例
+     */
    @Excel(name = "蛋白质比例")
    private BigDecimal proteinRatio;

-    /** 脂肪比例 */
+    /**
+     * 脂肪比例
+     */
    @Excel(name = "脂肪比例")
    private BigDecimal fatRatio;

-    /** 碳水比例 */
+    /**
+     * 碳水比例
+     */
    @Excel(name = "碳水比例")
    private BigDecimal carbonRatio;

-    /** 地域 */
+    /**
+     * 地域
+     */
    @Excel(name = "地域")
    private String area;

-    /** 忌口 */
-    @Excel(name = "忌口")
+    /**
+     * 忌口
+     */
+    @Excel(name = "忌口人群")
    private String notRec;

-    /** 推荐 */
-    @Excel(name = "推荐")
-    private String recommend;
+    /**
+     * 推荐
+     */
+    @Excel(name = "推荐人群")
+    private String rec;

    private Long[] recIds;

@@ -75,143 +99,122 @@ public class SysIngredient extends BaseEntity
        return notRecIds;
    }

-    public void setNotRecIds(Long[] notRecIds) {
-        this.notRecIds = notRecIds;
+    public Long getId() {
+        return id;
    }

-    public void setRedIds(Long[] recIds) {
-        this.recIds = recIds;
-    }
-
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
        this.id = id;
    }

-    public Long getId() 
-    {
-        return id;
+    public String getName() {
+        return name;
    }
-    public void setName(String name) 
-    {
+
+    public void setName(String name) {
        this.name = name;
    }

-    public String getName() 
-    {
-        return name;
+    public String getType() {
+        return type;
    }
-    public void setType(String type) 
-    {
+
+    public void setType(String type) {
        this.type = type;
    }

-    public String getType() 
-    {
-        return type;
+    public Long getRecEstimation() {
+        return recEstimation;
    }
-    public void setRecEstimation(Long recEstimation) 
-    {
+
+    public void setRecEstimation(Long recEstimation) {
        this.recEstimation = recEstimation;
    }

-    public Long getRecEstimation() 
-    {
-        return recEstimation;
+    public Long getRecEstUnit() {
+        return recEstUnit;
    }
-    public void setRecEstUnit(Long recEstUnit) 
-    {
+
+    public void setRecEstUnit(Long recEstUnit) {
        this.recEstUnit = recEstUnit;
    }

-    public Long getRecEstUnit() 
-    {
-        return recEstUnit;
+    public Long getRecPortion() {
+        return recPortion;
    }
-    public void setRecPortion(Long recPortion) 
-    {
+
+    public void setRecPortion(Long recPortion) {
        this.recPortion = recPortion;
    }

-    public Long getRecPortion() 
-    {
-        return recPortion;
+    public BigDecimal getProteinRatio() {
+        return proteinRatio;
    }
-    public void setProteinRatio(BigDecimal proteinRatio) 
-    {
+
+    public void setProteinRatio(BigDecimal proteinRatio) {
        this.proteinRatio = proteinRatio;
    }

-    public BigDecimal getProteinRatio() 
-    {
-        return proteinRatio;
+    public BigDecimal getFatRatio() {
+        return fatRatio;
    }
-    public void setFatRatio(BigDecimal fatRatio) 
-    {
+
+    public void setFatRatio(BigDecimal fatRatio) {
        this.fatRatio = fatRatio;
    }

-    public BigDecimal getFatRatio() 
-    {
-        return fatRatio;
+    public BigDecimal getCarbonRatio() {
+        return carbonRatio;
    }
-    public void setCarbonRatio(BigDecimal carbonRatio) 
-    {
+
+    public void setCarbonRatio(BigDecimal carbonRatio) {
        this.carbonRatio = carbonRatio;
    }

-    public BigDecimal getCarbonRatio() 
-    {
-        return carbonRatio;
+    public String getArea() {
+        return area;
    }
-    public void setArea(String area) 
-    {
+
+    public void setArea(String area) {
        this.area = area;
    }

-    public String getArea() 
-    {
-        return area;
+    public String getNotRec() {
+        return notRec;
    }
-    public void setNotRec(String notRec)
-    {
+
+    public void setNotRec(String notRec) {
        this.notRec = notRec;
    }

-    public String getNotRec()
-    {
-        return notRec;
-    }
-    public void setRecommend(String recommend)
-    {
-        this.recommend = recommend;
+    public String getRec() {
+        return rec;
    }

-    public String getRecommend()
-    {
-        return recommend;
+    public void setRec(String rec) {
+        this.rec = rec;
    }

    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("type", getType())
-            .append("recEstimation", getRecEstimation())
-            .append("recEstUnit", getRecEstUnit())
-            .append("recPortion", getRecPortion())
-            .append("proteinRatio", getProteinRatio())
-            .append("fatRatio", getFatRatio())
-            .append("carbonRatio", getCarbonRatio())
-            .append("remark", getRemark())
-            .append("area", getArea())
-            .append("notRec", getNotRec())
-            .append("recommend", getRecommend())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("type", getType())
+                .append("recEstimation", getRecEstimation())
+                .append("recEstUnit", getRecEstUnit())
+                .append("recPortion", getRecPortion())
+                .append("proteinRatio", getProteinRatio())
+                .append("fatRatio", getFatRatio())
+                .append("carbonRatio", getCarbonRatio())
+                .append("remark", getRemark())
+                .append("area", getArea())
+                .append("notRec", getNotRec())
+                .append("recommend", getRec())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
    }
 }
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysPhysicalSigns.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysPhysicalSigns.java
@@ -0,0 +1,66 @@
+package com.stdiet.custom.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 体征对象 sys_physical_signs
+ *
+ * @author wonder
+ * @date 2020-12-23
+ */
+public class SysPhysicalSigns extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 体征名称 */
+    @Excel(name = "体征名称")
+    private String name;
+
+    /** 体征类别 */
+    @Excel(name = "体征类别")
+    private Long typeId;
+
+    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 setTypeId(Long typeId)
+    {
+        this.typeId = typeId;
+    }
+
+    public Long getTypeId()
+    {
+        return typeId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("typeId", getTypeId())
+                .append("remark", getRemark())
+                .toString();
+    }
+}