流程

hx-common/common-flow/pom.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hx-common</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>common-flow</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>common-flow-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

hx-common/common-flow/src/main/java/com/fjhx/HxFlowApplication.java

@@ -1,25 +0,0 @@
-package com.fjhx;
-
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.core.cloud.feign.EnableBladeFeign;
-import org.springblade.core.launch.BladeApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * 仓管模块启动器
- */
-@EnableAsync
-@EnableBladeFeign
-@EnableDiscoveryClient
-@EnableCircuitBreaker
-@SpringBootApplication
-public class HxFlowApplication {
-
-    public static void main(String[] args) {
-        BladeApplication.run(ApiConstant.APP_NAME.FLOW_APP_NAME, HxFlowApplication.class, args);
-    }
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowApplycheckController.java

@@ -1,120 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.controller;
-
-import com.fjhx.flow.service.IFlowApplycheckService;
-import com.fjhx.myapp.application.entity.FlowApplycheck;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程审批 控制器
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flowapplycheck")
-public class FlowApplycheckController extends BladeController {
-
-    private final IFlowApplycheckService flowApplycheckService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<FlowApplycheck> detail(FlowApplycheck flowApplycheck) {
-        FlowApplycheck detail = flowApplycheckService.getOne(Condition.getQueryWrapper(flowApplycheck));
-        return R.data(detail);
-    }
-
-
-    /**
-     * 新增 流程审批
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody FlowApplycheck flowApplycheck) {
-        flowApplycheck.setCreatedTime(new Date());
-        return R.status(flowApplycheckService.save(flowApplycheck));
-    }
-
-    /**
-     * 修改 流程审批
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody FlowApplycheck flowApplycheck) {
-        flowApplycheck.setUpdatedTime(new Date());
-        return R.status(flowApplycheckService.updateById(flowApplycheck));
-    }
-
-    /**
-     * 新增或修改 流程审批
-     */
-    @PostMapping("/submit")
-    public R submit(@Valid @RequestBody FlowApplycheck flowApplycheck) {
-        return R.status(flowApplycheckService.saveOrUpdate(flowApplycheck));
-    }
-
-
-    /**
-     * 删除 流程审批
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(flowApplycheckService.removeByIds(Func.toLongList(ids)));
-    }
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        List<FlowApplycheck> result = flowApplycheckService.getList(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition) {
-        ListPageMap.getListPageMap(condition);
-        Integer count = flowApplycheckService.getListCount(condition);
-        return R.success(count);
-    }
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowController.java

@@ -1,111 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.controller;
-
-import com.fjhx.flow.service.IFlowEngineService;
-import com.fjhx.flow.service.IFlowService;
-import com.fjhx.myapp.application.entity.Flow;
-import com.fjhx.myapp.application.entity.FlowParam;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Date;
-
-/**
- * 模型表 控制器
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flow")
-public class FlowController extends BladeController {
-
-    private final IFlowService flowService;
-
-    private final IFlowEngineService iFlowEngineService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<Flow> detail(Flow flow) {
-        Flow detail = flowService.getOne(Condition.getQueryWrapper(flow));
-        return R.data(detail);
-    }
-
-
-    /**
-     * 新增 模型表
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody Flow flow) {
-        flow.setCreatedTime(new Date());
-        return R.status(flowService.save(flow));
-    }
-
-    /**
-     * 修改 模型表
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody Flow flow) {
-        flow.setUpdatedTime(new Date());
-        return R.status(flowService.updateById(flow));
-    }
-
-
-    /**
-     * 删除 模型表
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(flowService.removeByIds(Func.toLongList(ids)));
-    }
-
-    /**
-     * 删除 模型表
-     */
-    @PostMapping("/start")
-    public R start(@RequestBody FlowParam param) {
-        return R.status(iFlowEngineService.startFlow(param));
-    }
-
-    /**
-     * 删除 模型表
-     */
-    @PostMapping("/examineFlow")
-    public R examineFlow(@RequestBody FlowParam param) {
-        return R.status(iFlowEngineService.examineFlow(param));
-    }
-
-    /**
-     * 删除 模型表
-     */
-    @PostMapping("/rejectFlow")
-    public R rejectFlow(@RequestBody FlowParam param) {
-        return R.status(iFlowEngineService.rejectFlow(param));
-    }
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java

@@ -1,85 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.controller;
-
-import com.fjhx.flow.service.IFlowNodeService;
-import com.fjhx.myapp.application.entity.FlowNode;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Date;
-
-/**
- * 流程节点表 控制器
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flownode")
-@Api(value = "流程节点表", tags = "流程节点表接口")
-public class FlowNodeController extends BladeController {
-
-    private final IFlowNodeService flowNodeService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<FlowNode> detail(FlowNode flowNode) {
-        FlowNode detail = flowNodeService.getOne(Condition.getQueryWrapper(flowNode));
-        return R.data(detail);
-    }
-
-
-    /**
-     * 新增 流程节点表
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody FlowNode flowNode) {
-        flowNode.setCreatedTime(new Date());
-        return R.status(flowNodeService.save(flowNode));
-    }
-
-    /**
-     * 修改 流程节点表
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody FlowNode flowNode) {
-        flowNode.setUpdatedTime(new Date());
-        return R.status(flowNodeService.updateById(flowNode));
-    }
-
-    /**
-     * 删除 流程节点表
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(flowNodeService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodelineController.java

@@ -1,94 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.controller;
-
-import com.fjhx.flow.service.IFlowNodelineService;
-import com.fjhx.myapp.application.entity.FlowNodeline;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Date;
-
-/**
- * 流程节点连线 控制器
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flownodeline")
-@Api(value = "流程节点连线", tags = "流程节点连线接口")
-public class FlowNodelineController extends BladeController {
-
-    private final IFlowNodelineService flowNodelineService;
-
-    /**
-     * 详情
-     */
-    @GetMapping("/detail")
-    public R<FlowNodeline> detail(FlowNodeline flowNodeline) {
-        FlowNodeline detail = flowNodelineService.getOne(Condition.getQueryWrapper(flowNodeline));
-        return R.data(detail);
-    }
-
-
-    /**
-     * 新增 流程节点连线
-     */
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody FlowNodeline flowNodeline) {
-        flowNodeline.setCreatedTime(new Date());
-        return R.status(flowNodelineService.save(flowNodeline));
-    }
-
-    /**
-     * 修改 流程节点连线
-     */
-    @PostMapping("/update")
-    public R update(@Valid @RequestBody FlowNodeline flowNodeline) {
-        flowNodeline.setUpdatedTime(new Date());
-        return R.status(flowNodelineService.updateById(flowNodeline));
-    }
-
-    /**
-     * 新增或修改 流程节点连线
-     */
-    @PostMapping("/submit")
-    public R submit(@Valid @RequestBody FlowNodeline flowNodeline) {
-        return R.status(flowNodelineService.saveOrUpdate(flowNodeline));
-    }
-
-
-    /**
-     * 删除 流程节点连线
-     */
-    @PostMapping("/remove")
-    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(flowNodelineService.removeByIds(Func.toLongList(ids)));
-    }
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/feign/FlowApi.java

