generator before deploy...

generator before deploy registry.cn-shanghai.aliyuncs.com/ibizsys/samplesolution-demosys-api-demoapi:2022.11.28.001

generator before deploy...
generator before deploy registry.cn-shanghai.aliyuncs.com/ibizsys/samplesolution-demosys-api-demoapi:2022.11.28.001
314161fc · ibizdev · 74f7cb30 · 314161fc · 314161fc · 314161fc
--- a/.gitignore
+++ b/.gitignore
--- a/demo-boot/src/main/java/cn/ibizlab/BootApplication.java
+++ b/demo-boot/src/main/java/cn/ibizlab/BootApplication.java
--- a/demo-core/pom.xml
+++ b/demo-core/pom.xml
@@ -10,8 +10,8 @@
    </parent>
    <artifactId>demo-core</artifactId>
-    <name>后台服务 Core</name>
+    <name>Demo Core</name>
-    <description>后台服务 Core</description>
+    <description>后台服务 Core，模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在demo-boot项目中继承或覆盖重写</description>
    <dependencies>
@@ -20,6 +20,14 @@
 			<artifactId>ibizlab-boot-starter-data</artifactId>
 			<version>2.4.0-SNAPSHOT</version>
 		</dependency>
+        <!--  MySQL驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 	</dependencies>
    <properties>

--- a/demo-core/src/main/resources/permission/systemResource.json
+++ b/demo-core/src/main/resources/permission/systemResource.json
@@ -110,10 +110,7 @@
                            "name": "扩展编辑器"                        },
                        {
                            "id": "menuitem65",
-                            "name": "微服务组件"                        },
+                            "name": "微服务组件"                        }
-                        {
-                            "id": "menuitem151",
-                            "name": "编辑器插件示例"                        }
                    ]
                        },
@@ -875,6 +872,28 @@
                        }
                    ]
+                        },
+                        {
+                            "id": "menuitem233",
+                            "name": "插件",
+                            "item": [
+                        {
+                            "id": "menuitem236",
+                            "name": "部件插件"                        },
+                        {
+                            "id": "menuitem234",
+                            "name": "表格列插件"                        },
+                        {
+                            "id": "menuitem151",
+                            "name": "编辑器插件示例"                        },
+                        {
+                            "id": "menuitem235",
+                            "name": "视图样式插件"                        },
+                        {
+                            "id": "menuitem237",
+                            "name": "表格模板插件（透视表）"                        }
+                    ]
                        }
                    ]

--- a/demo-core/src/main/resources/sysmodel/RuntimeDict.json
+++ b/demo-core/src/main/resources/sysmodel/RuntimeDict.json
 [
    {
-        "name":"年度",
+        "name": "年度",
-        "code":"Years",
+        "code": "Years",
-        "group":"",
+        "group": "",
-        "memo":"",
+        "memo": "",
-        "enable":"",
    }
 ]
\ No newline at end of file
--- a/demo-core/src/main/resources/workflow/ACTv2.bpmn
+++ b/demo-core/src/main/resources/workflow/ACTv2.bpmn
@@ -31,28 +31,15 @@
        </startEvent>
        <endEvent id="sid-End001" name="结束">
        </endEvent>
+        <exclusiveGateway id="sid-Exclusivegateway001"/>
        <endEvent id="sid-End002" name="结束">
        </endEvent>
-        <exclusiveGateway id="sid-Exclusivegateway001"/>
-        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.deptheadsid}" flowable:exclusive="true" 
-         id="tid-5-Interactive001" 
-         name="部门经理审核" >
-            <documentation>${majortext}</documentation>
-            <extensionElements>
-                <flowable:form procfunc="addstepbefore;reassign" process-form="operationForm"  process-utilform="beforeSign" process-utilformname="加签"  process-util3form="transfer" process-util3formname="工作转移"  /> 
-            </extensionElements>
-        </userTask>
-        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" 
-         id="tid-1-Interactive005" 
-         name="发起人调整" >
-            <documentation>${majortext}</documentation>
-        </userTask>
        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)}" flowable:exclusive="true" 
         id="tid-20-Interactive003" 
         name="总经理审核" >
            <documentation>${majortext}</documentation>
        </userTask>
-        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)}" flowable:exclusive="true" 
+        <userTask flowable:category="${businessKey}" flowable:dueDate="PT5M" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)}" flowable:exclusive="true" 
         id="tid-10-Interactive002" 
         name="财务经理审核" >
            <documentation>${majortext}</documentation>
@@ -60,37 +47,31 @@
                <flowable:form procfunc="sendback" /> 
            </extensionElements>
        </userTask>
