yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程模型清单增加4个流程架构字段

Browse Source
This commit is contained in:
wangpf 2023-06-12 20:00:51 +08:00
parent 9c4ab6bf42
commit 08e8ba42a7
3 changed files with 120 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
com.actionsoft.apps.coe.pal.publisher/repository/bo/_777a6c5f-6d09-406d-a69c-9102c6df5ef8/777a6c5f-6d09-406d-a69c-9102c6df5ef8.xml
View File

@ -4,7 +4,7 @@
<createUser>admin</createUser>
<createTime>2023-05-31 15:34:37</createTime>
<updateUser>admin</updateUser>
<updateTime>2023-06-08 13:18:29</updateTime>
<updateTime>2023-06-12 19:42:48</updateTime>
<signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrNRRUyKFWFcP3I5OxsINbY6d/OdHngiPWQa53kS5aw6D/LZ1qRP6wMOOgIt80TCLq</signature>
<managed>false</managed>
<title>流程模型清单</title>
@ -255,6 +255,110 @@
<calcFormula></calcFormula>
<propsVal>{}</propsVal>
</boItem>
<boItem>
<id>94e7f7ed-1858-4250-9604-a4a8fe4c4937</id>
<name>L1</name>
<title>L1</title>
<columnType>TEXT</columnType>
<length>8</length>
<nullable>true</nullable>
<defaultValue></defaultValue>
<columnWidth>60</columnWidth>
<componentId>AWSUI.Text</componentId>
<componentSetting>{"search":"0"}</componentSetting>
<display>true</display>
<deleted>false</deleted>
<modify>true</modify>
<componentExtendCode></componentExtendCode>
<persistenceType>ENTITY</persistenceType>
<validateType></validateType>
<validateRule></validateRule>
<validateTip></validateTip>
<validateErr>0</validateErr>
<tooltip></tooltip>
<copy>false</copy>
<displayRule></displayRule>
<calcFormula></calcFormula>
<propsVal>{}</propsVal>
</boItem>
<boItem>
<id>81c84a1c-952a-4089-bff8-76f607274840</id>
<name>L2</name>
<title>L2</title>
<columnType>TEXT</columnType>
<length>8</length>
<nullable>true</nullable>
<defaultValue></defaultValue>
<columnWidth>60</columnWidth>
<componentId>AWSUI.Text</componentId>
<componentSetting>{"search":"0"}</componentSetting>
<display>true</display>
<deleted>false</deleted>
<modify>true</modify>
<componentExtendCode></componentExtendCode>
<persistenceType>ENTITY</persistenceType>
<validateType></validateType>
<validateRule></validateRule>
<validateTip></validateTip>
<validateErr>0</validateErr>
<tooltip></tooltip>
<copy>false</copy>
<displayRule></displayRule>
<calcFormula></calcFormula>
<propsVal>{}</propsVal>
</boItem>
<boItem>
<id>886ebb69-c048-47c0-a3fa-850571a594a0</id>
<name>L3</name>
<title>L3</title>
<columnType>TEXT</columnType>
<length>8</length>
<nullable>true</nullable>
<defaultValue></defaultValue>
<columnWidth>60</columnWidth>
<componentId>AWSUI.Text</componentId>
<componentSetting>{"search":"0"}</componentSetting>
<display>true</display>
<deleted>false</deleted>
<modify>true</modify>
<componentExtendCode></componentExtendCode>
<persistenceType>ENTITY</persistenceType>
<validateType></validateType>
<validateRule></validateRule>
<validateTip></validateTip>
<validateErr>0</validateErr>
<tooltip></tooltip>
<copy>false</copy>
<displayRule></displayRule>
<calcFormula></calcFormula>
<propsVal>{}</propsVal>
</boItem>
<boItem>
<id>3723ad38-4f61-4e38-9c76-b3ea5e2605f9</id>
<name>L4</name>
<title>L4</title>
<columnType>TEXT</columnType>
<length>8</length>
<nullable>true</nullable>
<defaultValue></defaultValue>
<columnWidth>60</columnWidth>
<componentId>AWSUI.Text</componentId>
<componentSetting>{"search":"0"}</componentSetting>
<display>true</display>
<deleted>false</deleted>
<modify>true</modify>
<componentExtendCode></componentExtendCode>
<persistenceType>ENTITY</persistenceType>
<validateType></validateType>
<validateRule></validateRule>
<validateTip></validateTip>
<validateErr>0</validateErr>
<tooltip></tooltip>
<copy>false</copy>
<displayRule></displayRule>
<calcFormula></calcFormula>
<propsVal>{}</propsVal>
</boItem>
</boItems>
<boIndexs>
<boIndex>

8
com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
View File