@@ -1,55 +0,0 @@
-package com.fjhx.flow.feign;
-
-import com.fjhx.flow.service.IFlowEngineService;
-import com.fjhx.myapp.application.entity.FlowParam;
-import com.fjhx.myapp.application.feign.IFlowApi;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 流程 feign api
- */
-@RestController
-public class FlowApi implements IFlowApi {
-
-    @Autowired
-    private IFlowEngineService flowEngineService;
-
-
-    /**
-     * 开始流程
-     *
-     * @param param
-     */
-    @PostMapping(startFlow)
-    @Override
-    public Boolean startFlow(@RequestBody FlowParam param) {
-        return flowEngineService.startFlow(param);
-    }
-
-    /**
-     * 审批流程
-     *
-     * @param param
-     * @return
-     */
-    @PostMapping(examineFlow)
-    @Override
-    public Boolean examineFlow(@RequestBody FlowParam param) {
-        return flowEngineService.examineFlow(param);
-    }
-
-    /**
-     * 驳回流程
-     *
-     * @param param
-     * @return
-     */
-    @PostMapping(rejectFlow)
-    @Override
-    public Boolean rejectFlow(@RequestBody FlowParam param) {
-        return flowEngineService.rejectFlow(param);
-    }
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.java

@@ -1,49 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.myapp.application.entity.FlowApplycheck;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程审批 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface FlowApplycheckMapper extends BaseMapper<FlowApplycheck> {
-
-    /**
-     * 列表
-     *
-     * @param condition
-     * @return
-     */
-    List<FlowApplycheck> getTaskList(Map<String, Object> condition);
-
-    /**
-     * 列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getTaskListCount(Map<String, Object> condition);
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.flow.mapper.FlowApplycheckMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="flowApplycheckResultMap" type="com.fjhx.myapp.application.entity.FlowApplycheck">
-        <id column="ID" property="id"/>
-        <result column="is_delete" property="isDelete"/>
-        <result column="CreatedTime" property="createdTime"/>
-        <result column="UpdatedTime" property="updatedTime"/>
-        <result column="flow_id" property="flowId"/>
-        <result column="node_id" property="nodeId"/>
-        <result column="pre_node_id" property="preNodeId"/>
-        <result column="next_node_id" property="nextNodeId"/>
-        <result column="check_user_id" property="checkUserId"/>
-        <result column="check_state" property="checkState"/>
-        <result column="check_time" property="checkTime"/>
-        <result column="suggestions" property="suggestions"/>
-        <result column="link_id" property="linkId"/>
-        <result column="approval_item" property="approvalItem"/>
-    </resultMap>
-
-    <select id="getTaskList" resultMap="flowApplycheckResultMap">
-        SELECT
-            t1.*,
-            t2.flow_name AS flowName,
-            t3.node_name AS nodeName,
-            t4.`name` AS userName
-        FROM
-            act_flow_applycheck t1
-        LEFT JOIN act_flow t2 ON t1.flow_id = t2.ID
-        LEFT JOIN act_flow_node t3 ON t1.node_id = t3.id
-        LEFT JOIN blade_user t4 ON t1.check_user_id = t4.id
-        <include refid="list_condition"/>
-        ORDER BY t1.CreatedTime DESC
-        <include refid="sql_limit"/>
-    </select>
-    <select id="getTaskListCount" resultType="java.lang.Integer">
-        SELECT
-            count (1)
-        FROM
-        act_flow_applycheck t1
-        LEFT JOIN act_flow t2 ON t1.flow_id = t2.ID
-        LEFT JOIN act_flow_node t3 ON t1.node_id = t3.id
-        LEFT JOIN blade_user t4 ON t1.check_user_id = t4.id
-        <include refid="list_condition"/>
-    </select>
-<!--    AND t3.role_key = #{}-->
-    <sql id="list_condition">
-        <where>
-            t1.check_state = 1
-        </where>
-    </sql>
-    <sql id="sql_limit">
-        <if test="start != null and end != null">
-            LIMIT #{start},#{end}
-        </if>
-    </sql>
-</mapper>

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.java

@@ -1,31 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.myapp.application.entity.Flow;
-
-/**
- * 业务附件表 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface FlowMapper extends BaseMapper<Flow> {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.flow.mapper.FlowMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="flowResultMap" type="com.fjhx.myapp.application.entity.Flow">
-        <id column="id" property="id"/>
-        <result column="flow_name" property="flowName"/>
-        <result column="flow_identifying" property="flowIdentifying"/>
-        <result column="start_node_id" property="startNodeId"/>
-        <result column="end_node_id" property="endNodeId"/>
-        <result column="model_name" property="modelName"/>
-        <result column="deal_with_type" property="dealWithType"/>
-        <result column="CreatedTime" property="createdTime"/>
-        <result column="UpdatedTime" property="updatedTime"/>
-    </resultMap>
-
-</mapper>

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.java

@@ -1,31 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.myapp.application.entity.FlowNode;
-
-/**
- * 流程节点表 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface FlowNodeMapper extends BaseMapper<FlowNode> {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.flow.mapper.FlowNodeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="flowNodeResultMap" type="com.fjhx.myapp.application.entity.FlowNode">
-        <id column="ID" property="id"/>
-        <result column="IsDelete" property="isdelete"/>
-        <result column="CreatedTime" property="createdTime"/>
-        <result column="UpdatedTime" property="updatedTime"/>
-        <result column="flow_id" property="flowId"/>
-        <result column="node_name" property="nodeName"/>
-        <result column="back_node_id" property="backNodeId"/>
-        <result column="role_key" property="roleKey"/>
-    </resultMap>
-</mapper>

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.java

@@ -1,31 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.myapp.application.entity.FlowNodeline;
-
-/**
- * 流程节点连线 Mapper 接口
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface FlowNodelineMapper extends BaseMapper<FlowNodeline> {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.flow.mapper.FlowNodelineMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="flowNodelineResultMap" type="com.fjhx.myapp.application.entity.FlowNodeline">
-        <id column="ID" property="id"/>
-        <result column="IsDelete" property="isdelete"/>
-        <result column="CreatedTime" property="createdTime"/>
-        <result column="UpdatedTime" property="updatedTime"/>
-        <result column="flow_id" property="flowId"/>
-        <result column="to_node_id" property="toNodeId"/>
-        <result column="from_node_id" property="fromNodeId"/>
-        <result column="condition_type" property="conditionType"/>
-        <result column="condition_value" property="conditionValue"/>
-        <result column="condition_key" property="conditionKey"/>
-    </resultMap>
-
-</mapper>

hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowApplycheckService.java

@@ -1,56 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.FlowApplycheck;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程审批 服务类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface IFlowApplycheckService extends IService<FlowApplycheck> {
-
-    /**
-     * 代办列表
-     *
-     * @param condition
-     * @return
-     */
-    List<FlowApplycheck> getList(Map<String, Object> condition);
-
-    /**
-     * 代办列表-总条数
-     *
-     * @param condition
-     * @return
-     */
-    Integer getListCount(Map<String, Object> condition);
-
-    /**
-     * 获取流程
-     *
-     * @param businessId
-     * @return
-     */
-    List<FlowApplycheck> FlowDetail(String businessId);
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowEngineService.java

@@ -1,51 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.Flow;
-import com.fjhx.myapp.application.entity.FlowParam;
-
-/**
- * 流程实现 服务类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface IFlowEngineService extends IService<Flow> {
-
-    /**
-     * 发起流程
-     *
-     * @return
-     */
-    Boolean startFlow(FlowParam param);
-
-    /**
-     * 审批流程
-     *
-     * @return
-     */
-    Boolean examineFlow(FlowParam param);
-
-    /**
-     * 驳回流程
-     *
-     * @return
-     */
-    Boolean rejectFlow(FlowParam param);
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodeService.java

@@ -1,31 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.FlowNode;
-
-/**
- * 流程节点表 服务类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface IFlowNodeService extends IService<FlowNode> {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodelineService.java

@@ -1,31 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.FlowNodeline;
-
-/**
- * 流程节点连线 服务类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface IFlowNodelineService extends IService<FlowNodeline> {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowService.java

@@ -1,30 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.myapp.application.entity.Flow;
-
-/**
- * 业务附件表 服务类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-public interface IFlowService extends IService<Flow> {
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowApplycheckServiceImpl.java

@@ -1,69 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.flow.mapper.FlowApplycheckMapper;
-import com.fjhx.flow.service.IFlowApplycheckService;
-import com.fjhx.myapp.application.entity.FlowApplycheck;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程审批 服务实现类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Service
-public class FlowApplycheckServiceImpl extends ServiceImpl<FlowApplycheckMapper, FlowApplycheck> implements IFlowApplycheckService {
-
-    /**
-     * 代办列表
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public List<FlowApplycheck> getList(Map<String, Object> condition) {
-        return baseMapper.getTaskList(condition);
-    }
-
-    /**
-     * 代办列表条数
-     *
-     * @param condition
-     * @return
-     */
-    @Override
-    public Integer getListCount(Map<String, Object> condition) {
-        return baseMapper.getTaskListCount(condition);
-    }
-
-    /**
-     * 获取流程
-     *
-     * @param businessId
-     * @return
-     */
-    @Override
-    public List<FlowApplycheck> FlowDetail(String businessId) {
-        return null;
-    }
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowEngineServiceImpl.java

@@ -1,221 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.flow.mapper.FlowMapper;
-import com.fjhx.flow.service.IFlowApplycheckService;
-import com.fjhx.flow.service.IFlowEngineService;
-import com.fjhx.flow.service.IFlowNodeService;
-import com.fjhx.flow.service.IFlowNodelineService;
-import com.fjhx.myapp.application.entity.*;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 业务附件表 服务实现类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Service
-public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> implements IFlowEngineService {
-
-    @Autowired
-    private IFlowNodeService iFlowNodeService;
-
-    @Autowired
-    private IFlowNodelineService iFlowNodelineService;
-
-    @Autowired
-    private IFlowApplycheckService iFlowApplycheckService;
-
-    /**
-     * 发起流程
-     *
-     * @param param
-     * @return true 发起成功
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean startFlow(FlowParam param) {
-        if (StringUtil.isEmpty(param.getFlowIdentifying())) {
-            throw new ServiceException("流程标识不能为空");
-        }
-        //根据流程标识查询流程模型
-        Flow flow = this.getOne(Wrappers.<Flow>query().lambda().eq(Flow::getFlowIdentifying, param.getFlowIdentifying()));
-        if (ObjectUtil.isEmpty(flow)) {
-            throw new ServiceException("模型不存在");
-        }
-        //查询出发起节点
-        FlowNodeline flowNodeline = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFlowId, flow.getId()).eq(FlowNodeline::getFromNodeId, ""));
-        //根据上一个节点查询出下一个节点
-        FlowNodeline flowNodelineNext = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFromNodeId, flowNodeline.getToNodeId()));
-        //根据发起节点查询下一个节点
-        FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId, flowNodeline.getToNodeId()));
-        //生成节点走向数据
-        List<FlowApplycheck> saveBatch = new ArrayList<>();
-        //生成发起节点走向
-        saveBatch.add(setFlowApplyCheck(flowNodeline.getFlowId(), "", "",
-                flowNodeline.getToNodeId(), "", 0, new Date(), "",
-                param.getBusinessId(), ""));
-        //生成审批节点走向
-        saveBatch.add(setFlowApplyCheck(flowNode.getFlowId(), flowNode.getId(), flowNode.getBackNodeId(),
-                flowNodelineNext.getToNodeId(), "", 1, null, null,
-                param.getBusinessId(), param.getTitle()));
-        iFlowApplycheckService.saveBatch(saveBatch);
-        //消息通知,根据角色查询用户，通知所有拥有这个角色的人
-        String roleId = flowNode.getRoleKey();
-        return true;
-    }
-
-    /**
-     * 审批
-     *
-     * @param param
-     * @return true流程已结束  false还有下一个节点
-     */
-    @Override
-    public Boolean examineFlow(FlowParam param) {
-        if (StringUtil.isEmpty(param.getProInstantsId())) {
-            throw new ServiceException("流程ID不能为空");
-        }
-        //通过流程ID查询出走向数据
-        FlowApplycheck flowApplycheck = iFlowApplycheckService.getById(param.getProInstantsId());
-        if (flowApplycheck.getCheckState() != 1) {
-            throw new ServiceException("该流程已处理完毕");
-        }
-        updateApplyCheck(param, 2);
-        //如果下一个节点是空的，流程已结束
-        if (StringUtil.isEmpty(flowApplycheck.getNextNodeId())) {
-            return true;
-        }
-        //查询出当前节点连接
-        FlowNodeline flowNodelineNext = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFromNodeId, flowApplycheck.getNextNodeId()));
-        //查询出下一个节点基础信息
-        FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId, flowApplycheck.getNextNodeId()));
-        //生成审批节点走向
-        iFlowApplycheckService.save(setFlowApplyCheck(flowNodelineNext.getFlowId(), flowApplycheck.getNextNodeId(), flowApplycheck.getNodeId(),
-                flowNodelineNext.getToNodeId(), "", 1, null, null,
-                param.getBusinessId(), param.getTitle()));
-        //消息通知,根据角色查询用户，通知所有拥有这个角色的人
-        String roleId = flowNode.getRoleKey();
-        return false;
-    }
-
-    /**
-     * 驳回流程
-     *
-     * @param param
-     * @return
-     */
-    @Override
-    public Boolean rejectFlow(FlowParam param) {
-        if (StringUtil.isEmpty(param.getProInstantsId())) {
-            throw new ServiceException("流程ID不能为空");
-        }
-        //通过流程ID查询出走向数据
-        FlowApplycheck flowApplycheck = iFlowApplycheckService.getById(param.getProInstantsId());
-        updateApplyCheck(param, 3);
-        //如果上一个节点是空的或者上一个节点是发起，流程也结束
-        FlowNode checkFlowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId, flowApplycheck.getPreNodeId()));
-        if (StringUtil.isEmpty(flowApplycheck.getPreNodeId()) ||
-                StringUtil.isEmpty(checkFlowNode.getBackNodeId())) {
-            return true;
-        }
-        //查询出当前节点连接
-        FlowNodeline flowNodeline = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFromNodeId, flowApplycheck.getPreNodeId()));
-        //查询出上一个节点基础信息
-        FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId, flowNodeline.getFromNodeId()));
-        //生成审批节点走向
-        iFlowApplycheckService.save(setFlowApplyCheck(flowNode.getFlowId(), flowNode.getId(), flowNode.getBackNodeId(),
-                flowNodeline.getToNodeId(), "", 1, null, null,
-                param.getBusinessId(), param.getTitle()));
-        //消息通知,根据角色查询用户，通知所有拥有这个角色的人
-        String roleId = flowNode.getRoleKey();
-        return false;
-    }
-
-    /**
-     * 设置属性
-     *
-     * @param flowId
-     * @param nodeId
-     * @param preNodeId
-     * @param nextNodeId
-     * @param checkUserId
-     * @param checkState
-     * @param checkTime
-     * @param suggestions
-     * @param linkId
-     * @param approvalItem
-     * @return
-     */
-    public FlowApplycheck setFlowApplyCheck(String flowId, String nodeId, String preNodeId, String nextNodeId,
-                                            String checkUserId, int checkState, Date checkTime, String suggestions, String linkId, String approvalItem) {
-        FlowApplycheck flowApplycheck = new FlowApplycheck();
-        flowApplycheck.setCreatedTime(new Date());
-        flowApplycheck.setFlowId(flowId);
-        flowApplycheck.setNodeId(nodeId);
-        flowApplycheck.setPreNodeId(preNodeId);
-        flowApplycheck.setNextNodeId(nextNodeId);
-        flowApplycheck.setCheckUserId(checkUserId);
-        flowApplycheck.setCheckTime(checkTime);
-        flowApplycheck.setCheckState(checkState);
-        flowApplycheck.setSuggestions(suggestions);
-        flowApplycheck.setLinkId(linkId);
-        flowApplycheck.setApprovalItem(approvalItem);
-        return flowApplycheck;
-    }
-
-    /**
-     * 修改
-     *
-     * @param param
-     * @param state
-     */
-    public void updateApplyCheck(FlowParam param, int state) {
-        //修改流程标识为已审批
-        FlowApplycheck update = new FlowApplycheck();
-        update.setId(param.getProInstantsId());
-        update.setUpdatedTime(new Date());
-        update.setCheckUserId(AuthUtil.getUserIdStr());
-        update.setCheckState(state);
-        update.setCheckTime(new Date());
-        update.setSuggestions(param.getCommon());
-        update.setApprovalItem(param.getTitle());
-        iFlowApplycheckService.updateById(update);
-    }
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodeServiceImpl.java