+        <boundaryEvent id="bid-10-Interactive002" name="timeout-财务经理审核" attachedToRef="tid-10-Interactive002" cancelActivity="true">
+            <timerEventDefinition>
+                <timeDate>PT5M</timeDate>
+            </timerEventDefinition>
+        </boundaryEvent>    
+        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" 
+         id="tid-1-Interactive005" 
+         name="发起人调整" >
+            <documentation>${majortext}</documentation>
+        </userTask>
        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)}" flowable:exclusive="true" 
         id="tid-30-Interactive004" 
         name="财务总监审批" >
            <documentation>${majortext}</documentation>
        </userTask>
+        <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.deptheadsid}" flowable:exclusive="true" 
-        <sequenceFlow id="rid-e3878a66a52016449161ad2c87f72a91" sourceRef="sid-Start001" targetRef="tid-5-Interactive001" name="">
+         id="tid-5-Interactive001" 
-        </sequenceFlow>    
+         name="部门经理审核" >
-        <sequenceFlow id="lid-C61-801f54724ece8211335876815cf8db89" sourceRef="tid-5-Interactive001" targetRef="tid-10-Interactive002" name="同意">
+            <documentation>${majortext}</documentation>
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-801f54724ece8211335876815cf8db89"}]]></conditionExpression>
-            <extensionElements>
-                <flowable:form sequenceFlowForm="operationForm"  sequenceFlowView="WFDynaActionView"  nextCondition="ANY"  /> 
-            </extensionElements>    
-        </sequenceFlow>    
-        <sequenceFlow id="lid-C70-d0e29cc27e05571b11909f7658ac4967" sourceRef="tid-5-Interactive001" targetRef="tid-1-Interactive005" name="不同意">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-d0e29cc27e05571b11909f7658ac4967"}]]></conditionExpression>
-            <extensionElements>
-                <flowable:form sequenceFlowForm="operationForm"  sequenceFlowView="WFDynaActionView"  nextCondition="ANY"  /> 
-            </extensionElements>    
-        </sequenceFlow>    
-        <sequenceFlow id="lid-C96-2c15fee57a59e3458057d2596c14afad" sourceRef="tid-1-Interactive005" targetRef="sid-End002" name="取消">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C96-2c15fee57a59e3458057d2596c14afad"}]]></conditionExpression>
-            <extensionElements>
-                <flowable:form nextCondition="ANY"  /> 
-            </extensionElements>    
-        </sequenceFlow>    
-        <sequenceFlow id="lid-C49-daae1767f268d31e508fdb9e449f6ab0" sourceRef="tid-1-Interactive005" targetRef="tid-5-Interactive001" name="重新提交">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-daae1767f268d31e508fdb9e449f6ab0"}]]></conditionExpression>
            <extensionElements>
-                <flowable:form sequenceFlowForm="approvedForm"  nextCondition="ANY"  /> 
+                <flowable:form procfunc="addstepbefore;reassign" process-form="operationForm"  process-utilform="beforeSign" process-utilformname="加签"  process-util3form="transfer" process-util3formname="工作转移"  /> 
            </extensionElements>
+        </userTask>
+        <sequenceFlow id="rid-e3878a66a52016449161ad2c87f72a91" sourceRef="sid-Start001" targetRef="tid-5-Interactive001" name="">
        </sequenceFlow>    
        <sequenceFlow id="lid-C69-9188599d2eb713551ba22fe947d3b73a" sourceRef="tid-20-Interactive003" targetRef="tid-1-Interactive005" name="不同意">
            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C69-9188599d2eb713551ba22fe947d3b73a"}]]></conditionExpression>
@@ -110,12 +91,26 @@
                <flowable:form nextCondition="ANY"  /> 
            </extensionElements>    
        </sequenceFlow>    
-        <sequenceFlow id="lid-C28-0fc5468954c1502dda88626b19c49f7b" sourceRef="tid-10-Interactive002" targetRef="tid-1-Interactive005" name="不同意">
+        <sequenceFlow id="lid-TIMEOUT-3f47eb9ea6d634af007ec95a1b80aef7" sourceRef="tid-10-Interactive002" targetRef="tid-5-Interactive001" name="">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C28-0fc5468954c1502dda88626b19c49f7b"}]]></conditionExpression>
+        </sequenceFlow>    
+        <sequenceFlow id="lid-C96-2c15fee57a59e3458057d2596c14afad" sourceRef="tid-1-Interactive005" targetRef="sid-End002" name="取消">
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C96-2c15fee57a59e3458057d2596c14afad"}]]></conditionExpression>
            <extensionElements>
                <flowable:form nextCondition="ANY"  /> 
            </extensionElements>    
        </sequenceFlow>    
