数据结构改造

src/main/java/common/model/base/BaseHistoryTransfer.java

@@ -15,19 +15,13 @@ public abstract class BaseHistoryTransfer<M extends BaseHistoryTransfer<M>> exte
 	public java.lang.String getId() {
 		return getStr("id");
 	}
-	public void setChainId(java.lang.Integer chainId) {
-		set("chainId", chainId);
-	}
-	
-	public java.lang.Integer getChainId() {
-		return getInt("chainId");
-	}
-	public void setHash(java.lang.String hash) {
-		set("hash", hash);
+
+	public void setHistoryId(java.lang.String historyId) {
+		set("historyId", historyId);
 	}
 	
-	public java.lang.String getHash() {
-		return getStr("hash");
+	public java.lang.String getHistoryId() {
+		return getStr("historyId");
 	}
 	public void setFrom(java.lang.String from) {
 		set("from", from);

src/main/java/common/model/base/BasePendingTransfer.java

@@ -15,19 +15,12 @@ public abstract class BasePendingTransfer<M extends BasePendingTransfer<M>> exte
 	public java.lang.String getId() {
 		return getStr("id");
 	}
-	public void setChainId(java.lang.Integer chainId) {
-		set("chainId", chainId);
+	public void setPendingId(java.lang.String historyId) {
+		set("PendingId", historyId);
 	}
-	
-	public java.lang.Integer getChainId() {
-		return getInt("chainId");
-	}
-	public void setHash(java.lang.String hash) {
-		set("hash", hash);
-	}
-	
-	public java.lang.String getHash() {
-		return getStr("hash");
+
+	public java.lang.String getPendingId() {
+		return getStr("PendingId");
 	}
 	public void setFrom(java.lang.String from) {
 		set("from", from);

src/main/java/common/utils/model/SaveUtil.java

@@ -1,5 +1,6 @@
 package common.utils.model;
 
+import com.alibaba.druid.util.StringUtils;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Model;
 
@@ -10,7 +11,9 @@ public class SaveUtil {
 	public static final int UPDATE_CODE = 2;
 	
 	public static int saveOrUpdate(Model<?> model) {
-		model.set("id", model.getStr("chainId").concat(model.getStr("hash")));
+		if(!StringUtils.isEmpty(model.getStr("chainId")) && !StringUtils.isEmpty(model.getStr("hash"))){
+			model.set("id", model.getStr("chainId").concat(model.getStr("hash")));
+		}
 		Object[] values = CopyUtil.generateDuplicateObjects(model._getAttrValues());
 		
 		return Db.update(SqlUtil.generateReplaceSql(TableUtil.getTableName(model), model), values);

src/main/java/modules/tx/transfer/TransferFactory.java

@@ -23,8 +23,7 @@ public class TransferFactory {
 		for (JSONObject transfer : transferList.toJavaList(JSONObject.class)) {
 			PendingTransfer pendingTransfer = FastJson.getJson().parse(transfer.toJSONString(), PendingTransfer.class);
 			pendingTransfer.setId(chainId + hash+index);
-			pendingTransfer.setChainId(chainId);
-			pendingTransfer.setHash(hash);
+			pendingTransfer.setPendingId(chainId+hash);
 			
 			pendingTransferList.add(pendingTransfer);
 			index ++;
@@ -43,8 +42,7 @@ public class TransferFactory {
 		for (JSONObject transfer : transferList.toJavaList(JSONObject.class)) {
 			HistoryTransfer historyTransfer = FastJson.getJson().parse(transfer.toJSONString(), HistoryTransfer.class);
 			historyTransfer.setId(chainId + hash+index);
-			historyTransfer.setChainId(chainId);
-			historyTransfer.setHash(hash);
+			historyTransfer.setHistoryId(chainId+hash);
 
 			historyTransferList.add(historyTransfer);
 			index ++;