@IPU_REQ_2022@完善服务逻辑流模板

qb-auth-server/pom.xml

@@ -97,6 +97,13 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        
        <!-- https://mvnrepository.com/artifact/org.mvel/mvel2 -->
        <dependency>
            <groupId>org.mvel</groupId>
            <artifactId>mvel2</artifactId>
            <version>2.4.12.Final</version>
        </dependency>
    </dependencies>
    <build>

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

@@ -8,7 +8,7 @@
    </declare>
    <start id="start" name="开始节点" next="insertMenu">
        <var key="menu" model="sec_menu"/>
        <var key="menu" model="sec_menu"  attrExists="false"/>
    </start>
    <action id="insertMenu" name="新增菜单" next="end">

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

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="menu_select"
            name="菜单查询"
            desc="菜单查询">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_menu"/>
    </declare>
    <start id="start" name="开始节点" next="selectMenu">
        <var key="menu" model="sec_menu" attrExists="false"/>
    </start>
    <action id="selectMenu" name="查询用户" next="end">
        <input>
            <var key="menu" />
        </input>
        <behavior model="sec_menu" id="selectMenu"/>
        <output>
            <var key="menu_info"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="menu_info"/>
    </end>
</logic-flow>

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

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="menu_update_by_cond"
            name="菜单修改"
            desc="菜单修改">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_menu"/>
    </declare>
    <start id="start" name="开始节点" next="updateMenuByCond">
        <var key="menu" model="sec_menu" attrExists="false"/>
        <var key="menu_cond" model="sec_menu" attrExists="false"/>
    </start>
    <action id="updateMenuByCond" name="启用用户" next="end">
        <input>
            <var key="menu" />
            <var key="menu_cond" />
        </input>
        <behavior model="sec_menu" id="updateMenuByCond"/>
        <output>
            <var key="update_num"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="update_num"/>
    </end>
</logic-flow>

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

@@ -2,6 +2,7 @@
<model id="sec_menu" name="用户信息模型">
    <attr id="menu_id" type="int" name="菜单标识"/>
    <attr id="parent_menu_id" type="int" name="父菜单标识"/>
    <attr id="sub_count" type="int" name="子菜单数目"/>
    <attr id="menu_type" type="string" name="菜单类型"/>
    <attr id="menu_name" type="string" name="菜单名称"/>
    <attr id="menu_title" type="string" name="菜单标题"/>
@@ -11,11 +12,22 @@
    <attr id="menu_icon" type="string" name="菜单图标"/>
    <attr id="link_url" type="string" name="菜单链接"/>
    <attr id="iframe_flag" type="int" name="框架标记"/>
    <attr id="cache_flag" type="int" name="框架标记"/>
    <attr id="hidden_flag" type="int" name="隐藏标记"/>
    <attr id="data_status" type="string" name="数据状态"/>
    <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="操作人员"/>
    
    <behavior id="insertMenu" name="新增菜单信息">
        <function domain="DB" name="insert">
@@ -35,6 +47,16 @@
        </function>
    </behavior>
    <behavior id="updateMenuByCond" name="根据条件修改菜单信息">
        <function domain="DB" name="updateByCond">
            <param value="auth" type="string"/>
            <param value="sec_menu" type="string"/>
            <param key="menu" type="map"/>
            <param key="menu_cond" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    
    <behavior id="updateMenu" name="修改菜单信息">
        <function domain="DB" name="update">
            <param value="auth" type="string"/>

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

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<model id="sec_role" name="角色信息模型">
    <attr id="ROLE_ID" type="int" name="角色标识"/>
    <attr id="JOB_ID" type="int" name="岗位标识"/>
    <attr id="ROLE_NAME" type="string" name="角色"/>
    <attr id="ROLE_TYPE" type="string" name="角色"/>
    <attr id="ROLE_LEVEL" type="int" name="角色级别 1：低；2：中；3：高；"/>
    <attr id="DESCRIPTION" type="string" name="角色"/>
    <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="角色"/>
    <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="角色"/>
    <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="操作人员"/>
    <behavior id="insertRole" name="新增菜单信息">
        <function domain="DB" name="insert">
            <param value="auth" type="string"/>
            <param value="sec_role" type="string"/>
            <param key="role" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="selectRole" name="查询菜单信息">
        <function domain="DB" name="select">
            <param value="auth" type="string"/>
            <param value="sec_role" type="string"/>
            <param key="role" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="updateRoleByCond" name="根据条件修改菜单信息">
        <function domain="DB" name="updateByCond">
            <param value="auth" type="string"/>
            <param value="sec_role" type="string"/>
            <param key="role" type="map"/>
            <param key="role_cond" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    
    <behavior id="updateRole" name="修改菜单信息">
        <function domain="DB" name="update">
            <param value="auth" type="string"/>
            <param value="sec_role" type="string"/>
            <param key="role" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="deletetRole" name="删除菜单信息">
        <function domain="DB" name="delete">
            <param value="auth" type="string"/>
            <param value="sec_role" type="string"/>
            <param key="role" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