+        <sequenceFlow id="lid-C49-daae1767f268d31e508fdb9e449f6ab0" sourceRef="tid-1-Interactive005" targetRef="tid-5-Interactive001" name="重新提交">
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-daae1767f268d31e508fdb9e449f6ab0"}]]></conditionExpression>
+            <extensionElements>
+                <flowable:form sequenceFlowForm="approvedForm"  nextCondition="ANY"  /> 
+            </extensionElements>    
+        </sequenceFlow>    
+        <sequenceFlow id="rid-46ceb8cd5d6f5c971c13cfee976ca04d" sourceRef="sid-Exclusivegateway001" targetRef="sid-End001" name="">
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'SINGLE', '10000')))} ]]></conditionExpression>
+        </sequenceFlow>    
+        <sequenceFlow id="rid-2ea2f6438db10f01ac1dc58f7ada602a" sourceRef="sid-Exclusivegateway001" targetRef="tid-20-Interactive003" name="">
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'SINGLE', '10000')))} ]]></conditionExpression>
+        </sequenceFlow>    
        <sequenceFlow id="lid-C22-9184f80de46589d405564e720b0ea260" sourceRef="tid-30-Interactive004" targetRef="tid-1-Interactive005" name="不同意">
            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C22-9184f80de46589d405564e720b0ea260"}]]></conditionExpression>
            <extensionElements>
@@ -128,11 +123,17 @@
                <flowable:form nextCondition="ANY"  /> 
            </extensionElements>    
        </sequenceFlow>    
-        <sequenceFlow id="rid-46ceb8cd5d6f5c971c13cfee976ca04d" sourceRef="sid-Exclusivegateway001" targetRef="sid-End001" name="">
+        <sequenceFlow id="lid-C61-801f54724ece8211335876815cf8db89" sourceRef="tid-5-Interactive001" targetRef="tid-10-Interactive002" name="同意">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'SINGLE', '10000')))} ]]></conditionExpression>
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-801f54724ece8211335876815cf8db89"}]]></conditionExpression>
+            <extensionElements>
+                <flowable:form sequenceFlowForm="operationForm"  sequenceFlowView="WFDynaActionView"  nextCondition="ANY"  /> 
+            </extensionElements>    
        </sequenceFlow>    
-        <sequenceFlow id="rid-2ea2f6438db10f01ac1dc58f7ada602a" sourceRef="sid-Exclusivegateway001" targetRef="tid-20-Interactive003" name="">
+        <sequenceFlow id="lid-C70-d0e29cc27e05571b11909f7658ac4967" sourceRef="tid-5-Interactive001" targetRef="tid-1-Interactive005" name="不同意">
-            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'SINGLE', '10000')))} ]]></conditionExpression>
+            <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-d0e29cc27e05571b11909f7658ac4967"}]]></conditionExpression>
+            <extensionElements>
+                <flowable:form sequenceFlowForm="operationForm"  sequenceFlowView="WFDynaActionView"  nextCondition="ANY"  /> 
+            </extensionElements>    
        </sequenceFlow>    
    </process>
@@ -141,63 +142,63 @@
            <bpmndi:BPMNShape id="BPMNShape-sid-Start001" bpmnElement="sid-Start001">
                <omgdi:Bounds x="15" y="55" width="30" height="30" />
            </bpmndi:BPMNShape>
-            <bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001">
-                <omgdi:Bounds x="150" y="30" width="100" height="80" />
-            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape id="BPMNShape-sid-End001" bpmnElement="sid-End001">
                <omgdi:Bounds x="780" y="221" width="30" height="30" />
            </bpmndi:BPMNShape>
-            <bpmndi:BPMNShape id="BPMNShape-sid-End002" bpmnElement="sid-End002">
+            <bpmndi:BPMNShape id="BPMNShape-tid-20-Interactive003" bpmnElement="tid-20-Interactive003">
-                <omgdi:Bounds x="186" y="389" width="30" height="30" />
+                <omgdi:Bounds x="555" y="195" width="100" height="80" />
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="BPMNShape-tid-10-Interactive002" bpmnElement="tid-10-Interactive002">
+                <omgdi:Bounds x="420" y="30" width="100" height="80" />
            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape id="BPMNShape-tid-1-Interactive005" bpmnElement="tid-1-Interactive005">
                <omgdi:Bounds x="150" y="195" width="100" height="80" />
            </bpmndi:BPMNShape>
-            <bpmndi:BPMNShape id="BPMNShape-tid-20-Interactive003" bpmnElement="tid-20-Interactive003">
+            <bpmndi:BPMNShape id="BPMNShape-sid-Exclusivegateway001" bpmnElement="sid-Exclusivegateway001">
-                <omgdi:Bounds x="555" y="195" width="100" height="80" />
+                <omgdi:Bounds x="585" y="50" width="40" height="40" />
            </bpmndi:BPMNShape>
