Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java

@@ -2,6 +2,8 @@ package com.stdiet.custom.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -102,4 +104,10 @@ public class SysCustomer extends BaseEntity
 
     private String[] channels;
 
+    //病史体征ID集合，非持久化字段
+    private List<Long> signIdList;
+
+    //病史体征ID
+    private String physicalSignsId;
+
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysMessageNotice.java

@@ -0,0 +1,54 @@
+package com.stdiet.custom.domain;
+
+import lombok.Data;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 客户消息通知对象 sys_message_notice
+ *
+ * @author xzj
+ * @date 2021-04-26
+ */
+@Data
+public class SysMessageNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 消息属性，0 公共消息 1 私有消息 */
+    @Excel(name = "消息属性，0 公共消息 1 私有消息")
+    private Integer messageProperty;
+
+    /** 消息对应客户ID (公共消息时该字段为0) */
+    @Excel(name = "消息对应客户ID (公共消息时该字段为0)")
+    private Long messageCustomer;
+
+    //用户加密ID，非持久化字段
+    private String customerId;
+
+    /** 消息类型 */
+    @Excel(name = "消息类型")
+    private Integer messageType;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String messageTitle;
+
+    /** 消息内容 */
+    @Excel(name = "消息内容")
+    private String messageContent;
+
+    /** 是否已读 0未读 1已读 */
+    @Excel(name = "是否已读 0未读 1已读")
+    private Integer readType;
+
+    /** 当前消息对应关键参数，多个参数可保存json字符串 */
+    @Excel(name = "当前消息对应关键参数，多个参数可保存json字符串")
+    private String messageKey;
+
+    /** 删除标识 0未删除 1已删除 */
+    private Integer delFlag;
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysNutritionalVideo.java

@@ -0,0 +1,55 @@
+package com.stdiet.custom.domain;
+
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 营养视频对象 sys_nutritional_video
+ *
+ * @author xzj
+ * @date 2021-04-29
+ */
+@Data
+public class SysNutritionalVideo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 视频分类ID */
+    @Excel(name = "视频分类ID")
+    private Long cateId;
+
+    /** 阿里云视频ID */
+    @Excel(name = "阿里云视频ID")
+    private String videoId;
+
+    /** 视频封面URL */
+    @Excel(name = "视频封面URL")
+    private String coverUrl;
+
+    /** 视频标题 */
+    @Excel(name = "视频标题")
+    private String title;
+
+    /** 视频描述 */
+    @Excel(name = "视频描述")
+    private String description;
+
+    /** 视频大小，单位：字节 */
+    @Excel(name = "视频大小，单位：字节")
+    private Long videoSize;
+
+    /** 标签，使用 , 隔开 */
+    @Excel(name = "标签，使用 , 隔开")
+    private String tags;
+
+    /** 是否显示，0不显示 1显示，默认0 */
+    @Excel(name = "是否显示，0不显示 1显示，默认0")
+    private Integer showFlag;
+
+    /** 删除标识，0未删除 1已删除，默认0 */
+    private Integer delFlag;
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/entityEnum/MessageNoticeEnum.java

@@ -0,0 +1,75 @@
+package com.stdiet.custom.domain.entityEnum;
+
+public enum MessageNoticeEnum{
+
+    systemMessage("系统通知", 0, 0, "系统通知"),
+    punchComment("打卡点评", 1, 1, "%s打卡点评"); //%s 为打卡时间
+
+
+    //消息名称
+    private String name;
+
+    //消息属性 0公共 1私有
+    private Integer property;
+
+    //消息类型
+    private Integer type;
+
+    //消息标题模板
+    private String titleTemplate;
+
+    MessageNoticeEnum(String name, Integer property, Integer type, String titleTemplate){
+        this.name = name;
+        this.property = property;
+        this.type = type;
+        this.titleTemplate = titleTemplate;
+    }
+
+    /**
+     * 根据type类型获取枚举对象
+     * @param type
+     * @return
+     */
+    public static MessageNoticeEnum getNoticeEnumByType(Integer type){
+        for (MessageNoticeEnum messageEnum : MessageNoticeEnum.values()) {
+            if(messageEnum.getType().intValue() == type.intValue()){
+                return messageEnum;
+            }
+        }
+        return systemMessage;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getProperty() {
+        return property;
+    }
+
+    public void setProperty(Integer property) {
+        this.property = property;
+    }
+
+    public String getTitleTemplate() {
+        return titleTemplate;
+    }
+
+    public void setTitleTemplate(String titleTemplate) {
+        this.titleTemplate = titleTemplate;
+    }
+
+}