批处理缓存定义到上层父应用

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/Plugins.java

@@ -3,7 +3,6 @@ package com.actionsoft.apps.coe.pal.batch;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.actionsoft.apps.coe.pal.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.batch.dc.FileProcessor;
 import com.actionsoft.apps.listener.PluginListener;
 import com.actionsoft.apps.resource.AppContext;
@@ -25,8 +24,6 @@ public class Plugins implements PluginListener {
 		// 注册DC
 		list.add(new DCPluginProfile("tmp", FileProcessor.class.getName(), "生成下载的Excel模版等临时文件", false));
 		list.add(new DCPluginProfile("logs", FileProcessor.class.getName(), "批量创建/替换的log日志", false, false));
-		// 注册cache
-		list.add(new CachePluginProfile(BatchCache.class));
 		return list;
 	}
 

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/BatchWeb.java

@@ -1,6 +1,5 @@
 package com.actionsoft.apps.coe.pal.batch.web;
 
-import com.actionsoft.apps.coe.pal.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
 import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
 import com.actionsoft.apps.coe.pal.batch.web.create.process.CreateProcessExcel;
@@ -23,6 +22,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.CoeDesignerShapeAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
+import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
 import com.actionsoft.bpms.commons.mvc.view.ActionWeb;
@@ -225,10 +225,7 @@ public class BatchWeb extends ActionWeb {
 		}
 		String define = PALRepositoryQueryAPIManager.getInstance().getProcessDefinition(uc, model.getId());
 		JSONObject array = JSONObject.parseObject(define);
-		if (array.containsKey("elements") && array.getJSONObject("elements").size() == 0) {
+		return !array.containsKey("elements") || array.getJSONObject("elements").size() != 0;
-			return false;
-		}
-		return true;
 	}
 
 	

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java

@@ -1,6 +1,5 @@
 package com.actionsoft.apps.coe.pal.batch.web.create.process;
 
-import com.actionsoft.apps.coe.pal.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
 import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@@ -12,6 +11,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.Design
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
 import com.actionsoft.bpms.commons.security.logging.model.Level;
 import com.actionsoft.bpms.org.model.DepartmentModel;
 import com.actionsoft.bpms.org.model.RoleModel;

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/ImportShapeExcel.java

@@ -1,6 +1,5 @@
 package com.actionsoft.apps.coe.pal.batch.web.create.shape;
 
-import com.actionsoft.apps.coe.pal.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
 import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
@@ -12,6 +11,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.Design
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
 import com.actionsoft.bpms.commons.security.logging.model.Level;
@@ -636,7 +636,7 @@ public class ImportShapeExcel {
 			count++;
 			if (count % (shapeRowCount+1) == 0) {
 				count = 1;
-				initY += 130;
+				initY += 90;
 				// 换行
 				initX = 0;
 				initX = pageEdge + initX;
@@ -649,7 +649,7 @@ public class ImportShapeExcel {
 				}
 				shape.put("dataAttributes", dataAttributes);
 			}
-			int totalWidth = 240;// 每个节点总宽度，空白+节点+空白
+			int totalWidth = 160;// 每个节点总宽度，空白+节点+空白
 			int totalHeight = 200;// 每个节点总高度，空白+节点+空白
 			int x = 0;
 			int y = 0;

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/replace/ReplaceProcessSave.java

@@ -1,6 +1,5 @@
 package com.actionsoft.apps.coe.pal.batch.web.replace;
 
-import com.actionsoft.apps.coe.pal.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
 import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@@ -22,6 +21,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryShapeAttributeModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
 import com.actionsoft.bpms.commons.security.logging.model.Level;
 import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.bpms.util.DBSql;

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/Plugins.java

@@ -19,6 +19,7 @@ import com.actionsoft.apps.coe.pal.pal.home.aslp.RegisterExtendsApp;
 import com.actionsoft.apps.coe.pal.pal.method.aslp.RegisterMethodApp;
 import com.actionsoft.apps.coe.pal.pal.repository.addons.RepositoryDiagramExistMark;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.manager.DesignerShapeCopyCache;
+import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
 import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache;
 import com.actionsoft.apps.listener.PluginListener;
 import com.actionsoft.apps.resource.AppContext;
@@ -77,6 +78,7 @@ public class Plugins implements PluginListener {
 		list.add(new CachePluginProfile(DesignerShapeCopyCache.class));
 		list.add(new ACPluginProfile(new COETeamPortletAccm()));
 		list.add(new CachePluginProfile(LogRealTimeCountCache.class));
+		list.add(new CachePluginProfile(BatchCache.class));
 
 		list.add(new AtFormulaPluginProfile("PAL应用", "@getDWCondition(*fieldName,*fieldValue)", GetDWConditionExpression.class.getName(), "获取DW中的自定义查询条件", "返回DW中自定义的查询条件"));
 

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/batch/cache/BatchCache.java

@@ -1,8 +1,11 @@
-package com.actionsoft.apps.coe.pal.batch.cache;
+package com.actionsoft.apps.coe.pal.yili.log.batch.cache;
 
+import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.resource.plugin.profile.CachePluginProfile;
 import com.actionsoft.bpms.commons.cache.Cache;
 import com.actionsoft.bpms.commons.cache.CacheManager;
+import com.actionsoft.bpms.util.ConsolePrinter;
+import com.actionsoft.sdk.local.SDK;
 
 /**
  * 存储导入数据
@@ -17,6 +20,7 @@ public class BatchCache extends Cache<String, Integer>{
 
 	@Override
 	protected void load() {
+		ConsolePrinter.info("[" + SDK.getAppAPI().getAppContext(CoEConstant.APP_ID).getNameI18N() + "]Cache加载CoE批处理日志记录对象 [" + 0 + "个]");
 	}
 
 	public static BatchCache getCache() {