-            <bpmndi:BPMNShape id="BPMNShape-tid-10-Interactive002" bpmnElement="tid-10-Interactive002">
+            <bpmndi:BPMNShape id="BPMNShape-sid-End002" bpmnElement="sid-End002">
-                <omgdi:Bounds x="435" y="30" width="100" height="80" />
+                <omgdi:Bounds x="186" y="389" width="30" height="30" />
            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape id="BPMNShape-tid-30-Interactive004" bpmnElement="tid-30-Interactive004">
                <omgdi:Bounds x="555" y="360" width="100" height="80" />
            </bpmndi:BPMNShape>
-            <bpmndi:BPMNShape id="BPMNShape-sid-Exclusivegateway001" bpmnElement="sid-Exclusivegateway001">
+            <bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001">
-                <omgdi:Bounds x="585" y="50" width="40" height="40" />
+                <omgdi:Bounds x="150" y="30" width="100" height="80" />
            </bpmndi:BPMNShape>
            <bpmndi:BPMNEdge id="BPMNEdge-rid-e3878a66a52016449161ad2c87f72a91" bpmnElement="rid-e3878a66a52016449161ad2c87f72a91">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C61-801f54724ece8211335876815cf8db89" bpmnElement="lid-C61-801f54724ece8211335876815cf8db89">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C69-9188599d2eb713551ba22fe947d3b73a" bpmnElement="lid-C69-9188599d2eb713551ba22fe947d3b73a">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C70-d0e29cc27e05571b11909f7658ac4967" bpmnElement="lid-C70-d0e29cc27e05571b11909f7658ac4967">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C40-589364ef29595cdec31fb1825d9b42ed" bpmnElement="lid-C40-589364ef29595cdec31fb1825d9b42ed">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C96-2c15fee57a59e3458057d2596c14afad" bpmnElement="lid-C96-2c15fee57a59e3458057d2596c14afad">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C52-0ab05f00c4c8e6655a10ec3e3c9b3322" bpmnElement="lid-C52-0ab05f00c4c8e6655a10ec3e3c9b3322">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C49-daae1767f268d31e508fdb9e449f6ab0" bpmnElement="lid-C49-daae1767f268d31e508fdb9e449f6ab0">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-TIMEOUT-3f47eb9ea6d634af007ec95a1b80aef7" bpmnElement="lid-TIMEOUT-3f47eb9ea6d634af007ec95a1b80aef7">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C69-9188599d2eb713551ba22fe947d3b73a" bpmnElement="lid-C69-9188599d2eb713551ba22fe947d3b73a">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C96-2c15fee57a59e3458057d2596c14afad" bpmnElement="lid-C96-2c15fee57a59e3458057d2596c14afad">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C40-589364ef29595cdec31fb1825d9b42ed" bpmnElement="lid-C40-589364ef29595cdec31fb1825d9b42ed">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C49-daae1767f268d31e508fdb9e449f6ab0" bpmnElement="lid-C49-daae1767f268d31e508fdb9e449f6ab0">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C52-0ab05f00c4c8e6655a10ec3e3c9b3322" bpmnElement="lid-C52-0ab05f00c4c8e6655a10ec3e3c9b3322">
+            <bpmndi:BPMNEdge id="BPMNEdge-rid-46ceb8cd5d6f5c971c13cfee976ca04d" bpmnElement="rid-46ceb8cd5d6f5c971c13cfee976ca04d">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-lid-C28-0fc5468954c1502dda88626b19c49f7b" bpmnElement="lid-C28-0fc5468954c1502dda88626b19c49f7b">
+            <bpmndi:BPMNEdge id="BPMNEdge-rid-2ea2f6438db10f01ac1dc58f7ada602a" bpmnElement="rid-2ea2f6438db10f01ac1dc58f7ada602a">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
@@ -209,11 +210,11 @@
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-rid-46ceb8cd5d6f5c971c13cfee976ca04d" bpmnElement="rid-46ceb8cd5d6f5c971c13cfee976ca04d">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C61-801f54724ece8211335876815cf8db89" bpmnElement="lid-C61-801f54724ece8211335876815cf8db89">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>
-            <bpmndi:BPMNEdge id="BPMNEdge-rid-2ea2f6438db10f01ac1dc58f7ada602a" bpmnElement="rid-2ea2f6438db10f01ac1dc58f7ada602a">
+            <bpmndi:BPMNEdge id="BPMNEdge-lid-C70-d0e29cc27e05571b11909f7658ac4967" bpmnElement="lid-C70-d0e29cc27e05571b11909f7658ac4967">
                <omgdi:waypoint x="0" y="0" />
                <omgdi:waypoint x="0" y="0" />
            </bpmndi:BPMNEdge>

--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,8 @@
    <artifactId>demo</artifactId>
    <groupId>cn.ibizlab</groupId>
    <version>1.0.0.0</version>
-    <name>后台服务</name>
+    <name>Demo</name>
-    <description></description>
+    <description>后台服务</description>
    <packaging>pom</packaging>
    <parent>