@ -4,7 +4,7 @@
<createUser>admin</createUser>
<createTime>2023-05-31 18:03:32</createTime>
<updateUser>admin</updateUser>
<updateTime>2023-06-07 19:32:51</updateTime>
<updateTime>2023-06-12 19:44:59</updateTime>
<signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrfBc9hqIASUfUE0oNnMJX+ec3gaaVRTOXkn+Q9j7jtPqago5GSsGy8ZiXG2WLXK9d</signature>
<managed>false</managed>
<version>1.0</version>
@ -42,7 +42,7 @@
<column id="obj_26817cc671cc4473bc2a895a53f2e99c" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="187" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="{&quot;type&quot;:&quot;NORMAL&quot;,&quot;cons&quot;:&quot;process_flowchart:泳道图|process_epc:EPC&quot;,&quot;showAdv&quot;:false}" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MODELTYPE" label="模型类型" orderindex="1" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_f21a15ade71d4591a47cee41ff5c5bff" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPENAME" label="形状名称" orderindex="2" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_f6b3f3e3343743d492a0af6a3270aeed" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPETYPE" label="形状类型" orderindex="3" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_051fbc262a2241308e692a7ef6724b62" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="106" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="3" required="0" align="right" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPENUMBER" label="形状编号" orderindex="4" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="NUMBER" handleType="0" boType="AWSUI.Number" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_051fbc262a2241308e692a7ef6724b62" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="106" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="3" required="0" align="right" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPENUMBER" label="形状编号" orderindex="4" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="NUMBER" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_6691c4abd03c4e438bfb10646997e647" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="200px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="2000" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="EXTDESC" label="扩展&lt;活动描述&gt;" orderindex="5" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_8447ea666eb149609857c8d9952240c7" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="120" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="2000" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="EXTINPUT" label="扩展&lt;输入&gt;" orderindex="6" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_f1a2f55072124daba9b97171f3095aae" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="115" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="2000" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="EXTOUTPUT" label="扩展&lt;输出&gt;" orderindex="7" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
@ -55,6 +55,10 @@
<column id="obj_110849083d8d45f0b524a82f7a2eb75f" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="120px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="36" required="0" align="left" showrule="{&quot;type&quot;: &quot;org&quot;,&quot;orgtype&quot;: &quot;user&quot;}" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="_UPDATEUSER" label="更新人" orderindex="14" colbehaviortarget="" ishidden="true" export="false" backHide="true" isusedvalue="true" tableheadsort="false" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="1" boType="" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="obj_84a232242eb545938f876cfabac18a74" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="120px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="1" required="0" align="right" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="_ISEND" label="流程是否结束" orderindex="15" colbehaviortarget="" ishidden="true" export="false" backHide="true" isusedvalue="true" tableheadsort="false" colrefbehaviorid="" columnAction="" datatype="NUMBER" handleType="1" boType="" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="dfe624df-8e19-4b4d-addd-02c6959c9cdd" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="225" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="36" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MODELID" label="模型ID" orderindex="16" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="2fc4cfa8-4da5-472d-87d2-66109f2c90ab" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="8" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L1" label="L1" orderindex="17" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="d76d9158-1bbb-4924-b10a-4fe55f3e44e8" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="8" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L2" label="L2" orderindex="18" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="d31c7076-52e4-4e62-9107-9152e844d4da" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="8" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L3" label="L3" orderindex="19" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<column id="6f6fafe5-318d-4e2f-ae66-a3640bc45f97" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="8" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L4" label="L4" orderindex="20" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
<dynamicRule></dynamicRule>
</datagrid>
<reportSetting></reportSetting>

15
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -1,7 +1,6 @@
package com.actionsoft.apps.coe.pal.publisher.client.web;
import java.io.File;
import java.sql.Array;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@ -23,9 +22,6 @@ import java.util.stream.Collectors;
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
import com.actionsoft.apps.coe.pal.system.util.StringUtil;
import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOAPI;
import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOQueryAPI;
import org.apache.commons.lang.StringUtils;
@ -4368,6 +4364,7 @@ public class ProcessPublishWeb extends ActionWeb {
return ro.toString();
}
/**
* 根据流程模型获取流程清单列表
*
@ -4382,8 +4379,10 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject elements = (JSONObject) definitionJo.get("elements");
ArrayList<BO> bos = new ArrayList<>();
ResponseObject ro = ResponseObject.newOkResponse();
//流程架构等级
List<RowMap> processLevel = DBSql.getMaps(String.format("select PROPERTYID,PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYID in ('Process_Architecture_L1','Process_Architecture_L2','Process_Architecture_L3','Process_Architecture_L4') AND PLID='%s' ORDER BY PROPERTYID", publishFileId));
elements.forEach((k, v) -> {
setShapeAttr(bos, publishFileId, (JSONObject) v, fileName);
setShapeAttr(bos, publishFileId, (JSONObject) v, fileName, processLevel);
});
if (bos.size() == 0) {
return ResponseObject.newErrResponse("模型不存在活动节点").toString();
@ -4407,7 +4406,7 @@ public class ProcessPublishWeb extends ActionWeb {
* @param shape 形状
* @param fileName 文件名称
*/
private void setShapeAttr(ArrayList<BO> bos, String publishFileId, JSONObject shape, String fileName) {
private void setShapeAttr(ArrayList<BO> bos, String publishFileId, JSONObject shape, String fileName , List<RowMap> processLevel) {
//只需要活动节点
if (shape.containsKey("category") && !shape.getString("title").equals("开始/结束")) {
BO bo = new BO();
@ -4416,6 +4415,10 @@ public class ProcessPublishWeb extends ActionWeb {
bo.set("MODELTYPE", shape.getString("category"));
bo.set("SHAPETYPE", shape.getString("title"));
bo.set("SHAPENAME", shape.getString("text"));
//插入流程架构等级
for (int i = 0; i < processLevel.size(); i++) {
bo.set("L" + (i + 1), processLevel.get(i).getString("PROPERTYVALUE"));
}
if (shape.containsKey("dataAttributes")) {
JSONArray dataAttributes = shape.getJSONArray("dataAttributes");
if (dataAttributes.size() > 0) {