@@ -1,35 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.flow.mapper.FlowNodeMapper;
-import com.fjhx.flow.service.IFlowNodeService;
-import com.fjhx.myapp.application.entity.FlowNode;
-import org.springframework.stereotype.Service;
-
-/**
- * 流程节点表 服务实现类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Service
-public class FlowNodeServiceImpl extends ServiceImpl<FlowNodeMapper, FlowNode> implements IFlowNodeService {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodelineServiceImpl.java

@@ -1,35 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.flow.mapper.FlowNodelineMapper;
-import com.fjhx.flow.service.IFlowNodelineService;
-import com.fjhx.myapp.application.entity.FlowNodeline;
-import org.springframework.stereotype.Service;
-
-/**
- * 流程节点连线 服务实现类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Service
-public class FlowNodelineServiceImpl extends ServiceImpl<FlowNodelineMapper, FlowNodeline> implements IFlowNodelineService {
-
-
-}

hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowServiceImpl.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.flow.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.flow.mapper.FlowMapper;
-import com.fjhx.flow.service.IFlowService;
-import com.fjhx.myapp.application.entity.Flow;
-import org.springframework.stereotype.Service;
-
-/**
- * 业务附件表 服务实现类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Service
-public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements IFlowService {
-
-}

hx-common/common-flow/src/main/resources/application-dev.yml

@@ -1,13 +0,0 @@
-# 服务器端口
-server:
-  port: 8304
-logging:
-  level:
-    org.springframework.data.mongodb.core: DEBUG
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.flow.dev.url}
-    username: ${blade.datasource.flow.dev.username}
-    password: ${blade.datasource.flow.dev.password}

hx-common/common-flow/src/main/resources/application-prod.yml

@@ -1,11 +0,0 @@
-# 服务器端口
-server:
-  port: 8304
-
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.flow.prod.url}
-    username: ${blade.datasource.flow.prod.username}
-    password: ${blade.datasource.flow.prod.password}

hx-common/common-flow/src/main/resources/application-test.yml

@@ -1,11 +0,0 @@
-# 服务器端口
-server:
-  port: 8304
-
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.flow.test.url}
-    username: ${blade.datasource.flow.test.username}
-    password: ${blade.datasource.flow.test.password}

hx-common/pom.xml

@@ -16,7 +16,6 @@
         <module>code-generator</module>
         <module>common-client-util</module>
         <module>service-file</module>
-        <module>common-flow</module>
         <module>common-rocketmq</module>
         <module>common-socket</module>
         <module>common-tool</module>

hx-common/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.service.example.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
+import com.fjhx.constants.FlowConstant;
 import com.fjhx.entity.example.ExampleDetails;
 import com.fjhx.entity.example.ExampleInfo;
 import com.fjhx.entity.process.ProcessNode;
@@ -83,7 +84,14 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
             for (Map<String, Object> map : result) {
 
                 // 赋值节点名称
-                String nodeName = processNodeMap.get((Long) map.get("nodeId")).getName();
+                ProcessNode processNode = processNodeMap.get((Long) map.get("nodeId"));
+                String nodeName;
+                if (processNode != null) {
+                    nodeName = processNode.getName();
+                } else {
+                    nodeName = FlowConstant.END_NAME;
+                }
+
                 map.put("nodeName", nodeName);
 
                 // 处理类型名称
@@ -120,6 +128,7 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
                 }).collect(Collectors.toList());
 
                 item.put("buttonList", collect);
+
                 result.add(item);
 
                 List<ProcessNode> nextProcessNodes = parentProcessNodeMap.get(nextNode.getId());

hx-service-api/common-flow-api/pom.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hx-service-api</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>common-flow-api</artifactId>
-
-</project>

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java

@@ -1,74 +0,0 @@
-package com.fjhx.myapp.application.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 业务附件表实体类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Data
-@TableName("act_flow")
-public class Flow implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date CreatedTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("UpdatedTime")
-    private Date UpdatedTime;
-
-    /**
-     * 流程名称
-     */
-    @ApiModelProperty(value = "流程名称")
-    private String flowName;
-    /**
-     * 流程标识
-     */
-    @ApiModelProperty(value = "流程标识")
-    private String flowIdentifying;
-    /**
-     * 开始节点
-     */
-    @ApiModelProperty(value = "开始节点")
-    private String startNodeId;
-    /**
-     * 结束节点
-     */
-    @ApiModelProperty(value = "结束节点")
-    private String endNodeId;
-    /**
-     * Model表名称
-     */
-    @ApiModelProperty(value = "Model表名称")
-    private String modelName;
-    /**
-     * 待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
-     */
-    @ApiModelProperty(value = "待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）")
-    private Integer dealWithType;
-
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowApplycheck.java

