表设计

src/main/java/com/bt/common/model/AccountBalance.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BaseAccountBalance;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class AccountBalance extends BaseAccountBalance<AccountBalance> {
+	
+}
+

src/main/java/com/bt/common/model/AccountBalanceChange.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BaseAccountBalanceChange;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class AccountBalanceChange extends BaseAccountBalanceChange<AccountBalanceChange> {
+	
+}
+

src/main/java/com/bt/common/model/Payment.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BasePayment;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Payment extends BasePayment<Payment> {
+	
+}
+

src/main/java/com/bt/common/model/ProductPricing.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BaseProductPricing;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class ProductPricing extends BaseProductPricing<ProductPricing> {
+	
+}
+

src/main/java/com/bt/common/model/StoredValueCard.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BaseStoredValueCard;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class StoredValueCard extends BaseStoredValueCard<StoredValueCard> {
+	
+}
+

src/main/java/com/bt/common/model/UserDevice.java

@@ -0,0 +1,12 @@
+package com.bt.common.model;
+
+import com.bt.common.model.base.BaseUserDevice;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class UserDevice extends BaseUserDevice<UserDevice> {
+	
+}
+

src/main/java/com/bt/common/model/_MappingKit.java

@@ -17,6 +17,8 @@ public class _MappingKit {
 	
 	public static void mapping(ActiveRecordPlugin arp) {
 		arp.addMapping("account", "id", Account.class);
+		arp.addMapping("account_balance", "id", AccountBalance.class);
+		arp.addMapping("account_balance_change", "id", AccountBalanceChange.class);
 		arp.addMapping("auth_code", "id", AuthCode.class);
 		arp.addMapping("device", "id", Device.class);
 		// Composite Primary Key order: mainMenu,subMenu
@@ -30,8 +32,10 @@ public class _MappingKit {
 		arp.addMapping("news_feed", "id", NewsFeed.class);
 		arp.addMapping("order", "id", Order.class);
 		arp.addMapping("order_detail", "id", OrderDetail.class);
+		arp.addMapping("payment", "id", Payment.class);
 		arp.addMapping("permission", "id", Permission.class);
 		arp.addMapping("product", "id", Product.class);
+		arp.addMapping("product_pricing", "id", ProductPricing.class);
 		arp.addMapping("project", "id", Project.class);
 		arp.addMapping("realname_verification", "id", RealnameVerification.class);
 		arp.addMapping("refer_me", "id", ReferMe.class);
@@ -40,7 +44,9 @@ public class _MappingKit {
 		arp.addMapping("session", "id", Session.class);
 		arp.addMapping("share", "id", Share.class);
 		arp.addMapping("share_reply", "id", ShareReply.class);
+		arp.addMapping("stored_value_card", "id", StoredValueCard.class);
 		arp.addMapping("task_list", "id", TaskList.class);
+		arp.addMapping("user_device", "id", UserDevice.class);
 	}
 }
 

src/main/java/com/bt/common/model/base/BaseAccountBalance.java

@@ -0,0 +1,63 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseAccountBalance<M extends BaseAccountBalance<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public void setAccountId(java.lang.Integer accountId) {
+		set("accountId", accountId);
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public java.lang.Integer getAccountId() {
+		return getInt("accountId");
+	}
+	
+	/**
+	 * 账户余额
+	 */
+	public void setAmount(java.math.BigDecimal amount) {
+		set("amount", amount);
+	}
+	
+	/**
+	 * 账户余额
+	 */
+	public java.math.BigDecimal getAmount() {
+		return getBigDecimal("amount");
+	}
+	
+	/**
+	 * 创建时间
+	 */
+	public void setCreateTime(java.time.LocalDateTime createTime) {
+		set("createTime", createTime);
+	}
+	
+	/**
+	 * 创建时间
+	 */
+	public java.time.LocalDateTime getCreateTime() {
+		return getLocalDateTime("createTime");
+	}
+	
+}
+

src/main/java/com/bt/common/model/base/BaseAccountBalanceChange.java

@@ -0,0 +1,115 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseAccountBalanceChange<M extends BaseAccountBalanceChange<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public void setAccountId(java.lang.Integer accountId) {
+		set("accountId", accountId);
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public java.lang.Integer getAccountId() {
+		return getInt("accountId");
+	}
+	
+	/**
+	 * 余额变动的金额，可以是正数（表示增加）或负数（表示减少）
+	 */
+	public void setAmount(java.math.BigDecimal amount) {
+		set("amount", amount);
+	}
+	
+	/**
+	 * 余额变动的金额，可以是正数（表示增加）或负数（表示减少）
+	 */
+	public java.math.BigDecimal getAmount() {
+		return getBigDecimal("amount");
+	}
+	
+	/**
+	 * 余额变动时间
+	 */
+	public void setChangeTime(java.time.LocalDateTime changeTime) {
+		set("changeTime", changeTime);
+	}
+	
+	/**
+	 * 余额变动时间
+	 */
+	public java.time.LocalDateTime getChangeTime() {
+		return getLocalDateTime("changeTime");
+	}
+	
+	/**
+	 * 余额变动的类型 如充值、消费等
+	 */
+	public void setType(java.lang.Integer type) {
+		set("type", type);
+	}
+	
+	/**
+	 * 余额变动的类型 如充值、消费等
+	 */
+	public java.lang.Integer getType() {
+		return getInt("type");
+	}
+	
+	/**
+	 * 余额变动的方式 如扫码支付、对公转账、管理员手动预存、储值卡充值等。
+	 */
+	public void setMethod(java.lang.String method) {
+		set("method", method);
+	}
+	
+	/**
+	 * 余额变动的方式 如扫码支付、对公转账、管理员手动预存、储值卡充值等。
+	 */
+	public java.lang.String getMethod() {
+		return getStr("method");
+	}
+	
+	/**
+	 * 如果余额变动与订单有关，这个字段可以与订单表中的 order_id 关联。
+
+	 */
+	public void setRelatedOrderId(java.lang.Integer relatedOrderId) {
+		set("relatedOrderId", relatedOrderId);
+	}
+	
+	/**
+	 * 如果余额变动与订单有关，这个字段可以与订单表中的 order_id 关联。
+
+	 */
+	public java.lang.Integer getRelatedOrderId() {
+		return getInt("relatedOrderId");
+	}
+	
+	public void setCreateTime(java.time.LocalDateTime createTime) {
+		set("createTime", createTime);
+	}
+	
+	public java.time.LocalDateTime getCreateTime() {
+		return getLocalDateTime("createTime");
+	}
+	
+}
+

src/main/java/com/bt/common/model/base/BaseOrder.java

@@ -32,31 +32,59 @@ public abstract class BaseOrder<M extends BaseOrder<M>> extends Model<M> impleme
 	}
 	
 	/**
-	 * 开始时间
+	 * 产品定价id
 	 */
-	public void setStartTime(java.time.LocalDateTime startTime) {
-		set("startTime", startTime);
+	public void setPricingId(java.lang.Integer pricingId) {
+		set("pricingId", pricingId);
 	}
 	
 	/**
-	 * 开始时间
+	 * 产品定价id
 	 */
-	public java.time.LocalDateTime getStartTime() {
-		return getLocalDateTime("startTime");
+	public java.lang.Integer getPricingId() {
+		return getInt("pricingId");
 	}
 	
 	/**
-	 * 结束时间
+	 * 订单状态 0待支付，1已支付，2已取消，3已退款
 	 */
-	public void setEndTime(java.time.LocalDateTime endTime) {
-		set("endTime", endTime);
+	public void setStatus(java.lang.Integer status) {
+		set("status", status);
 	}
 	
 	/**
-	 * 结束时间
+	 * 订单状态 0待支付，1已支付，2已取消，3已退款
 	 */
-	public java.time.LocalDateTime getEndTime() {
-		return getLocalDateTime("endTime");
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+	
+	/**
+	 * 设备交付状态0未分配1已分配
+	 */
+	public void setDeviceAssignment(java.lang.Integer deviceAssignment) {
+		set("deviceAssignment", deviceAssignment);
+	}
+	
+	/**
+	 * 设备交付状态0未分配1已分配
+	 */
+	public java.lang.Integer getDeviceAssignment() {
+		return getInt("deviceAssignment");
+	}
+	
+	/**
+	 * 设备id
+	 */
+	public void setDeviceId(java.lang.Integer deviceId) {
+		set("deviceId", deviceId);
+	}
+	
+	/**
+	 * 设备id
+	 */
+	public java.lang.Integer getDeviceId() {
+		return getInt("deviceId");
 	}
 	
 	public void setName(java.lang.String name) {

src/main/java/com/bt/common/model/base/BasePayment.java

@@ -0,0 +1,85 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BasePayment<M extends BasePayment<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 订单id
+	 */
+	public void setOrderId(java.lang.Integer orderId) {
+		set("orderId", orderId);
+	}
+	
+	/**
+	 * 订单id
+	 */
+	public java.lang.Integer getOrderId() {
+		return getInt("orderId");
+	}
+	
+	/**
+	 * 支付方式 扫码支付，账户余额等
+	 */
+	public void setMethod(java.lang.Integer method) {
+		set("method", method);
+	}
+	
+	/**
+	 * 支付方式 扫码支付，账户余额等
+	 */
+	public java.lang.Integer getMethod() {
+		return getInt("method");
+	}
+	
+	/**
+	 * 支付状态 0待支付1已支付2支付失败
+	 */
+	public void setStatus(java.lang.Integer status) {
+		set("status", status);
+	}
+	
+	/**
+	 * 支付状态 0待支付1已支付2支付失败
+	 */
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+	
+	/**
+	 * 支付时间
+	 */
+	public void setPayTime(java.time.LocalDateTime payTime) {
+		set("payTime", payTime);
+	}
+	
+	/**
+	 * 支付时间
+	 */
+	public java.time.LocalDateTime getPayTime() {
+		return getLocalDateTime("payTime");
+	}
+	
+	public void setCreateTime(java.time.LocalDateTime createTime) {
+		set("createTime", createTime);
+	}
+	
+	public java.time.LocalDateTime getCreateTime() {
+		return getLocalDateTime("createTime");
+	}
+	
+}
+

src/main/java/com/bt/common/model/base/BaseProduct.java

@@ -277,48 +277,6 @@ public abstract class BaseProduct<M extends BaseProduct<M>> extends Model<M> imp
 		return getStr("internalNetworkBandwidth");
 	}
 	
-	/**
-	 * 日租费用
-	 */
-	public void setDailyRentalFee(java.lang.String dailyRentalFee) {
-		set("dailyRentalFee", dailyRentalFee);
-	}
-	
-	/**
-	 * 日租费用
-	 */
-	public java.lang.String getDailyRentalFee() {
-		return getStr("dailyRentalFee");
-	}
-	
-	/**
-	 * 月租费用
-	 */
-	public void setMonthlyRentalFee(java.lang.String monthlyRentalFee) {
-		set("monthlyRentalFee", monthlyRentalFee);
-	}
-	
-	/**
-	 * 月租费用
-	 */
-	public java.lang.String getMonthlyRentalFee() {
-		return getStr("monthlyRentalFee");
-	}
-	
-	/**
-	 * 单价/核心
-	 */
-	public void setPricePerCore(java.lang.String pricePerCore) {
-		set("pricePerCore", pricePerCore);
-	}
-	
-	/**
-	 * 单价/核心
-	 */
-	public java.lang.String getPricePerCore() {
-		return getStr("pricePerCore");
-	}
-	
 	/**
 	 * 单UTDP
 	 */

src/main/java/com/bt/common/model/base/BaseProductPricing.java

@@ -0,0 +1,99 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseProductPricing<M extends BaseProductPricing<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 定价名称
+	 */
+	public void setName(java.lang.String name) {
+		set("name", name);
+	}
+	
+	/**
+	 * 定价名称
+	 */
+	public java.lang.String getName() {
+		return getStr("name");
+	}
+	
+	/**
+	 * 产品id
+	 */
+	public void setProductId(java.lang.Integer productId) {
+		set("productId", productId);
+	}
+	
+	/**
+	 * 产品id
+	 */
+	public java.lang.Integer getProductId() {
+		return getInt("productId");
+	}
+	
+	/**
+	 * 定价的时长，如天、月、半年、年填数字
+	 */
+	public void setDuration(java.lang.Integer duration) {
+		set("duration", duration);
+	}
+	
+	/**
+	 * 定价的时长，如天、月、半年、年填数字
+	 */
+	public java.lang.Integer getDuration() {
+		return getInt("duration");
+	}
+	
+	/**
+	 * 定价的价格
+	 */
+	public void setPrice(java.math.BigDecimal price) {
+		set("price", price);
+	}
+	
+	/**
+	 * 定价的价格
+	 */
+	public java.math.BigDecimal getPrice() {
+		return getBigDecimal("price");
+	}
+	
+	public void setCreateAt(java.time.LocalDateTime createAt) {
+		set("createAt", createAt);
+	}
+	
+	public java.time.LocalDateTime getCreateAt() {
+		return getLocalDateTime("createAt");
+	}
+	
+	/**
+	 * 删除标志
+	 */
+	public void setYn(java.lang.Integer yn) {
+		set("yn", yn);
+	}
+	
+	/**
+	 * 删除标志
+	 */
+	public java.lang.Integer getYn() {
+		return getInt("yn");
+	}
+	
+}
+

src/main/java/com/bt/common/model/base/BaseStoredValueCard.java

@@ -0,0 +1,57 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseStoredValueCard<M extends BaseStoredValueCard<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 面值
+	 */
+	public void setValue(java.math.BigDecimal value) {
+		set("value", value);
+	}
+	
+	/**
+	 * 面值
+	 */
+	public java.math.BigDecimal getValue() {
+		return getBigDecimal("value");
+	}
+	
+	/**
+	 * 状态，如未使用、已使用、已过期
+	 */
+	public void setStatus(java.lang.Integer status) {
+		set("status", status);
+	}
+	
+	/**
+	 * 状态，如未使用、已使用、已过期
+	 */
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+	
+	public void setCreateTime(java.time.LocalDateTime createTime) {
+		set("createTime", createTime);
+	}
+	
+	public java.time.LocalDateTime getCreateTime() {
+		return getLocalDateTime("createTime");
+	}
+	
+}
+

src/main/java/com/bt/common/model/base/BaseUserDevice.java

@@ -0,0 +1,135 @@
+package com.bt.common.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseUserDevice<M extends BaseUserDevice<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public void setAccountId(java.lang.Integer accountId) {
+		set("accountId", accountId);
+	}
+	
+	/**
+	 * 账户id
+	 */
+	public java.lang.Integer getAccountId() {
+		return getInt("accountId");
+	}
+	
+	/**
+	 * 关联订单id
+	 */
+	public void setOrderId(java.lang.Integer orderId) {
+		set("orderId", orderId);
+	}
+	
+	/**
+	 * 关联订单id
+	 */
+	public java.lang.Integer getOrderId() {
+		return getInt("orderId");
+	}
+	
+	/**
+	 * 关联的产品id
+	 */
+	public void setProductId(java.lang.Integer productId) {
+		set("productId", productId);
+	}
+	
+	/**
+	 * 关联的产品id
+	 */
+	public java.lang.Integer getProductId() {
+		return getInt("productId");
+	}
+	
+	/**
+	 * 设备账号
+	 */
+	public void setAccount(java.lang.String account) {
+		set("account", account);
+	}
+	
+	/**
+	 * 设备账号
+	 */
+	public java.lang.String getAccount() {
+		return getStr("account");
+	}
+	
+	public void setPassword(java.lang.String password) {
+		set("password", password);
+	}
+	
+	public java.lang.String getPassword() {
+		return getStr("password");
+	}
+	
+	/**
+	 * 开始时间
+	 */
+	public void setStartTime(java.time.LocalDateTime startTime) {
+		set("startTime", startTime);
+	}
+	
+	/**
+	 * 开始时间
+	 */
+	public java.time.LocalDateTime getStartTime() {
+		return getLocalDateTime("startTime");
+	}
+	
+	/**
+	 * 结束时间
+	 */
+	public void setEndTime(java.time.LocalDateTime endTime) {
+		set("endTime", endTime);
+	}
+	
+	/**
+	 * 结束时间
+	 */
+	public java.time.LocalDateTime getEndTime() {
+		return getLocalDateTime("endTime");
+	}
+	
+	/**
+	 * 设备状态 0使用中 1即将过期 2已过期
+	 */
+	public void setStatus(java.lang.Integer status) {
+		set("status", status);
+	}
+	
+	/**
+	 * 设备状态 0使用中 1即将过期 2已过期
+	 */
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+	
+	public void setCreateTime(java.time.LocalDateTime createTime) {
+		set("createTime", createTime);
+	}
+	
+	public java.time.LocalDateTime getCreateTime() {
+		return getLocalDateTime("createTime");
+	}
+	
+}
+

src/test/java/com/bt/gen/ModelGenerator.java

@@ -1,10 +1,14 @@
 package com.bt.gen;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import javax.sql.DataSource;
 
 import com.jfinal.kit.PathKit;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.generator.Generator;
+import com.jfinal.plugin.activerecord.generator.TypeMapping;
 import com.jfinal.plugin.druid.DruidPlugin;
 
 public class ModelGenerator {
@@ -51,21 +55,21 @@ public class ModelGenerator {
    * @param args
    */
   public static void main(String[] args) {
-    // base model 所使用的包名
-    String baseModelPackageName = "com.bt.common.model.base";
-    // base model 文件保存路径
-    String baseModelOutputDir = PathKit.getWebRootPath() + "/src/main/java/com/bt/common/model/base";
-
-    System.out.println("输出路径："+ baseModelOutputDir);
     // model 所使用的包名 (MappingKit 默认使用的包名)
     String modelPackageName = "com.bt.common.model";
+
+    // base model 所使用的包名
+    String baseModelPackageName = modelPackageName + ".base";
+    // base model 文件保存路径
+    String baseModelOutputDir = System.getProperty("user.dir") + "/src/main/java/" +  baseModelPackageName.replace('.', '/');;
     // model 文件保存路径 (MappingKit 与 DataDictionary 文件默认保存路径)
     String modelOutputDir = baseModelOutputDir + "/..";
+    System.out.println("输出路径："+ baseModelOutputDir);
     // 创建生成器
     Generator gen = new Generator(getDataSource(), baseModelPackageName, baseModelOutputDir, modelPackageName, modelOutputDir);
     // 设置数据库方言
     gen.setDialect(new MysqlDialect());
-    // 设置是否生成字段备注
+    // 在 getter、setter 方法上生成字段备注内容
     gen.setGenerateRemarks(true);
     // 添加不需要生成的表名
     for (String table : excludedTable) {
@@ -77,6 +81,14 @@ public class ModelGenerator {
     gen.setGenerateDataDictionary(false);
     // 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user"，移除前缀 "osc_"后生成的model名为 "User"而非 OscUser
     // gernerator.setRemovedTableNamePrefixes("t_");
+
+
+    // 将 mysql 8 以及其它原因之下生成 jdk 8 日期类型映射为 java.util.Date，便于兼容老项目，也便于习惯使用 java.util.Date 的同学
+    TypeMapping tm = new TypeMapping();
+    tm.addMapping(LocalDateTime.class, LocalDateTime.class);
+    tm.addMapping(LocalDate.class, LocalDateTime.class);
+    //tm.addMapping(LocalTime.class, LocalDateTime.class);		// LocalTime 暂时不变
+    gen.setTypeMapping(tm);
     // 生成
     gen.generate();
   }