1、云文件状态的值改为enum值，不能直接写死；

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/Attachment2Factory.java

@@ -2,6 +2,7 @@ package com.x.file.assemble.control.factory;
 
 import com.x.file.assemble.control.AbstractFactory;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Attachment2_;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@ public class Attachment2Factory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Attachment2> root = cq.from(Attachment2.class);
 		Predicate p = cb.equal(root.get(Attachment2_.person), person);
-		p = cb.and(p, cb.equal(root.get(Attachment2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Attachment2_.status), FileStatus.VALID.getName()));
 		p = cb.and(p, cb.equal(root.get(Attachment2_.folder), Business.TOP_FOLD));
 		cq.select(root.get(Attachment2_.id)).where(p);
 		return em.createQuery(cq).getResultList();
@@ -50,7 +51,7 @@ public class Attachment2Factory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Attachment2> root = cq.from(Attachment2.class);
 		Predicate p = cb.equal(root.get(Attachment2_.person), person);
-		p = cb.and(p, cb.equal(root.get(Attachment2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Attachment2_.status), FileStatus.VALID.getName()));
 		p = cb.and(p, cb.like(root.get(Attachment2_.name), "%" + name + "%"));
 		cq.select(root.get(Attachment2_.id)).where(p);
 		return em.createQuery(cq).setMaxResults(100).getResultList();