@@ -1,133 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.myapp.application.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 流程审批实体类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Data
-@TableName("act_flow_applycheck")
-public class FlowApplycheck implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date CreatedTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("UpdatedTime")
-    private Date UpdatedTime;
-
-    /**
-     * 软删除
-     */
-    @ApiModelProperty(value = "软删除")
-    private Boolean isDelete;
-
-    /**
-     * 流程编号
-     */
-    @ApiModelProperty(value = "流程编号")
-    private String flowId;
-    /**
-     * 当前节点
-     */
-    @ApiModelProperty(value = "当前节点")
-    private String nodeId;
-    /**
-     * 上个节点
-     */
-    @ApiModelProperty(value = "上个节点")
-    private String preNodeId;
-    /**
-     * 下个节点
-     */
-    @ApiModelProperty(value = "下个节点")
-    private String nextNodeId;
-    /**
-     * 审批人
-     */
-    @ApiModelProperty(value = "审批人")
-    private String checkUserId;
-    /**
-     * 审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）
-     */
-    @ApiModelProperty(value = "审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）")
-    private Integer checkState;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    private Date checkTime;
-    /**
-     * 意见
-     */
-    @ApiModelProperty(value = "意见")
-    private String suggestions;
-    /**
-     * 关联编号
-     */
-    @ApiModelProperty(value = "关联编号")
-    private String linkId;
-    /**
-     * 审批事项
-     */
-    @ApiModelProperty(value = "审批事项")
-    private String approvalItem;
-
-    /**
-     * 模型名称
-     */
-    @TableField(exist = false)
-    private String flowName;
-
-    /**
-     * 节点名称
-     */
-    @TableField(exist = false)
-    private String nodeName;
-
-    /**
-     * 处理人名称
-     */
-    @TableField(exist = false)
-    private String userName;
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNode.java

