模型批处理

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/constant/BatchConst.java

@@ -34,9 +34,11 @@ public class BatchConst {
 	// 日志结束语
 	public static final String END_LOG = "**建议拷贝本次输出日志做备忘";
 
-	public final static String IMPORT_LOG_FILE_SUCCESS = "successImport.log";// 导入成功日志单独记录，只记录pal流程名称与对应的Aris地址，客户需要
+	public final static String IMPORT_LOG_FILE_SUCCESS = "successImport.log";// 导入成功日志单独记录
 
-	public final static String IMPORT_LOG_FILE_MATCH_ERR = "matchErrImport.log";// 导入aris流程匹配失败的
+	public final static String IMPORT_LOG_FILE_MATCH_ERR = "matchErrImport.log";// 导入失败日志单独记录
+
+	public final static String IMPORT_LOG_FILE_CHECK_TABLE = "checkTableData.log";// 导入时的校验的表格结果信息记录
 
 	// 日志常量记录
 	public static final String LOG_SUCCESS = "[成功]";

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

@@ -333,7 +333,7 @@ public class BatchWeb extends ActionWeb {
 			new Thread(()->{new ImportProcessExcel().execute(uc, object, simpleLogFile, fullLogFile, logId, methodCategory);}) .start();
 		}
 		if ("shapeList".equals(type)) {// 模型结构保存
-			new Thread(()->{new ImportShapeExcel().execute(uc, object, simpleLogFile, fullLogFile, logId);}) .start();
+			new Thread(()->{new ImportShapeExcel().execute(uc, object, simpleLogFile, fullLogFile, logId, methodCategory);}) .start();
 		}
 		ResponseObject ro = ResponseObject.newOkResponse();
 		ro.put("type", type);

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

@@ -565,8 +565,8 @@ public class ImportProcessExcel {
 			LogUtil.appendLog("--------------------------------", simpleLogFile, fullLogFile);
 			LogUtil.appendLog(BatchConst.END_LOG, simpleLogFile, fullLogFile);
 			// 插入审计日志
-			LogUtil.recordAuditLog(uc, "create", SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单", "详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath(), Level.INFO);
-			SDK.getLogAPI().consoleInfo(SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单[成功]，详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath());
+			LogUtil.recordAuditLog(uc, "create", SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建模型清单", "详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath(), Level.INFO);
+			SDK.getLogAPI().consoleInfo(SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建模型清单[成功]，详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath());
 			LogRealTimeCountCache.getCache().remove(logId);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -226,6 +226,33 @@ public class ShapeUtil {
 		return result;
 	}
 
+	/**
+	 * 具体流程类别下的扩展属性列表
+	 * @param methodId
+	 * @return
+	 */
+	public static JSONObject getProcessUseShapeMethodAttrByShapeName(String wsId, String shapeMethod, String methodId, String shapeName) {
+		JSONObject result = new JSONObject();
+		List<PALMethodAttributeModel> attributeModelList = CoeDesignerShapeAPIManager.getInstance().getValidAndUseAttributeModels(wsId, shapeMethod, shapeName, methodId);
+		for (PALMethodAttributeModel attributeModel : attributeModelList) {
+			String scope = attributeModel.getScope();
+			if (scope.contains("*") || "*".equals(scope) || scope.contains(shapeName)) {
+				JSONObject obj = new JSONObject();
+				obj.put("readonly", attributeModel.getReadonly());
+				obj.put("id", attributeModel.getKey());
+				obj.put("key", attributeModel.getKey());
+				obj.put("scope", attributeModel.getScope());
+				obj.put("name", attributeModel.getTitle());
+				obj.put("title", attributeModel.getNewTitle());
+				obj.put("type", attributeModel.getType());
+				obj.put("ref", attributeModel.getRef());
+				obj.put("groupPath", attributeModel.getGroupPath());
+				result.put(attributeModel.getKey(), obj);
+			}
+		}
+		return result;
+	}
+
 	/**
 	 * 具体流程类别下的扩展属性列表
 	 * @param methodId

com.actionsoft.apps.coe.pal.batch/template/page/main.htm

@@ -11,4 +11,4 @@
         var shapeFileValue = '<#shapeFileValue>';
         var palId = '<#palId>';// 流程id，不为空则为设计器内单只流程形状属性替换
         var wHref = "./w";
-        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-0896b577.2aef31d9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-4b843604.9afc147d.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-d674f310.832a3f23.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-0896b577.93b0818d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-2d224ef1.9043bb4b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-3a9b7577.a1c1d3f9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-4b843604.db9b2672.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-d674f310.2dd90041.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.1042fda7.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=stylesheet><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js></script><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.1042fda7.js></script></body></html>
+        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-0896b577.2aef31d9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-287651db.f99a5dab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-d674f310.832a3f23.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-0896b577.93b0818d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-287651db.b0dcea79.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-2d224ef1.9043bb4b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-3a9b7577.a1c1d3f9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-d674f310.2dd90041.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.b3cd7d42.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=stylesheet><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js></script><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.b3cd7d42.js></script></body></html>

com.actionsoft.apps.coe.pal.batch/web/com.actionsoft.apps.coe.pal.batch/main/css/chunk-287651db.f99a5dab.css

@@ -1 +1 @@
-#mycode[data-v-64ad3307] .CodeMirror-lines{background-color:#2c2c2c;color:#58a0f0}#mycode[data-v-64ad3307] .CodeMirror{height:auto!important}#header[data-v-46c8d538] .el-step__title{font-size:14px}
+#mycode[data-v-64ad3307] .CodeMirror-lines{background-color:#2c2c2c;color:#58a0f0}#mycode[data-v-64ad3307] .CodeMirror{height:auto!important}#header[data-v-4ee7e240] .el-step__title{font-size:14px}