存入缓存的jpa对象要与jpa解绑

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ElementFactory.java

@@ -41,8 +41,8 @@ public abstract class ElementFactory extends AbstractFactory {
 			t = this.entityManagerContainer().flag(flag, clz);
 			if (t != null) {
 				this.entityManagerContainer().get(clz).detach(t);
+				CacheManager.put(cacheCategory, cacheKey, t );
 			}
-			CacheManager.put(cacheCategory, cacheKey, t );
 		}
 		return t;
 	}
@@ -65,8 +65,8 @@ public abstract class ElementFactory extends AbstractFactory {
 					appInfo.getId());
 			if (t != null) {
 				this.entityManagerContainer().get(clz).detach(t);
+				CacheManager.put(cacheCategory, cacheKey, t );
 			}
-			CacheManager.put(cacheCategory, cacheKey, t );
 		}
 		return t;
 	}
@@ -102,4 +102,4 @@ public abstract class ElementFactory extends AbstractFactory {
 		return list;
 	}
 
-}
\ No newline at end of file
+}

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ScriptFactory.java

@@ -129,6 +129,7 @@ public class ScriptFactory extends ElementFactory {
 				List<Script> list = em.createQuery( cq.where(p) ).setMaxResults(1).getResultList();
 				if (!list.isEmpty()) {
 					script = list.get(0);
+					em.detach(script);
 					CacheManager.put(cacheCategory, cacheKey, script );
 				}
 			}

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/element/ElementFactory.java

@@ -28,10 +28,10 @@ public abstract class ElementFactory extends AbstractFactory {
 			t = this.entityManagerContainer().flag(flag, clz);
 			if (t != null) {
 				this.entityManagerContainer().get(clz).detach(t);
+				CacheManager.put(cacheCategory, cacheKey, t );
 			}
-			CacheManager.put(cacheCategory, cacheKey, t );
 		}
 		return t;
 	}
 
-}
\ No newline at end of file
+}

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

@@ -134,6 +134,7 @@ public class Business {
 		}else{
 			config = this.entityManagerContainer().firstEqual(FileConfig.class, FileConfig.person_FIELDNAME, Business.SYSTEM_CONFIG);
 			if(config != null){
+				this.entityManagerContainer().get(FileConfig.class).detach(config);
 				CacheManager.put(cacheCategory, cacheKey, config);
 			}
 		}

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

@@ -50,6 +50,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 		}else{
 			config = business.entityManagerContainer().firstEqual(FileConfig.class, FileConfig.person_FIELDNAME, Business.SYSTEM_CONFIG);
 			if(config != null){
+				business.entityManagerContainer().get(FileConfig.class).detach(config);
 				CacheManager.put(cacheCategory, cacheKey, config);
 			}
 		}

o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/AbstractFactory.java

@@ -50,8 +50,8 @@ public abstract class AbstractFactory {
 			t = this.entityManagerContainer().flag(flag, clz);
 			if (t != null) {
 				this.entityManagerContainer().get(clz).detach(t);
+				CacheManager.put(cacheCategory, cacheKey, t);
 			}
-			CacheManager.put(cacheCategory, cacheKey, t);
 		}
 		return t;
 	}
@@ -71,6 +71,7 @@ public abstract class AbstractFactory {
 			} else {
 				T t = this.entityManagerContainer().flag(flag, clz);
 				if (null != t) {
+					this.entityManagerContainer().get(clz).detach(t);
 					list.add(t);
 					CacheManager.put(cacheCategory, cacheKey, t);
 				}
@@ -78,4 +79,4 @@ public abstract class AbstractFactory {
 		}
 		return list;
 	}
-}
\ No newline at end of file
+}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/BeginFactory.java

@@ -36,9 +36,10 @@ public class BeginFactory extends ElementFactory {
 		} else {
 			o = this.entityManagerContainer().firstEqual(Begin.class, Activity.process_FIELDNAME, process.getId());
 			if (null != o) {
+				this.entityManagerContainer().get(Begin.class).detach(o);
 				CacheManager.put(cacheCategory, cacheKey, o);
 			}
 		}
 		return o;
 	}
-}
\ No newline at end of file
+}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ScriptFactory.java

@@ -78,6 +78,9 @@ public class ScriptFactory extends ElementFactory {
 		if (null == script) {
 			script = this.getWithApplicationWithName(application, uniqueName);
 		}
+		if(script != null){
+			this.entityManagerContainer().get(Script.class).detach(script);
+		}
 		return script;
 	}
 
@@ -122,4 +125,4 @@ public class ScriptFactory extends ElementFactory {
 		}
 		return null;
 	}
-}
\ No newline at end of file
+}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ElementFactory.java

@@ -92,6 +92,7 @@ public class ElementFactory extends AbstractFactory {
 		} else {
 			t = this.entityManagerContainer().find(id, clz);
 			if (t != null) {
+				this.entityManagerContainer().get(clz).detach(t);
 				CacheManager.put(cacheCategory, cacheKey, t);
 			}
 		}
@@ -194,7 +195,10 @@ public class ElementFactory extends AbstractFactory {
 			begin = (Begin) optional.get();
 		} else {
 			begin = this.entityManagerContainer().firstEqual(Begin.class, Activity.process_FIELDNAME, id);
-			CacheManager.put(cacheCategory, cacheKey, begin);
+			if(begin != null) {
+				this.entityManagerContainer().get(Begin.class).detach(begin);
+				CacheManager.put(cacheCategory, cacheKey, begin);
+			}
 		}
 		return begin;
 	}