@@ -1,88 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.myapp.application.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 流程节点表实体类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Data
-@TableName("act_flow_node")
-public class FlowNode implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date CreatedTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("UpdatedTime")
-    private Date UpdatedTime;
-
-    /**
-     * 软删除
-     */
-    @ApiModelProperty(value = "软删除")
-    @TableField("IsDelete")
-    private Boolean isdelete;
-
-    /**
-     * 流程编号
-     */
-    @ApiModelProperty(value = "流程编号")
-    private String flowId;
-    /**
-     * 节点名称
-     */
-    @ApiModelProperty(value = "节点名称")
-    private String nodeName;
-    /**
-     * 驳回节点
-     */
-    @ApiModelProperty(value = "驳回节点")
-    private String backNodeId;
-    /**
-     * 审核人角色
-     */
-    @ApiModelProperty(value = "审核人角色")
-    private String roleKey;
-
-
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNodeline.java

@@ -1,97 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.myapp.application.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 流程节点连线实体类
- *
- * @author BladeX
- * @since 2022-07-20
- */
-@Data
-@TableName("act_flow_nodeline")
-public class FlowNodeline implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date CreatedTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("UpdatedTime")
-    private Date UpdatedTime;
-
-    /**
-     * 软删除
-     */
-    @ApiModelProperty(value = "软删除")
-    @TableField("IsDelete")
-    private Boolean isdelete;
-    /**
-     * 流程编号
-     */
-    @ApiModelProperty(value = "流程编号")
-    private String flowId;
-    /**
-     * 到哪个节点
-     */
-    @ApiModelProperty(value = "到哪个节点")
-    private String toNodeId;
-    /**
-     * 从哪个节点
-     */
-    @ApiModelProperty(value = "从哪个节点")
-    private String fromNodeId;
-    /**
-     * 条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）
-     */
-    @ApiModelProperty(value = "条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）")
-    private Integer conditionType;
-    /**
-     * 条件值
-     */
-    @ApiModelProperty(value = "条件值")
-    private String conditionValue;
-    /**
-     * 条件字段
-     */
-    @ApiModelProperty(value = "条件字段")
-    private String conditionKey;
-
-
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowParam.java

