脑图修正

o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/service/ServiceMindInfoPersist.java

@@ -53,11 +53,13 @@ class ServiceMindInfoPersist{
 			emc.persist( oldMindBase, CheckPersistType.all );
 		}else{
 			_mindBaseInfo.copyTo( oldMindBase, JpaObject.FieldsUnmodify  );
+			_mindBaseInfo.setId( oldMindBase.getId() );
 			_mindBaseInfo.setCreator_sequence( oldMindBase.getCreator_sequence() );
 			_mindBaseInfo.setFolder_sequence( oldMindBase.getFolder_sequence() );
 			_mindBaseInfo.setCreatorUnit_sequence( oldMindBase.getCreatorUnit_sequence() );
 			_mindBaseInfo.setShared_sequence( oldMindBase.getShared_sequence() );
-			emc.check( oldMindBase, CheckPersistType.all );	
+			_mindBaseInfo.composeSequnces();
+			emc.check( _mindBaseInfo, CheckPersistType.all );	
 		}
 		//保存脑图内容
 		if( oldContent == null ){

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindBaseInfo.java

@@ -59,11 +59,19 @@ public class MindBaseInfo extends SliceJpaObject {
 	private String id = createId();
 
 	public void onPersist() throws Exception {
-		composeSequnces();
+		if( null == this.getCreateTime() ) {
+			this.setCreateTime( new Date() );
+		}
+		this.setSequence(StringUtils.join(DateTools.compact(this.getCreateTime()), this.getId()));
+		this.creator_sequence = StringUtils.join(this.creator, this.getSequence());
+		this.folder_sequence = StringUtils.join(this.getFolderId(), this.getSequence());
+		this.creatorUnit_sequence = StringUtils.join(this.getCreatorUnit(), this.getSequence());
+		this.shared_sequence = StringUtils.join(this.getShared().toString(), this.getSequence());
+		this.cooperative_sequence = StringUtils.join(this.getCooperative().toString(), this.getSequence());
 	}
 
-	public void composeSequnces() throws Exception {
-		if( this.getCreateTime() == null ) {
+	public void composeSequnces() {
+		if( null == this.getCreateTime() ) {
 			this.setCreateTime( new Date() );
 		}
 		this.setSequence(StringUtils.join(DateTools.compact(this.getCreateTime()), this.getId()));
@@ -73,7 +81,6 @@ public class MindBaseInfo extends SliceJpaObject {
 		this.shared_sequence = StringUtils.join(this.getShared().toString(), this.getSequence());
 		this.cooperative_sequence = StringUtils.join(this.getCooperative().toString(), this.getSequence());
 	}
-
 	/*
 	 * =============================================================================
 	 * ===== 以上为 JpaObject 默认字段
@@ -102,6 +109,12 @@ public class MindBaseInfo extends SliceJpaObject {
 	@Index(name = TABLE + IndexNameMiddle + folderId_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String folderId = "";
+	
+	public static final String icon_FIELDNAME = "icon";
+	@FieldDescribe("缩略图信息")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + icon_FIELDNAME)
+	@CheckPersist(allowEmpty = true)
+	private String icon = "";
 
 	public static final String description_FIELDNAME = "description";
 	@FieldDescribe("备注信息")
@@ -366,4 +379,14 @@ public class MindBaseInfo extends SliceJpaObject {
 	public void setCooperative_sequence(String cooperative_sequence) {
 		this.cooperative_sequence = cooperative_sequence;
 	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+	
+	
 }

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindVersionInfo.java

@@ -1,5 +1,7 @@
 package com.x.mind.entity;
 
+import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -8,6 +10,7 @@ import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.persistence.jdbc.Index;
 
 import com.x.base.core.entity.JpaObject;
@@ -15,6 +18,7 @@ import com.x.base.core.entity.SliceJpaObject;
 import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.tools.DateTools;
 
 /**
  * 脑图版本信息表
@@ -47,6 +51,10 @@ public class MindVersionInfo extends SliceJpaObject {
 	private String id = createId();
 
 	public void onPersist() throws Exception {
+		if( null == this.getCreateTime() ) {
+			this.setCreateTime( new Date() );
+		}
+		this.setSequence(StringUtils.join(DateTools.compact(this.getCreateTime()), this.getId()));
 	}
 	/*
 	 * =============================================================================