@IPU_FIXBUG_2022@调整服务逻辑流模板、testcase

qb-auth-server/pom.xml

@@ -41,6 +41,7 @@
    </repositories>
    <properties>
        <env>dev</env>
        <start-class>com.ipu.logicflow.server.LogicflowServerStart</start-class>
        <spring-boot>2.3.1.RELEASE</spring-boot>
        <ipu>3.3-SNAPSHOT</ipu>
@@ -104,11 +105,41 @@
            <artifactId>mvel2</artifactId>
            <version>2.4.12.Final</version>
        </dependency>
        <dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-log4j2</artifactId>
			<exclusions>
				<exclusion>
					<groupId>org.apache.logging.log4j</groupId>
					<artifactId>log4j-core</artifactId>
				</exclusion>
				<exclusion>
					<groupId>org.apache.logging.log4j</groupId>
					<artifactId>log4j-api</artifactId>
				</exclusion>
				<exclusion>
					<groupId>org.apache.logging.log4j</groupId>
					<artifactId>log4j-slf4j-impl</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>org.apache.logging.log4j</groupId>
			<artifactId>log4j-slf4j-impl</artifactId>
		</dependency>
        <!--log4j2核心包-->
		<dependency>
			<groupId>org.apache.logging.log4j</groupId>
			<artifactId>log4j-api</artifactId>
		</dependency>
		<dependency>
			<groupId>org.apache.logging.log4j</groupId>
			<artifactId>log4j-core</artifactId>
		</dependency>
    </dependencies>
    <build>
        <plugins>
            <!-- ==========应用包和依赖包分离的打包方法================ -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>

qb-auth-server/src/main/java/com/ipu/logicflow/server/util/LogicFlowConfig.java