@@ -1,47 +0,0 @@
-package com.fjhx.myapp.application.entity;
-
-import lombok.Data;
-
-/**
- * @Author:caozj
- * @DATE:2022/7/20 11:39
- */
-@Data
-public class FlowParam {
-
-    /**
-     * 消息标题
-     */
-    private String title;
-
-    /**
-     * 业务ID
-     */
-    private String businessId;
-
-    /**
-     * 流程标识
-     */
-    private String flowIdentifying;
-
-    /**
-     * 审批意见
-     */
-    private String common;
-
-    /**
-     * 流程ID
-     */
-    private String proInstantsId;
-
-    public FlowParam(){
-
-    }
-    public FlowParam(String title,String common,String proInstantsId,String flowIdentifying,String businessId){
-        this.title = title;
-        this.common = common;
-        this.proInstantsId = proInstantsId;
-        this.flowIdentifying = flowIdentifying;
-        this.businessId = businessId;
-    }
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/enums/FlowTypeEnum.java

@@ -1,67 +0,0 @@
-package com.fjhx.myapp.application.enums;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 流程标识
- * 待办类型 （枚举定义：
- * 0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
- */
-public enum FlowTypeEnum {
-
-    type_1(0, "subscribe"),
-    type_2(1, "contract");
-
-    private int key;
-
-    private String value;
-
-    private static Map<Integer, String> map = new HashMap<>();
-
-    FlowTypeEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static Map<Integer, String> getMap() {
-        if (ObjectUtil.isNotEmpty(map)) {
-            return map;
-        }
-        for (FlowTypeEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return StringPool.EMPTY;
-        }
-        Map<Integer, String> map = getMap();
-        return map.getOrDefault(key, StringPool.EMPTY);
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/feign/IFlowApi.java

@@ -1,44 +0,0 @@
-package com.fjhx.myapp.application.feign;
-
-import com.fjhx.myapp.application.entity.FlowParam;
-import org.springblade.common.constant.ApiConstant;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 流程API
- */
-@FeignClient(value = ApiConstant.APP_NAME.FLOW_APP_NAME)
-public interface IFlowApi {
-
-    String API_URL_PREFIX = ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/api";
-    String startFlow = API_URL_PREFIX + "/startFlow";
-    String examineFlow = API_URL_PREFIX + "/examineFlow";
-    String rejectFlow = API_URL_PREFIX + "/rejectFlow";
-
-    /**
-     * 发起流程
-     *
-     * @param param
-     */
-    @PostMapping(startFlow)
-    Boolean startFlow(@RequestBody FlowParam param);
-
-    /**
-     * 审批流程
-     *
-     * @param param
-     */
-    @PostMapping(examineFlow)
-    Boolean examineFlow(@RequestBody FlowParam param);
-
-    /**
-     * 驳回流程
-     *
-     * @param param
-     */
-    @PostMapping(rejectFlow)
-    Boolean rejectFlow(@RequestBody FlowParam param);
-
-}

hx-service-api/pom.xml

@@ -23,7 +23,6 @@
 
     <modules>
         <module>service-file-api</module>
-        <module>common-flow-api</module>
         <module>common-rocketmq-api</module>
         <module>service-video-api</module>
         <module>syringe-management-api</module>

hx-service/storage/src/main/java/com/fjhx/applet/service/impl/MaterialReceiveServiceImpl.java

@@ -66,7 +66,7 @@ public class MaterialReceiveServiceImpl extends ServiceImpl<MaterialReceiveMappe
             // 获取openId
             List<String> accountList = repairList.stream()
                     .map(item -> item.get("account").toString()).distinct().collect(Collectors.toList());
-//            new Thread(() -> {
+            new Thread(() -> {
                 Map<String, String> accountMap = userClient.getOpenidByAccount(accountList, "849380");
                 // 发送小程序推送
                 for (String account : accountList) {
@@ -83,7 +83,7 @@ public class MaterialReceiveServiceImpl extends ServiceImpl<MaterialReceiveMappe
                         WxAppletUtil.sendMessage(uniformSendEntity);
                     }
                 }
-//            }).start();
+            }).start();
 
             List<String> idList = repairList.stream().map(item -> item.get("id").toString()).collect(Collectors.toList());
             baseMapper.updateReceive(idList, null, 20, 2, null);