王宇：产品管理基础类

diagbotman-service/src/main/java/com/diagbot/entity/LantoneProduct.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class LantoneProduct implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -61,9 +62,9 @@ public class LantoneProduct implements Serializable {
     private String decription;
 
     /**
-     * 计费方式（1.流程计费2.机构计费3.用户计费）
+     * 计费方式
      */
-    private Integer chargeType;
+    private String chargeType;
 
     /**
      * 产品路径
@@ -90,6 +91,11 @@ public class LantoneProduct implements Serializable {
      */
     private String trialUrl;
 
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String accessType;
+
 
     public Integer getId() {
         return id;
@@ -107,19 +113,19 @@ public class LantoneProduct implements Serializable {
         this.isDeleted = isDeleted;
     }
 
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
 
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
 
@@ -155,11 +161,11 @@ public class LantoneProduct implements Serializable {
         this.decription = decription;
     }
 
-    public Integer getChargeType() {
+    public String getChargeType() {
         return chargeType;
     }
 
-    public void setChargeType(Integer chargeType) {
+    public void setChargeType(String chargeType) {
         this.chargeType = chargeType;
     }
 
@@ -203,23 +209,32 @@ public class LantoneProduct implements Serializable {
         this.trialUrl = trialUrl;
     }
 
+    public String getAccessType() {
+        return accessType;
+    }
+
+    public void setAccessType(String accessType) {
+        this.accessType = accessType;
+    }
+
     @Override
     public String toString() {
         return "LantoneProduct{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", decription=" + decription +
-        ", chargeType=" + chargeType +
-        ", url=" + url +
-        ", openNum=" + openNum +
-        ", serviceStatus=" + serviceStatus +
-        ", trialStatus=" + trialStatus +
-        ", trialUrl=" + trialUrl +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", decription=" + decription +
+                ", chargeType=" + chargeType +
+                ", url=" + url +
+                ", openNum=" + openNum +
+                ", serviceStatus=" + serviceStatus +
+                ", trialStatus=" + trialStatus +
+                ", trialUrl=" + trialUrl +
+                ", accessType=" + accessType +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/OpenedProducts.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class OpenedProducts implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -63,12 +64,12 @@ public class OpenedProducts implements Serializable {
     /**
      * 开通日期
      */
-    private LocalDateTime startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDateTime endTime;
+    private Date endTime;
 
     /**
      * 停用状态
@@ -76,9 +77,9 @@ public class OpenedProducts implements Serializable {
     private Integer serviceStatus;
 
     /**
-     * 计费方式（1.流程计费2.机构计费3.用户计费）
+     * 订单id
      */
-    private Integer chargeType;
+    private Integer orderId;
 
 
     public Long getId() {
@@ -97,19 +98,19 @@ public class OpenedProducts implements Serializable {
         this.isDeleted = isDeleted;
     }
 
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
 
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
 
@@ -145,19 +146,19 @@ public class OpenedProducts implements Serializable {
         this.userId = userId;
     }
 
-    public LocalDateTime getStartTime() {
+    public Date getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(LocalDateTime startTime) {
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
 
-    public LocalDateTime getEndTime() {
+    public Date getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(LocalDateTime endTime) {
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
 
@@ -169,29 +170,29 @@ public class OpenedProducts implements Serializable {
         this.serviceStatus = serviceStatus;
     }
 
-    public Integer getChargeType() {
-        return chargeType;
+    public Integer getOrderId() {
+        return orderId;
     }
 
-    public void setChargeType(Integer chargeType) {
-        this.chargeType = chargeType;
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
     }
 
     @Override
     public String toString() {
         return "OpenedProducts{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", productId=" + productId +
-        ", userId=" + userId +
-        ", startTime=" + startTime +
-        ", endTime=" + endTime +
-        ", serviceStatus=" + serviceStatus +
-        ", chargeType=" + chargeType +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", productId=" + productId +
+                ", userId=" + userId +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", serviceStatus=" + serviceStatus +
+                ", orderId=" + orderId +
+                "}";
     }
 }

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -18,6 +18,7 @@
         <result column="service_status" property="serviceStatus" />
         <result column="trial_status" property="trialStatus" />
         <result column="trial_url" property="trialUrl" />
+        <result column="access_type" property="accessType" />
     </resultMap>
 
 </mapper>

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -15,7 +15,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="service_status" property="serviceStatus" />
-        <result column="charge_type" property="chargeType" />
+        <result column="order_id" property="orderId" />
     </resultMap>
 
 </mapper>