@@ -55,6 +55,12 @@ public class LogicFlowConfig {
		flowPathMap.put("user_insert", "flow/user/user_insert.xml");
		flowPathMap.put("user_select", "flow/user/user_select.xml");
		flowPathMap.put("user_select_by_name", "flow/user/user_select_by_name.xml");
		flowPathMap.put("user_select_by_cond", "flow/user/user_select_by_cond.xml");
		flowPathMap.put("user_update_by_cond", "flow/user/user_update_by_cond.xml");
		flowPathMap.put("user_update", "flow/user/user_update.xml");
		flowPathMap.put("user_disable_with_aggregate", "flow/user/user_disable_with_aggregate.xml");
		
		flowPathMap.put("organize_select", "flow/org/organize_select.xml");
		Iterator<String> it = flowPathMap.values().iterator();

qb-auth-server/src/main/resources/flow/menu/model/sec_menu.xml

@@ -18,16 +18,16 @@
    <attr id="create_date" type="datetime" name="创建日期"/>
    <attr id="done_date" type="datetime" name="操作日期"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="valid_date" type="datetime" name="操作人员"/>
    <attr id="expire_date" type="datetime" name="操作人员"/>
    <attr id="create_op_id" type="string" name="操作人员"/>
    <attr id="create_org_id" type="string" name="操作人员"/>
    <attr id="done_code" type="int" name="操作人员"/>
    <attr id="org_id" type="string" name="操作人员"/>
    <attr id="mgmt_district" type="string" name="操作人员"/>
    <attr id="mgmt_county" type="string" name="操作人员"/>
    <attr id="region_id" type="string" name="操作人员"/>
    <attr id="tenant_code" type="string" name="操作人员"/>
	<attr id="valid_date" type="datetime" name="生效日期"  />
	<attr id="expire_date" type="datetime" name="失效日期"  />
	<attr id="create_op_id" type="string" name="创建人员"  />
	<attr id="create_org_id" type="string" name="创建组织"  />
    <attr id="done_code" type="int" name="事务编号"/>
	<attr id="org_id" type="string" name="操作组织"  />
	<attr id="mgmt_district" type="string" name="管理地区"  />
	<attr id="mgmt_county" type="string" name="管理国家"  />
	<attr id="region_id" type="string" name="区域ID"  />
	<attr id="tenant_code" type="string" name="租户编码"  />
    
    <behavior id="insertMenu" name="新增菜单信息">
        <function domain="DB" name="insert">

qb-auth-server/src/main/resources/flow/menu/model/sec_priv_entity.xml

@@ -16,6 +16,7 @@
    <attr id="create_op_id" type="string" name="创建人员"/>
    <attr id="create_org_id" type="string" name="操作人员"/>
    <attr id="done_date" type="datetime" name="操作日期"/>
    <attr id="done_code" type="int" name="事务编号"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="org_id" type="string" name="操作人员"/>
    <attr id="mgmt_district" type="string" name="操作人员"/>

qb-auth-server/src/main/resources/flow/org/model/sec_org_user_rel.xml

@@ -3,20 +3,21 @@
	<attr id="org_user_rel_id" type="int" name="角色关联用户标识" />
	<attr id="user_id" type="int" name="用户标识" />
	<attr id="organize_id" type="int" name="角色标识" />
	<attr id="valid_date" type="datetime" name="生效日期" exists="false" />
	<attr id="expire_date" type="datetime" name="失效日期" exists="false" />
	<attr id="valid_date" type="datetime" name="生效日期"  />
	<attr id="expire_date" type="datetime" name="失效日期"  />
	<attr id="data_status" type="string" name="数据状态" />
	<attr id="create_date" type="datetime" name="创建日期" />
	<attr id="create_op_id" type="string" name="创建人员" exists="false" />
	<attr id="create_org_id" type="string" name="创建组织" exists="false" />
	<attr id="done_code" type="datetime" name="事务编号" exists="false" />
	<attr id="done_date" type="datetime" name="操作日期" exists="false" />
	<attr id="create_op_id" type="string" name="创建人员"  />
	<attr id="create_org_id" type="string" name="创建组织"  />
	<attr id="done_code" type="int" name="事务编号"  />
	<attr id="done_date" type="datetime" name="操作日期"  />
	<attr id="op_id" type="string" name="操作人员" />
	<attr id="org_id" type="string" name="操作组织" exists="false" />
	<attr id="mgmt_district" type="string" name="管理地区" exists="false" />
	<attr id="mgmt_county" type="string" name="管理国家" exists="false" />
	<attr id="region_id" type="string" name="区域ID" exists="false" />
	<attr id="tenant_code" type="string" name="租户编码" exists="false" />
	<attr id="org_id" type="string" name="操作组织"  />
	<attr id="mgmt_district" type="string" name="管理地区"  />
	<attr id="mgmt_county" type="string" name="管理国家"  />
	<attr id="region_id" type="string" name="区域ID"  />
	<attr id="tenant_code" type="string" name="租户编码"  />
	
	<behavior id="insertOrgUserRel" name="新增用户组织信息">
		<function domain="DB" name="insert">
			<param value="auth" type="string" />

qb-auth-server/src/main/resources/flow/org/model/sec_organize.xml

@@ -17,7 +17,14 @@
    <attr id="create_op_id" type="string" name="创建人员"/>
    <attr id="done_date" type="datetime" name="操作日期"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="done_code" type="int" name="事务编号"  />
    <attr id="create_org_id" type="string" name="创建组织"  />
	<attr id="org_id" type="string" name="操作组织"  />
	<attr id="mgmt_district" type="string" name="管理地区"  />
	<attr id="mgmt_county" type="string" name="管理国家"  />
	<attr id="region_id" type="string" name="区域ID"  />
	<attr id="tenant_code" type="string" name="租户编码"  />
	
    <behavior id="insertOrganize" name="新增组织信息">
        <function domain="DB" name="insert">
            <param value="auth" type="string"/>

qb-auth-server/src/main/resources/flow/role/model/sec_role_grant.xml

@@ -10,7 +10,7 @@
    <attr id="create_date" type="datetime" name="创建日期"/>
    <attr id="create_op_id" type="string" name="创建人员"/>
    <attr id="create_org_id" type="string" name="创建组织"/>
    <attr id="done_code" type="datetime"    name="操作编码"/>
    <attr id="done_code" type="int"    name="事务编号"/>
    <attr id="done_date" type="datetime"    name="操作日期"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="org_id" type="string" name="操作组织"/>

qb-auth-server/src/main/resources/flow/user/model/sec_user.xml

@@ -19,12 +19,19 @@
    <attr id="valid_date" type="datetime" name="生效日期"/>
    <attr id="expire_date" type="datetime" name="失效日期"/>
    <attr id="data_status" type="string" name="数据状态"/>
    <attr id="valid_date" type="datetime" name="生效日期"/>
    <attr id="create_date" type="datetime" name="创建日期"/>
    <attr id="create_op_id" type="string" name="创建人员"/>
    <attr id="done_date" type="datetime"    name="操作日期"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="create_org_id" type="string" name="创建组织"/>
    <attr id="done_code" type="int"    name="事务编号"/>
    <attr id="org_id" type="string" name="操作组织"/>
    <attr id="mgmt_district" type="string" name="管理地区"/>
    <attr id="mgmt_county" type="string" name="管理国家"/>
    <attr id="region_id" type="string" name="区域ID"/>
    <attr id="tenant_code" type="string" name="租户编码"/>
    <attr id="susername" type="string" name="susername"/>
    
    <behavior id="insertUser" name="新增用户信息">
        <function domain="DB" name="insert">
            <param value="auth" type="string"/>

qb-auth-server/src/main/resources/flow/user/user_insert.xml

@@ -8,7 +8,7 @@
    </declare>
    <start id="start" name="开始节点" next="insertUser">
        <var key="user" model="sec_user"/>
        <var key="user" model="sec_user" attrExists="false"/>
    </start>
    <!--<action id="aggregateUser" name="聚合用户信息" next="insertUser">

qb-auth-server/src/main/resources/flow/user/user_select_by_cond.xml

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="user_select_by_cond"
            name="用户查询"
            desc="用户查询">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_user"/>
    </declare>
    <start id="start" name="开始节点" next="selectUserByCond">
        <var key="user_cond" model="sec_user" attrExists="false"/>
    </start>
    <action id="selectUserByCond" name="查询用户" next="end">
        <input>
            <var key="user_cond" />
        </input>
        <function domain="DB" name="selectByCond">
            <param value="auth" type="string"/>
            <param value="sec_user" type="string"/>
            <param key="user_cond" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
        <output>
            <var key="user_info"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="user_info"/>
    </end>
</logic-flow>

qb-auth-server/src/main/resources/flow/user/user_select_by_id.xml

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="user_select_by_id"
            name="用户查询"
            desc="用户查询">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_user"/>
    </declare>
    <start id="start" name="开始节点" next="aggregateUser">
        <var key="user_id" model="sec_user" attr="user_id"/>
    </start>
    <action id="aggregateUser" name="聚合用户信息" next="selectUser">
        <input>
            <var key="user_id" />
        </input>
        <aggregate />
        <output>
            <var key="user"/>
        </output>
    </action>
    <action id="selectUser" name="查询用户" next="end">
        <input>
            <var key="user" model="sec_user" attrExists="false"/>
        </input>
        <behavior model="sec_user" id="selectUser"/>
        <output>
            <var key="user_info"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="user_info"/>
    </end>
</logic-flow>

qb-auth-server/src/test/java/com/ipu/logicflow/server/UserTest.java

@@ -55,11 +55,14 @@ public class UserTest {
    }
    @Test
    public void testSelectUserById() {
    public void testSelectUserByCond() {
        JMap param = new JsonMap();
        param.put("user_id", "308075");
        JSONObject user = new JSONObject();
//        user.put("user_id", "308075");
        user.put("data_status", "0");
        param.put("user_cond", user);
        try{
            JMap result = LogicFlowEngine.execute("user_select_by_id", param);
            JMap result = LogicFlowEngine.execute("user_select_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
@@ -309,7 +312,7 @@ public class UserTest {
        String[] flows = {
                "flow/user/user_insert.xml",
                "flow/user/user_select.xml",
                "flow/user/user_select_by_id.xml",
                "flow/user/user_select_by_cond.xml",
                "flow/user/user_select_by_name.xml",
                "flow/user/user_update_by_cond.xml",
                "flow/user/user_update.xml",