diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index a1b7d824..53e8a4e2 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/manifest.xml b/com.actionsoft.apps.coe.pal/manifest.xml index d167f54b..b9a5c7aa 100755 --- a/com.actionsoft.apps.coe.pal/manifest.xml +++ b/com.actionsoft.apps.coe.pal/manifest.xml @@ -1,14 +1,14 @@ - - CoE PAL流程资产库 - 6.5 - 94 - 北京炎黄盈动科技发展有限责任公司 - - false - 2013-08-01 - + + CoE PAL流程资产库 + 6.5 + 94 + 北京炎黄盈动科技发展有限责任公司 + + false + 2013-08-01 +
** 特别说明 -使用BPMN2流程模型梳理的流程，可以直接在AWS BPMS中执行 - ]]>
- 2013-08-01 15:08:08 - com.actionsoft.apps.coe.pal.plugin.InstallListener - com.actionsoft.apps.coe.pal.plugin.Plugins - com.actionsoft.apps.coe.pal.plugin.StartListener - com.actionsoft.apps.coe.pal.plugin.StopListener - - - true - - - - - - - - true - true - _bpm.platform - + ]]> + 2013-08-01 15:08:08 + com.actionsoft.apps.coe.pal.plugin.InstallListener + com.actionsoft.apps.coe.pal.plugin.Plugins + com.actionsoft.apps.coe.pal.plugin.StartListener + com.actionsoft.apps.coe.pal.plugin.StopListener + + + true + + + + + + + + true + true + _bpm.platform + 0 0 false @@ -85,8 +85,8 @@ AWS PAL(Process Asset Library)流程资产库是AWS CoE平台的重要产品组 [{"name":"建模操作快速引导","url":"","children":[{"name":"1.如何创建符号与连线","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e0606a45-56d3-4cff-b51f-e0a9d64e522a"},{"name":"2.快速调整布局","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=6e58d212-fb95-4483-93b7-17499d632805"},{"name":"3.术语的新建与删除","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e5ef6605-3bc0-44b9-8bb8-a252fe20837b"},{"name":"4.流程绩效指标的新建与修改","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=59b638b6-7e3a-4a79-bd71-cd739259c89d"},{"name":"5.新建表单模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=0b964b9e-6701-44a8-8159-91b4ceba9c80"},{"name":"6.新建制度模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=c1e30c18-db59-4bde-ab60-b9589922ab2e"},{"name":"7.流程文件的生成","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=d799ced4-2313-45ba-911f-03cdb6db9e06"},{"name":"8.新建角色与岗位","url":"./w?sid=@sid&cmd=com.actiosoft.apps.cms_get_message&messageId=93559257-8280-444c-bd88-116748b919bf"}]}] {"control.risk":{"risk":{"desc":"描述企业内部流程涉及的各级风险点"},"control":{"desc":"描述企业内部流程涉及的各级风险的控制措施"}},"itsystem.normal":{"cloudServer":{"desc":"描述企业接入的云服务设施"},"database":{"desc":"描述企业提供的数据库服务类型，如某Oracle数据库"},"appSystem":{"desc":"描述企业提供的应用系统，如某供应链管理系统、业务流程管理平台"},"device":{"desc":"描述企业提供的各种IT设备"}},"control.kpi":{"kpi":{"desc":"从流程的目标（业务的目标、管理的要求等）出发设计流程绩效指标，用于衡量和评估末级流程的执行效果和对流程业务的支撑作用。"}},"process.evc":{"valueChain6":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain5":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain4":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain3":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain2":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain1":{"desc":"一个基本增值活动或辅助增值活动"}},"control.policy":{"item":{"desc":"描述企业内部各级管理制度的具体条款"},"regulation":{"desc":"描述企业内部流程涉及的各级管理制度"}},"data.form":{"form":{"desc":"输入或输出的数据是一个完整的数据结构（或单据）"},"forms":{"desc":"输入或输出的数据由多个数据结构（或单据）组成"}},"process.flowchart":{"internalStorage":{"desc":"存储在存储器中的数据"},"predefinedProcess":{"desc":"在另外地方已得到详细说明的一个操作或一组操作"},"data":{"desc":"表示数据"},"document":{"desc":"表示属于该过程的书面信息"},"paperTape":{"desc":"旧式电脑使用的穿孔纸带输入"},"storedData":{"desc":"表示一般的数据存储"},"preparation":{"desc":"表示修改一条指令或一组指令以影响随后的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"parallelMode":{"desc":"表示同步进行两个或两个以上并行方式的操作"},"terminator":{"desc":"表示过程的开始或结束"},"offPageReference":{"desc":"表示一组流程，可以用跨页引用进行标识"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"annotation":{"desc":"标识注解的内容"},"manualInput":{"desc":"人工输入的数据"},"onPageReference":{"desc":"表示流程图的待续，圈内有一子字母或数字"},"process":{"desc":"表示过程中的一个单独步骤"},"manualOperation":{"desc":"由人工完成的操作"},"loopLimit":{"desc":"去上角的上限值和去下角的下限值分别表示循环的开始和结束"},"decision":{"desc":"表示过程中的一项判定或一个分岔点"},"display":{"desc":"在机器上显示"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"sequentialData":{"desc":"老式磁带存储的数据"},"directData":{"desc":"表示流程图中存储在硬盘上的数据源"},"card":{"desc":"旧式电脑使用的打孔卡"}},"process.epc":{"or":{"desc":"表示一件事情可能产生的几个结果中，至少有一个会发生"},"method_service_node":{"desc":"描述流程中的手工活动"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"procedure":{"desc":"本流程的某个环节后引用的其它流程"},"method_approval_node":{"desc":"流程中审核、审批性质的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"method_approval_node3":{"desc":"流程中需要执行某种操作的活动"},"and":{"desc":"表示一件事情可能产生的几个结果或后续活动，全部发生；或表示一件事情的发生需要几个条件同时满足"},"method_service_node4":{"desc":"描述流程中的手工活动"},"xor":{"desc":"表示一件事情可能产生的几个结果中，有且只有一个会发生"},"event":{"desc":"描述流程运行的状态"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"}},"org.role":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"}},"process.bpmn2":{"signalIntermediateThrowingEvent":{"desc":"向外广播信号后，流程继续向后执行"},"callActivityCallingProcess":{"desc":"调用定义的全局过程"},"textAnnotation":{"desc":"给元素附加信息，便于理解"},"timerStartEvent":{"desc":"到达设置的日期/时间后，触发流程执行"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"signalEndEvent":{"desc":"向外广播信号，结束所在分支的执行"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"errorBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的错误信息，中断正常流程，触发错误处理流程"},"endEvent":{"desc":"结束所在分支的执行"},"serviceTask":{"desc":"使用Web服务或自动化应用的任务"},"exclusiveGateway":{"desc":""},"startEvent":{"desc":"触发流程的执行"},"receiveTask":{"desc":"等待并接受外部参与者发送的消息，消息接受完毕则任务执行完毕"},"signalStartEvent":{"desc":"接收信息，并触发流程的执行"},"messageIntermediateCatchEvent":{"desc":"捕获到特定消息后，该事件被触发，流程继续向后执行"},"messageIntermediateThrowingEvent":{"desc":"向其他参与方发送消息后，流程继续向后执行"},"signalIntermediateCatchEvent":{"desc":"捕获到其他参与方广播的信号后，该事件被触发，流程继续向后执行"},"errorEndEvent":{"desc":"错误结束事件"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"group":{"desc":"对元素进行分类，不影响流程的执行"},"scriptTask":{"desc":"定义一段执行脚本，由流程引擎执行，脚本执行完毕则任务执行完毕"},"businessRuleTask":{"desc":"调用业务规则引擎进行数据的计算并获得计算结果"},"manualTask":{"desc":"没有任何流程引擎和应用程序协助的纯手工任务"},"signalBoundaryInterrputingEvent":{"desc":"捕获特定信号，中断正常流程，触发异常处理流程"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"compensationBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的补偿信息，中断正常流程，触发执行补偿活动"},"userTask":{"desc":"在应用程序的协助下，由人工完成的任务"},"terminateEndEvent":{"desc":"结束所有分支的执行"},"messageStartEvent":{"desc":"接收消息，并触发流程的执行"},"messageEndEvent":{"desc":"向其他参与方发送消息，结束所在分支的执行"},"sendTask":{"desc":"向外部参与者发送消息，消息发送完毕则任务执行完毕"},"messageBoundaryInterrputingEvent":{"desc":"捕获特定消息，中断正常流程，触发异常处理流程"},"transaction":{"desc":"遵循特定事务规约的一系列活动"},"timerIntermediateCatchEvent":{"desc":"到达某个特定时间/日期后，触发该事件，流程继续向后执行"}},"org.normal":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"},"organization":{"desc":"描述企业内部固定的组织单位"},"position":{"desc":"描述企业内部各部门的实际岗位"},"employee":{"desc":"表示企业的具体员工"}}} false - - - - {"default":{"code":"&#xe621;","color":"#FFB718"},"process.businessLevel":{"code":"&#xe8fa;","color":"#FFB718"},"process.businessArea":{"code":"&#xe8f9;","color":"#FFB718"},"process.processGroup":{"code":"&#xe8f6;","color":"#FFB718"},"process.scheme":{"code":"","color":"#ff9421"},"control.kpi":{"code":"&#xe6f6;","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"&#xe69c;","color":"#009b52"},"engineering.standard":{"code":"","color":"#009b52"},"control.risk":{"code":"&#xe73e","color":"#dc4f39"},"data.form":{"code":"&#xe80b;","color":"#009b52"},"itsystem.normal":{"code":"&#xe7ce;","color":"#4E7FF9"},"org.normal":{"code":"&#xe6b6;","color":"#ff9421"},"process.bpmn2":{"code":"&#58981;","color":"#4E7FF9"},"process.evc":{"code":"&#xe8ef;","color":"#4E7FF9"}} + + + + {"default":{"code":"&#xe621;","color":"#FFB718"},"process.businessLevel":{"code":"&#xe8fa;","color":"#FFB718"},"process.businessArea":{"code":"&#xe8f9;","color":"#FFB718"},"process.processGroup":{"code":"&#xe8f6;","color":"#FFB718"},"process.scheme":{"code":"","color":"#ff9421"},"control.kpi":{"code":"&#xe6f6;","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"&#xe69c;","color":"#009b52"},"engineering.standard":{"code":"","color":"#009b52"},"control.risk":{"code":"&#xe73e","color":"#dc4f39"},"data.form":{"code":"&#xe80b;","color":"#009b52"},"itsystem.normal":{"code":"&#xe7ce;","color":"#4E7FF9"},"org.normal":{"code":"&#xe6b6;","color":"#ff9421"},"process.bpmn2":{"code":"&#58981;","color":"#4E7FF9"},"process.evc":{"code":"&#xe8ef;","color":"#4E7FF9"}} diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index 164205bc..3f98c574 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -446,7 +446,7 @@ public class OutputWordUtil { //添加表格 Table table = section.addTable(true); table.resetCells(data.length + 1, header.length); - //table.autoFit(AutoFitBehaviorType.Auto_Fit_To_Window); + table.autoFit(AutoFitBehaviorType.Auto_Fit_To_Window); TableRow row = table.getRows().get(0); row.isHeader(true); row.setHeightType(TableRowHeightType.Exactly); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 3796c43b..3a21feac 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -1512,7 +1512,7 @@ public class PALRepositoryQueryAPIManager { return result; } - /**PAL名称重名校验uuid + /** * @param context * @param wsId * @param pid @@ -1548,6 +1548,7 @@ public class PALRepositoryQueryAPIManager { } + /**************************************************** 获取流程树 **********************************************************/ /** diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index 5425c172..8fe6c4a4 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -2795,14 +2795,28 @@ public class DesignerRelationShapeWeb extends ActionWeb { map.put("treeData", treeData); /******************************自定义排序******************************************************/ - if (depjsonArray.size() > 0 && depjsonArray.getJSONObject(0).getString("timestamp") != null) { - depjsonArray.sort(Comparator.comparing(st -> ((JSONObject) st).getString("timestamp"))); - JSONObject jo = new JSONObject(new LinkedHashMap()); - for (int b = 0; b < depjsonArray.size(); b++) { - JSONObject onedata = depjsonArray.getJSONObject(b); - jo.put(onedata.getString("id"), onedata); + System.out.println("depjsonArray==================="+depjsonArray); + + if (depjsonArray.size() > 0 ) { + boolean containsJSONObject = true; + for(int i=0;i ((JSONObject) st).getString("timestamp"))); + JSONObject jo = new JSONObject(new LinkedHashMap()); + for (int b = 0; b < depjsonArray.size(); b++) { + JSONObject onedata = depjsonArray.getJSONObject(b); + jo.put(onedata.getString("id"), onedata); + } + map.put("checkedList", jo); + }else{ + map.put("checkedList", o); + } + } else { map.put("checkedList", o); } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java index 84ab8ccb..b40e8f73 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java @@ -114,8 +114,8 @@ public class RepositoryTreeUtil { if (model != null) palObject.put("dutyUserName", model.getUserName()); } - String sqls = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYNAME = '文件编码' and PLID = '"+palModel.getId()+"'"; - palObject.put("stopNumber", DBSql.getString(sqls)); + //String sqls = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYNAME = '文件编码' and PLID = '"+palModel.getId()+"'"; + //palObject.put("stopNumber", DBSql.getString(sqls)); // if (professionalIcon) { if (false) { palObject.put("icon", "../apps/" + CoEConstant.APP_ID + "/img/method/" + palModel.getMethodId() + "/16.png"); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index e1a45c4d..f1db20d0 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -2609,13 +2609,18 @@ public class CoeProcessLevelWeb extends ActionWeb { DepartmentModel dept = SDK.getORGAPI().getDepartmentById(object.getString("id")); if (dept != null && !filter.contains(dept.getId())) { - if(object.getString("timestamp")!=null){ + /*if(object.getString("timestamp")!=null){ depjsonArray.add(object); }else{ object.put("name", dept.getName()); filter.add(dept.getId()); dataArr.add(object); - } + }*/ + depjsonArray.add(object); + + object.put("name", dept.getName()); + filter.add(dept.getId()); + dataArr.add(object); } } @@ -2647,36 +2652,44 @@ public class CoeProcessLevelWeb extends ActionWeb { } } } - if(depjsonArray.size()>0 && depjsonArray.getJSONObject(0).getString("timestamp")!=null){ - depjsonArray.sort(Comparator.comparing(st ->((JSONObject)st).getString("timestamp"))); - JSONArray dataArr2 = new JSONArray(); - Set filter1 = new HashSet();// 去重记录 - for(int t=0;t valueList = new ArrayList<>(); - for (int i = 0; i < dataArr2.size(); i++) { - valueList.add(dataArr2.getJSONObject(i).getString("name")); - } - inputValue = StringUtils.join(valueList, ","); - - }else { - // 数据组合 - List valueList = new ArrayList<>(); - for (int i = 0; i < dataArr.size(); i++) { - valueList.add(dataArr.getJSONObject(i).getString("name")); } - inputValue = StringUtils.join(valueList, ","); - } + if(containsJSONObject==true){ + depjsonArray.sort(Comparator.comparing(st ->((JSONObject)st).getString("timestamp"))); + JSONArray dataArr2 = new JSONArray(); + Set filter1 = new HashSet();// 去重记录 + for(int t=0;t valueList = new ArrayList<>(); + for (int i = 0; i < dataArr2.size(); i++) { + valueList.add(dataArr2.getJSONObject(i).getString("name")); + } + inputValue = StringUtils.join(valueList, ","); + }else{ + // 数据组合 + List valueList = new ArrayList<>(); + for (int i = 0; i < dataArr.size(); i++) { + valueList.add(dataArr.getJSONObject(i).getString("name")); + } + inputValue = StringUtils.join(valueList, ","); + } + + @@ -9505,14 +9518,14 @@ public class CoeProcessLevelWeb extends ActionWeb { ro.put("sb", sb); return ro.toString(); } - SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>" + from); - SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>" + to); + //SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>" + from); + //SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>" + to); String from_id = from.getString("id"); String to_id = to.getString("id"); if (UtilString.isEmpty(from_id) && UtilString.isEmpty(to_id)) { sb.append("连线校验
"); sb6.append("出入线未与其他形状进行关联,请查看模型"); - sb6.append("校验未通过,请检查模型是否都已连线!"); + sb6.append("校验未通过,请检查模型活动之间是否都已连线!"); sb.append(sb6); ro.put("result", "error"); ro.put("sb", sb); @@ -9542,8 +9555,7 @@ public class CoeProcessLevelWeb extends ActionWeb { //System.out.println("m的值>>>>>>>>>>>" + ms); } - System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString()); -//System.out.println("linker>>>>>>>>>>>>" + list_linker.size()); + //System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString()); //连线校验增加体术语句 if (list_linker.size() > 0) { sb.append("连线校验
"); @@ -9551,14 +9563,17 @@ public class CoeProcessLevelWeb extends ActionWeb { list_linker) { String name = jsonObjects.getString(d); if(StringUtils.isNotEmpty(name)){ - sb6.append(name); + sb6.append("【"+name+"】").append(","); } } + if (sb6.length() > 0) { + sb6.deleteCharAt(sb6.length() - 1); + } sb6.append("校验未通过,请检查模型是否都已连线!"); sb.append(sb6); } - System.out.println("sb>>>>>>>>>>>" + sb); + //System.out.println("sb>>>>>>>>>>>" + sb); } /***************************************************数据属性校验*************************************************/