@@ -62,7 +63,7 @@ public class Attachment2Factory extends AbstractFactory {
 		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
 		Root<Attachment2> root = cq.from(Attachment2.class);
 		Predicate p = cb.equal(root.get(Attachment2_.person), person);
-		p = cb.and(p, cb.equal(root.get(Attachment2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Attachment2_.status), FileStatus.VALID.getName()));
 		cq.select(cb.sum(root.get(Attachment2_.length))).where(p);
 		Long sum = em.createQuery(cq).getSingleResult();
 		return sum == null ? 0 : sum;

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/Folder2Factory.java

@@ -2,6 +2,7 @@ package com.x.file.assemble.control.factory;
 
 import com.x.file.assemble.control.AbstractFactory;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Folder2_;
 import org.apache.commons.collections4.set.ListOrderedSet;
@@ -27,7 +28,7 @@ public class Folder2Factory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Folder2> root = cq.from(Folder2.class);
 		Predicate p = cb.equal(root.get(Folder2_.person), person);
-		p = cb.and(p, cb.equal(root.get(Folder2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Folder2_.status), FileStatus.VALID.getName()));
 		p = cb.and(p, cb.equal(root.get(Folder2_.superior), Business.TOP_FOLD));
 		cq.select(root.get(Folder2_.id)).where(p);
 		return em.createQuery(cq).getResultList();
@@ -112,7 +113,7 @@ public class Folder2Factory extends AbstractFactory {
 		Predicate p = cb.equal(root.get(Folder2_.person), person);
 		p = cb.and(p, cb.equal(root.get(Folder2_.name), name));
 		p = cb.and(p, cb.equal(root.get(Folder2_.superior), StringUtils.trimToEmpty(superior)));
-		p = cb.and(p, cb.equal(root.get(Folder2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Folder2_.status), FileStatus.VALID.getName()));
 		if (StringUtils.isNotEmpty(excludeId)) {
 			p = cb.and(p, cb.notEqual(root.get(Folder2_.id), excludeId));
 		}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionDelete.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.tools.ListTools;
 import com.x.file.assemble.control.Business;
 import com.x.file.assemble.control.ThisApplication;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Recycle;
@@ -38,7 +39,7 @@ class ActionDelete extends BaseAction {
 				sem.remove(share);
 				sem.getTransaction().commit();
 			}
-			if("正常".equals(attachment.getStatus())){
+			if(FileStatus.VALID.getName().equals(attachment.getStatus())){
 				Recycle recycle = new Recycle(attachment.getPerson(), attachment.getName(), attachment.getId(), "attachment");
 				recycle.setExtension(attachment.getExtension());
 				recycle.setLength(attachment.getLength());
@@ -47,7 +48,7 @@ class ActionDelete extends BaseAction {
 				rem.getTransaction().commit();
 
 				EntityManager aem = emc.beginTransaction(Attachment2.class);
-				attachment.setStatus("已删除");
+				attachment.setStatus(FileStatus.INVALID.getName());
 				aem.getTransaction().commit();
 			}
 			Wo wo = new Wo();

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListFileTypePaging.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Attachment2_;
 import org.apache.commons.lang3.StringUtils;
@@ -50,7 +51,7 @@ class ActionListFileTypePaging extends BaseAction {
 		CriteriaQuery<Attachment2> cq = cb.createQuery(Attachment2.class);
 		Root<Attachment2> root = cq.from(Attachment2.class);
 		Predicate p = cb.equal(root.get(Attachment2_.person), effectivePerson.getDistinguishedName());
-		p = cb.and(p, cb.equal(root.get(Attachment2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Attachment2_.status), FileStatus.VALID.getName()));
 		if(StringUtils.isNotEmpty(wi.getFileType())){
 			p = cb.and(p, cb.equal(root.get(Attachment2_.type), wi.getFileType()));
 		}
@@ -65,7 +66,7 @@ class ActionListFileTypePaging extends BaseAction {
 		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
 		Root<Attachment2> root = cq.from(Attachment2.class);
 		Predicate p = cb.equal(root.get(Attachment2_.person), effectivePerson.getDistinguishedName());
-		p = cb.and(p, cb.equal(root.get(Attachment2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Attachment2_.status), FileStatus.VALID.getName()));
 		if(StringUtils.isNotEmpty(wi.getFileType())){
 			p = cb.and(p, cb.equal(root.get(Attachment2_.type), wi.getFileType()));
 		}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListWithFolder.java

@@ -9,6 +9,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.SortTools;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +29,7 @@ class ActionListWithFolder extends BaseAction {
 			if (!StringUtils.equals(folder.getPerson(), effectivePerson.getDistinguishedName())) {
 				throw new ExceptionFolderAccessDenied(effectivePerson, folder);
 			}
-			List<String> ids = business.attachment2().listWithFolder(folder.getId(),"正常");
+			List<String> ids = business.attachment2().listWithFolder(folder.getId(), FileStatus.VALID.getName());
 			List<Wo> wos = Wo.copier.copy(emc.list(Attachment2.class, ids));
 			SortTools.desc(wos, false, "createTime");
 			result.setData(wos);

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/folder2/ActionCreate.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Folder2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,7 +39,7 @@ public class ActionCreate extends BaseAction {
 			emc.beginTransaction(Folder2.class);
 			Folder2 folder = Wi.copier.copy(wi);
 			folder.setPerson(effectivePerson.getDistinguishedName());
-			folder.setStatus("正常");
+			folder.setStatus(FileStatus.VALID.getName());
 
 			emc.persist(folder, CheckPersistType.all);
 			emc.commit();

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/folder2/ActionDelete.java

@@ -6,6 +6,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Recycle;
@@ -30,18 +31,18 @@ class ActionDelete extends BaseAction {
 			if (!effectivePerson.isManager() && !StringUtils.equalsIgnoreCase(effectivePerson.getDistinguishedName(), folder.getPerson())) {
 				throw new ExceptionAccessDenied(effectivePerson.getName());
 			}
-			if("正常".equals(folder.getStatus())){
+			if(FileStatus.VALID.getName().equals(folder.getStatus())){
 				List<Folder2> folderList = new ArrayList<>();
 				folderList.add(folder);
 				folderList.addAll(business.folder2().listSubNested1(folder.getId(), null));
 				for(Folder2 fo : folderList){
 					EntityManager fem = emc.beginTransaction(Folder2.class);
-					fo.setStatus("已删除");
+					fo.setStatus(FileStatus.INVALID.getName());
 					fem.getTransaction().commit();
 					List<Attachment2> attachments = business.attachment2().listWithFolder2(fo.getId(),null);
 					for (Attachment2 att : attachments) {
 						EntityManager aem = emc.beginTransaction(Attachment2.class);
-						att.setStatus("已删除");
+						att.setStatus(FileStatus.INVALID.getName());
 						aem.getTransaction().commit();
 					}
 				}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/folder2/ActionListWithFolder.java

@@ -8,6 +8,7 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Folder2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -28,7 +29,7 @@ class ActionListWithFolder extends BaseAction {
 			if (!StringUtils.equals(folder.getPerson(), effectivePerson.getDistinguishedName())) {
 				throw new ExceptionAccessDenied(effectivePerson.getName());
 			}
-			List<String> ids = business.folder2().listSubDirect(folder.getId(),"正常");
+			List<String> ids = business.folder2().listSubDirect(folder.getId(), FileStatus.VALID.getName());
 			List<Wo> wos = emc.fetch(ids, Wo.copier);
 			wos.stream().forEach(o -> {
 				try {

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/folder2/ActionUpdate.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Folder2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -45,7 +46,7 @@ class ActionUpdate extends BaseAction {
 				}
 				List<String> ids = new ArrayList<>();
 				ids.add(folder.getId());
-				ids.addAll(business.folder2().listSubNested(folder.getId(),"正常"));
+				ids.addAll(business.folder2().listSubNested(folder.getId(), FileStatus.VALID.getName()));
 				if(ids.contains(folder.getSuperior())){
 					throw new Exception("superior can not be sub folder.");
 				}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/folder2/BaseAction.java

@@ -6,6 +6,7 @@ import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.base.core.project.tools.ListTools;
 import com.x.file.assemble.control.Business;
 import com.x.file.assemble.control.service.FileCommonService;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Folder2_;
@@ -31,7 +32,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 		Predicate p = cb.equal(root.get(Folder2_.person), effectivePerson.getDistinguishedName());
 		p = cb.and(p, cb.equal(root.get(Folder2_.name), name));
 		p = cb.and(p, cb.equal(root.get(Folder2_.superior), StringUtils.trimToEmpty(superior)));
-		p = cb.and(p, cb.equal(root.get(Folder2_.status), "正常"));
+		p = cb.and(p, cb.equal(root.get(Folder2_.status), FileStatus.VALID.getName()));
 		if (StringUtils.isNotEmpty(excludeId)) {
 			p = cb.and(p, cb.notEqual(root.get(Folder2_.id), excludeId));
 		}
@@ -41,7 +42,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 	}
 
 	protected void setCount(Business business, AbstractWoFolder wo) throws Exception {
-		List<String> ids = business.attachment2().listWithFolder(wo.getId(),"正常");
+		List<String> ids = business.attachment2().listWithFolder(wo.getId(),FileStatus.VALID.getName());
 		long count = 0;
 		long size = 0;
 		for (Attachment2 o : business.entityManagerContainer().fetch(ids, Attachment2.class,

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/recycle/ActionResume.java

@@ -7,6 +7,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Recycle;
@@ -36,7 +37,7 @@ class ActionResume extends BaseAction {
 				Attachment2 att = emc.find(recycle.getFileId(), Attachment2.class);
 				if(att!=null){
 					EntityManager aem = emc.beginTransaction(Attachment2.class);
-					att.setStatus("正常");
+					att.setStatus(FileStatus.VALID.getName());
 					aem.getTransaction().commit();
 				}
 			}else{
@@ -50,12 +51,12 @@ class ActionResume extends BaseAction {
 						if(business.folder2().exist(effectivePerson.getDistinguishedName(), fo.getName(), fo.getSuperior(), fo.getId())){
 							fo.setName(new Date().getTime() + fo.getName());
 						}
-						fo.setStatus("正常");
+						fo.setStatus(FileStatus.VALID.getName());
 						fem.getTransaction().commit();
 						List<Attachment2> attachments = business.attachment2().listWithFolder2(fo.getId(),null);
 						for (Attachment2 att : attachments) {
 							EntityManager aem = emc.beginTransaction(Attachment2.class);
-							att.setStatus("正常");
+							att.setStatus(FileStatus.VALID.getName());
 							aem.getTransaction().commit();
 						}
 					}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/share/ActionListAttWithFolder.java

@@ -10,6 +10,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.organization.Unit;
 import com.x.base.core.project.tools.SortTools;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Share;
@@ -36,7 +37,7 @@ class ActionListAttWithFolder extends BaseAction {
 					throw new ExceptionAccessDenied(effectivePerson.getDistinguishedName());
 				}
 			}
-			List<String> ids = business.attachment2().listWithFolder(folder.getId(),"正常");
+			List<String> ids = business.attachment2().listWithFolder(folder.getId(), FileStatus.VALID.getName());
 			List<Wo> wos = Wo.copier.copy(emc.list(Attachment2.class, ids));
 			SortTools.asc(wos, false, "name");
 			result.setData(wos);

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/share/ActionListFolderWithFolder.java

@@ -8,6 +8,7 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Share;
 
@@ -34,7 +35,7 @@ class ActionListFolderWithFolder extends BaseAction {
 					throw new ExceptionAccessDenied(effectivePerson.getDistinguishedName());
 				}
 			}
-			List<String> ids = business.folder2().listSubDirect(folder.getId(),"正常");
+			List<String> ids = business.folder2().listSubDirect(folder.getId(), FileStatus.VALID.getName());
 			List<Wo> wos = emc.fetch(ids, Wo.copier);
 			wos = wos.stream().sorted(Comparator.comparing(Folder2::getName, Comparator.nullsLast(String::compareTo)))
 					.collect(Collectors.toList());

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/share/ActionSaveToFolder.java

@@ -8,6 +8,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.organization.Unit;
 import com.x.file.assemble.control.Business;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
 import com.x.file.core.entity.personal.Share;
@@ -71,14 +72,14 @@ class ActionSaveToFolder extends BaseAction {
 				emc.check(newFolder, CheckPersistType.all);
 				em.persist(newFolder);
 				em.getTransaction().commit();
-				List<String> subIds = business.folder2().listSubNested(folder.getId(),"正常");
+				List<String> subIds = business.folder2().listSubNested(folder.getId(), FileStatus.VALID.getName());
 				for(String subFold : subIds){
 					folder = emc.find(subFold, Folder2.class);
 					Folder2 newSubFolder = new Folder2(folder.getName(),effectivePerson.getDistinguishedName(),folderId,folder.getStatus());
 					EntityManager em1 = emc.beginTransaction(Folder2.class);
 					em1.persist(newSubFolder);
 					em1.getTransaction().commit();
-					List<Attachment2> attachments = business.attachment2().listWithFolder2(subFold,"正常");
+					List<Attachment2> attachments = business.attachment2().listWithFolder2(subFold,FileStatus.VALID.getName());
 					for (Attachment2 att : attachments) {
 						Attachment2 newAtt = new Attachment2(att.getName(), effectivePerson.getDistinguishedName(),
 								folderId, att.getOriginFile(), att.getLength(), att.getType());

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/service/FileCommonService.java

@@ -4,6 +4,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.project.config.StorageMapping;
 import com.x.file.assemble.control.Business;
 import com.x.file.assemble.control.ThisApplication;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.open.OriginFile;
 import com.x.file.core.entity.personal.Attachment2;
 import com.x.file.core.entity.personal.Folder2;
@@ -78,13 +79,13 @@ public class FileCommonService {
 
         boolean emptyFolder = true;
 
-        List<Folder2> subfolders =  business.folder2().listSubDirect1(folder.getId(),"正常");
+        List<Folder2> subfolders =  business.folder2().listSubDirect1(folder.getId(), FileStatus.VALID.getName());
         for (Folder2 subfolder : subfolders) {
             emptyFolder = false;
             generateFolderPath(emc ,business, emptyFolderList, filePathMap, parentPath, subfolder);
         }
 
-        List<Attachment2> subfiles = business.attachment2().listWithFolder2(folder.getId(),"正常");
+        List<Attachment2> subfiles = business.attachment2().listWithFolder2(folder.getId(),FileStatus.VALID.getName());
         for (Attachment2 subfile : subfiles) {
             emptyFolder = false;
             generateFilePath(emc, filePathMap, parentPath, subfile);

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/FileStatus.java

@@ -0,0 +1,33 @@
+package com.x.file.core.entity.open;
+
+/**
+ *
+ */
+public enum FileStatus {
+
+	VALID("1", "正常"), INVALID("0", "已删除");
+	private String value;
+	private String name;
+
+	private FileStatus(String value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value == null ? null : value.trim();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name == null ? null : name.trim();
+	}
+
+}

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment2.java

@@ -11,6 +11,7 @@ import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
 import com.x.base.core.entity.SliceJpaObject;
+import com.x.file.core.entity.open.FileStatus;
 import com.x.file.core.entity.open.FileType;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -86,7 +87,7 @@ public class Attachment2 extends SliceJpaObject {
 		this.originFile = originFile;
 		this.length = length;
 		this.type = type;
-		this.status = "正常";
+		this.status = FileStatus.VALID.getName();
 		if (null == this.extension) {
 			throw new Exception("extension can not be null.");
 		}
@@ -150,7 +151,7 @@ public class Attachment2 extends SliceJpaObject {
 	@FieldDescribe("文件状态：正常|已删除")
 	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
-	private String status = "正常";
+	private String status = FileStatus.VALID.getName();
 
 	public static final String lastUpdateTime_FIELDNAME = "lastUpdateTime";
 	@FieldDescribe("最后更新时间")

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder2.java

@@ -8,6 +8,7 @@ import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
+import com.x.file.core.entity.open.FileStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.persistence.jdbc.Index;
 
@@ -97,7 +98,7 @@ public class Folder2 extends SliceJpaObject {
 	@FieldDescribe("文件状态：正常|已删除")
 	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
-	private String status = "正常";
+	private String status = FileStatus.VALID.getName();
 
 	public static final String lastUpdateTime_FIELDNAME = "lastUpdateTime";
 	@FieldDescribe("最后更新时间")