@@ -216,6 +220,9 @@ public class ElementFactory extends AbstractFactory {
 				Root<Route> root = cq.from(Route.class);
 				Predicate p = root.get(Route_.id).in(choice.getRouteList());
 				list = em.createQuery(cq.where(p).orderBy(cb.asc(root.get(Route_.orderNumber)))).getResultList();
+				for (Route route : list){
+					em.detach(route);
+				}
 				CacheManager.put(cacheCategory, cacheKey, list);
 			}
 		}
@@ -239,6 +246,9 @@ public class ElementFactory extends AbstractFactory {
 				Root<Route> root = cq.from(Route.class);
 				Predicate p = root.get(Route_.id).in(manual.getRouteList());
 				list = em.createQuery(cq.where(p).orderBy(cb.asc(root.get(Route_.orderNumber)))).getResultList();
+				for (Route route : list){
+					em.detach(route);
+				}
 				CacheManager.put(cacheCategory, cacheKey, list);
 			}
 		}
@@ -262,6 +272,9 @@ public class ElementFactory extends AbstractFactory {
 				Root<Route> root = cq.from(Route.class);
 				Predicate p = root.get(Route_.id).in(parallel.getRouteList());
 				list = em.createQuery(cq.where(p).orderBy(cb.asc(root.get(Route_.orderNumber)))).getResultList();
+				for (Route route : list){
+					em.detach(route);
+				}
 				CacheManager.put(cacheCategory, cacheKey, list);
 			}
 		}
@@ -284,9 +297,12 @@ public class ElementFactory extends AbstractFactory {
 				List<String> loops = new ArrayList<>();
 				for (String name : names) {
 					Script o = this.getScriptWithApplicationWithUniqueName(applicationId, name);
-					if ((null != o) && (!list.contains(o))) {
-						list.add(o);
-						loops.addAll(o.getDependScriptList());
+					if(null != o){
+						this.entityManagerContainer().get(Script.class).detach(o);
+						if(!list.contains(o)){
+							list.add(o);
+							loops.addAll(o.getDependScriptList());
+						}
 					}
 				}
 				names = loops;
@@ -418,6 +434,9 @@ public class ElementFactory extends AbstractFactory {
 			p = cb.and(p, cb.or(cb.equal(root.get(Mapping_.process), process), cb.equal(root.get(Mapping_.process), ""),
 					cb.isNull(root.get(Mapping_.process))));
 			List<Mapping> os = em.createQuery(cq.where(p)).getResultList();
+			for (Mapping mapping : os){
+				em.detach(mapping);
+			}
 			os.stream().collect(Collectors.groupingBy(o -> o.getApplication() + o.getTableName()))
 					.forEach((k, v) -> list.add(v.stream().filter(i -> StringUtils.isNotEmpty(i.getProcess()))
 							.findFirst().orElse(v.get(0))));

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/BaseAction.java

@@ -123,6 +123,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				Invoke invoke = emc.flag(flag, Invoke.class);
 				if (null != invoke) {
+					emc.get(Invoke.class).detach(invoke);
 					CacheManager.put(cacheCategory, cacheKey, invoke);
 				}
 				return invoke;

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/factory/QueryFactory.java

@@ -34,8 +34,8 @@ public class QueryFactory extends AbstractFactory {
 				list.add((Query) optional.get());
 			} else {
 				Query o = this.pickObject(str);
-				CacheManager.put(cache, cacheKey, o);
 				if (null != o) {
+					CacheManager.put(cache, cacheKey, o);
 					list.add(o);
 				}
 			}
@@ -54,7 +54,9 @@ public class QueryFactory extends AbstractFactory {
 			o = (Query) optional.get();
 		} else {
 			o = this.pickObject(flag);
-			CacheManager.put(cache, cacheKey, o);
+			if(o != null) {
+				CacheManager.put(cache, cacheKey, o);
+			}
 		}
 		return o;
 	}
@@ -79,4 +81,4 @@ public class QueryFactory extends AbstractFactory {
 
 	}
 
-}
\ No newline at end of file
+}

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/ActionExecute.java

@@ -78,6 +78,7 @@ class ActionExecute extends BaseAction {
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				statement = emc.flag(flag, Statement.class);
 				if (null != statement) {
+					emc.get(Statement.class).detach(statement);
 					CacheManager.put(cache, cacheKey, statement);
 				}
 			}

o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java

@@ -34,8 +34,8 @@ public class QueryFactory extends AbstractFactory {
 				list.add((Query) optional.get());
 			} else {
 				Query o = this.pickObject(str);
-				CacheManager.put(cache, cacheKey, o);
 				if (null != o) {
+					CacheManager.put(cache, cacheKey, o);
 					list.add(o);
 				}
 			}
@@ -54,7 +54,9 @@ public class QueryFactory extends AbstractFactory {
 			o = (Query) optional.get();
 		} else {
 			o = this.pickObject(flag);
-			CacheManager.put(cache, cacheKey, o);
+			if(o != null) {
+				CacheManager.put(cache, cacheKey, o);
+			}
 		}
 		return o;
 	}
@@ -79,4 +81,4 @@ public class QueryFactory extends AbstractFactory {
 
 	}
 
-}
\ No newline at end of file
+}