</model>

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

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="dept_org_user_select"
            name="用户详情（用户基本信息，用户组织信息）"
            desc="用户详情（用户基本信息，用户组织信息）">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_user"/>
        <import model="sec_organize"/>
    </declare>
    <start id="start" name="开始节点" next="selectDeptUserByOrgId">
        <var key="organize_id" model="sec_organize" attr="organize_id"/>
    </start>
    <action id="selectDeptUserByOrgId" name="查询部门负责人信息" next="selectDeptOrganizeByOrgId">
        <input>
            <var key="organize_id" model="sec_organize" attr="organize_id"/>
        </input>
        <behavior model="sec_organize" id="selectDeptUserByOrgId"/>
        <output>
            <var key="user_info"/>
        </output>
    </action>
    <action id="selectDeptOrganizeByOrgId" name="查询部门负责人的组织信息" next="end">
        <input>
             <var key="organize_id" model="sec_organize" attr="organize_id"/>
        </input>
        <behavior model="sec_organize" id="selectDeptOrganizeByOrgId"/>
        <output>
            <var key="organize_info"/>
        </output>
    </action>
    
    <end id="end" name="结束节点">
        <var key="organize_info"/>
        <var key="user_info"/>
    </end>
</logic-flow>

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

@@ -58,6 +58,23 @@
		]]>
		</sql>
	</behavior>
	<behavior id="selectUserOrganizeByUserId" name="根据用户的组织信息列表">
		<sql conn="auth">            
		<![CDATA[            
		select b.* from sec_org_user_rel a, sec_organize b 
        where a.ORGANIZE_ID = b.ORGANIZE_ID and b.DATA_STATUS = '1' and USER_ID = #{user_id};
		]]>
		</sql>
	</behavior>
	<behavior id="selectOrgUserRelByOrgId" name="根据组织下用户信息列表">
		<sql conn="auth">            
		<![CDATA[            
		select ORG_USER_REL_ID, ORGANIZE_ID, USER_ID, VALID_DATE, EXPIRE_DATE, DATA_STATUS, CREATE_DATE, CREATE_OP_ID, CREATE_ORG_ID, DONE_CODE, DONE_DATE, OP_ID, ORG_ID, MGMT_DISTRICT, MGMT_COUNTY, REGION_ID, TENANT_CODE            
		from sec_org_user_rel            
		WHERE ORGANIZE_ID = #{organize_id} ;
		]]>
		</sql>
	</behavior>
	<behavior id="deleteOrgUserRelByUserId" name="根据组织下用户信息列表">
		<sql conn="auth">
		<![CDATA[            

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

@@ -35,7 +35,39 @@
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    
    <behavior id="selectOrganizeByName" name="查询组织信息列表">
        <sql conn="auth">
            <![CDATA[
             select * from sec_organize  
             where ( organize_name like "%"#{organize_name}"%" or short_name like "%"#{organize_name}"%") 
             and organize_type in ('0')
             and data_status = '1';
        ]]>
        </sql>
    </behavior>
    <behavior id="selectDeptUserByOrgId" name="根据组织查询部门负责人信息列表">
		<sql conn="auth">            
		<![CDATA[            
		SELECT b.* 
        from sec_organize a, sec_user b 
        where a.dept_leader = b.user_id and organize_id = #{organize_id};
		]]>
		</sql>
	</behavior>
	
	<behavior id="selectDeptOrganizeByOrgId" name="根据组织查询部门负责人的组织信息列表">
		<sql conn="auth">            
		<![CDATA[            
		SELECT a.* 
        from sec_organize a, sec_user b 
        where a.dept_leader = b.user_id and organize_id = #{organize_id};
		]]>
		</sql>
	</behavior>
	
	
    <behavior id="updateOrganize" name="修改组织信息">
        <function domain="DB" name="update">
            <param value="auth" type="string"/>
@@ -54,5 +86,13 @@
        </function>
    </behavior>
    
    <behavior id="updateOrganizeById" name="根据条件修改组织信息">
        <function domain="DB" name="updateByCond">
            <param value="auth" type="string"/>
            <param value="sec_organize" type="string"/>
            <param key="organize" type="map"/>
            <param key="organize_cond" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
</model>

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

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_select_by_org_id"
            name="查询组织下人员信息"
            desc="查询组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="selectOrgUserRel">
        <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>
    </start>
    <action id="selectOrgUserRel" name="查询用户" next="end">
        <input>
            <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>
        </input>
        <behavior model="sec_org_user_rel" id="selectOrgUserRelByOrgId"/>
        <output>
            <var key="org_user_rel_list"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="org_user_rel_list"/>
    </end>
</logic-flow>

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

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="organize_select_by_name"
            name="查询组织列表"
            desc="查询组织列表">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_organize"/>
    </declare>
    <start id="start" name="开始节点" next="selectOrganizeByName">
        <var key="organize_name" model="sec_organize" attr="organize_name"/>
    </start>
    <action id="selectOrganizeByName" name="根据组织名查询组织" next="end">
        <input>
            <var key="organize_name" model="sec_organize" attr="organize_name"/>
        </input>
        <behavior model="sec_organize" id="selectOrganizeByName"/>
        <output>
            <var key="organize_list"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="organize_list"/>
    </end>
</logic-flow>

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

@@ -17,7 +17,7 @@
            <var key="organize" model="sec_organize" attrExists="false"/>
            <var key="organize_cond" model="sec_organize" attrExists="false"/>
        </input>
        <behavior model="sec_organize" id="updateOrganize"/>
        <behavior model="sec_organize" id="updateOrganizeById"/>
        <output>
            <var key="update_num"/>
        </output>

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

@@ -9,13 +9,11 @@
    <start id="start" name="开始节点" next="updateUser">
        <var key="user" model="sec_user" attrExists="false"/>
        <var key="user_cond" model="sec_user" attrExists="false"/>
    </start>
    <action id="updateUser" name="启用用户" next="end">
        <input>
            <var key="user" model="sec_user" attrExists="false"/>
            <var key="user_cond" model="sec_user" attrExists="false"/>
        </input>
        <behavior model="sec_user" id="updateUser"/>
        <output>

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

@@ -26,10 +26,17 @@ public class MenuTest {
        JMap result = null;
        try {
            JMap param = new JsonMap();
            param.put("menu", new JSONObject(createMenu()));
            result = LogicFlowEngine.execute("menu_insert", param, false);
            JMap myMenu = createMenu();
            param.put("menu", new JSONObject(myMenu));
            result = LogicFlowEngine.execute("menu_insert", param);
            System.out.println("执行结果：" + result);
            Assert.assertEquals("新增菜单信息失败!", result.getInt("insert_num"), 1);
            
            JSONObject menu = new JSONObject();
            menu.put("menu_id", myMenu.get("menu_id"));
            param.put("menu", menu);
            result = LogicFlowEngine.execute("menu_select", param);
            System.out.println("执行结果：" + result);
            Assert.assertEquals("新增菜单信息成功!", result.getInt("insert_num"), 1);
        } catch (Exception e) {
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
@@ -41,8 +48,8 @@ public class MenuTest {
        JMap result = null;
        try {
            JMap param = new JsonMap();
            param.put("menu_id", 4);
            result = LogicFlowEngine.execute("menu_delete", param, false);
            param.put("menu_id", 613901);
            result = LogicFlowEngine.execute("menu_delete", param);
            System.out.println("执行结果：" + result);
            Assert.assertEquals("删除菜单信息失败!", result.getInt("delete_num"), 1);
        } catch (Exception e) {
@@ -51,16 +58,62 @@ public class MenuTest {
        }
    }
    @Test
    public void testSelectMenu() {
        JMap param = new JsonMap();
        JSONObject menu = new JSONObject();
        menu.put("menu_id", "613901");
        param.put("menu", menu);
        try{
            JMap result = LogicFlowEngine.execute("menu_select", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testUpdateMenuByCond(){
        String menu_id = "613901";
        JSONObject menu_cond = new JSONObject();
        menu_cond.put("menu_id", menu_id);
        JSONObject menu = new JSONObject();
        menu.put("menu_id", menu_id);
        menu.put("MENU_NAME", "嘉信立恒管理员");
        
        JMap param = new JsonMap();
        param.put("menu_cond", menu_cond);
        param.put("menu", menu);
        try{
            JMap result = LogicFlowEngine.execute("menu_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Before
    public void before() throws IOException {
        String[] models = {
                "flow/menu/model/sec_menu.xml",
                "flow/menu/model/sec_menu.xml"
        		,
                "flow/menu/model/sec_priv_entity.xml"
        };
        LogicFlowUtil.loadLogicModels(models);
        String[] flows = {
                "flow/menu/menu_insert.xml",
                "flow/menu/menu_select.xml",
                "flow/menu/menu_update_by_cond.xml",
                "flow/menu/menu_delete.xml"
        };
@@ -79,7 +132,7 @@ public class MenuTest {
        menuParam.put("menu_sort", "1");
        menuParam.put("menu_component", "md-home");
        menuParam.put("menu_icon", "/sys");
        menuParam.put("link_url", null);
//        menuParam.put("link_url", null);
        menuParam.put("iframe_flag", "0");
        menuParam.put("hidden_flag", "1");
        menuParam.put("data_status", "1");

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

@@ -88,6 +88,22 @@ public class OrgUserRelTest {
    }
    @Test
    public void testSelectUserOrganizeByOrgId() {
        JMap param = new JsonMap();
        param.put("organize_id", 33);
        try{
            JMap result = LogicFlowEngine.execute("org_user_rel_select_by_org_id", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testDeleteOrgUserRelByUserId(){
    	JMap param = new JsonMap();
        param.put("organize_id", 33);
@@ -109,16 +125,18 @@ public class OrgUserRelTest {
    	int org_user_rel_id = 3;
        JSONObject org_user_rel_cond = new JSONObject();
        org_user_rel_cond.put("org_user_rel_id", org_user_rel_id);
        org_user_rel_cond.put("organize_id", 33);
        JMap param = new JsonMap();
        param.put("org_user_rel", org_user_rel_cond);
        JMap result = null;
        try {
            
            //错误信息：执行异常：服务逻辑对象[org_user_rel_delete]节点[deleteOrgUserRel]执行异常，异常信息：[DB]域[delete]函数执行异常(空信息)
            result = LogicFlowEngine.execute("org_user_rel_delete", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        } catch (Exception e) {
            System.out.println("错误信息：" + e.getMessage());
        	e.printStackTrace();
            System.out.println("错误信息：" + e.toString());
            Assert.assertTrue(false);
        }
    }
@@ -139,6 +157,7 @@ public class OrgUserRelTest {
                "flow/org/org_user_rel_select.xml",
                "flow/org/org_user_rel_select_by_cond.xml",
                "flow/org/org_user_rel_combine_select.xml",
                "flow/org/org_user_rel_select_by_org_id.xml",
                "flow/user/user_select_by_id.xml",
                "flow/org/organize_select.xml"
        };

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

@@ -12,6 +12,7 @@ import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.util.List;
/**
 * <p>desc: 组织对象逻辑的测试 </p>
@@ -55,21 +56,48 @@ public class OrganizeTest {
    }
    
    @Test
    public void testUpdateOrganize(){
    public void testSelectOrganizeByName() {
        JMap param = new JsonMap();
        param.put("organize_name", "亚信");
        
        try{
            JMap result = LogicFlowEngine.execute("organize_select_by_name", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue("查询组织列表失败!", ((List)result.get("organize_list")).size()>=1);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testSelectDeptOrganizeById() {
        JMap param = new JsonMap();
        param.put("organize_id", "33");
        
        try{
            JMap result = LogicFlowEngine.execute("dept_org_user_select", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testUpdateOrganizeById(){
    	JSONObject organize_cond = new JSONObject();
    	organize_cond.put("organize_id", "33");        
        JMap param = new JsonMap();
        param.put("organize", organize_cond);
        try{
        	JMap selectResult = LogicFlowEngine.execute("organize_select", param);
        	
            JSONObject organize = JSON.parseObject(JSONObject.toJSONString(selectResult.get("organize_info")));       		
        	JSONObject organize = new JSONObject();
            
            organize.put("dept_full_id", "2");
            organize.put("dept_leader", 2);
            organize.put("done_date", new InitialMethod().getDatetime());
            organize.put("dept_leader", 308075);
            organize.put("op_id", "1");
            
            param.put("organize", organize);
@@ -96,6 +124,8 @@ public class OrganizeTest {
        String[] flows = {
                "flow/org/organize_insert.xml",
                "flow/org/organize_select.xml",
                "flow/org/organize_select_by_name.xml",
                "flow/org/dept_org_user_select.xml",
                "flow/org/organize_update.xml"
        };

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

@@ -229,7 +229,6 @@ public class UserTest {
        user.put("op_id", "1");
        JMap param = new JsonMap();
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update", param);