结构重构

hx-common/hx-flow/pom.xml

@@ -0,0 +1,33 @@
+<?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>hx-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>hx-flow-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,120 @@
+/*
+ *      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/hx-flow/src/main/java/com/fjhx/flow/controller/FlowController.java

@@ -0,0 +1,111 @@
+/*
+ *      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-saas-project/saas-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java → hx-common/hx-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java

@@ -16,21 +16,19 @@
  */
 package com.fjhx.flow.controller;
 
-import com.fjhx.flow.entity.FlowNode;
 import com.fjhx.flow.service.IFlowNodeService;
+import com.fjhx.myapp.application.entity.FlowNode;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
 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 org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 /**
@@ -41,47 +39,47 @@ import java.util.Date;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flownode")
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flownode")
 @Api(value = "流程节点表", tags = "流程节点表接口")
 public class FlowNodeController extends BladeController {
 
-	private final IFlowNodeService flowNodeService;
+    private final IFlowNodeService flowNodeService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<FlowNode> detail(FlowNode flowNode) {
+        FlowNode detail = flowNodeService.getOne(Condition.getQueryWrapper(flowNode));
+        return R.data(detail);
+    }
 
-	/**
-	 * 详情
-	 */
-	@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("/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("/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)));
+    }
 
-	/**
-	 * 删除 流程节点表
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(flowNodeService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

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

@@ -16,20 +16,19 @@
  */
 package com.fjhx.flow.controller;
 
-import com.fjhx.flow.entity.FlowNodeline;
 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 javax.validation.Valid;
-
 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 org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 /**
@@ -40,56 +39,56 @@ import java.util.Date;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX+"/flownodeline")
+@RequestMapping(ApiConstant.Project.SAAS_FLOW_REQUEST_PREFIX + "/flownodeline")
 @Api(value = "流程节点连线", tags = "流程节点连线接口")
 public class FlowNodelineController extends BladeController {
 
-	private final IFlowNodelineService flowNodelineService;
+    private final IFlowNodelineService flowNodelineService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<FlowNodeline> detail(FlowNodeline flowNodeline) {
+        FlowNodeline detail = flowNodelineService.getOne(Condition.getQueryWrapper(flowNodeline));
+        return R.data(detail);
+    }
+
 
-	/**
-	 * 详情
-	 */
-	@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("/save")
-	public R save(@Valid @RequestBody FlowNodeline flowNodeline) {
-		flowNodeline.setCreatedTime(new Date());
-		return R.status(flowNodelineService.save(flowNodeline));
-	}
+    /**
+     * 新增或修改 流程节点连线
+     */
+    @PostMapping("/submit")
+    public R submit(@Valid @RequestBody FlowNodeline flowNodeline) {
+        return R.status(flowNodelineService.saveOrUpdate(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)));
+    }
 
-	
-	/**
-	 * 删除 流程节点连线
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(flowNodelineService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

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

@@ -1,19 +1,16 @@
 package com.fjhx.flow.feign;
 
-import com.fjhx.flow.entity.FlowParam;
 import com.fjhx.flow.service.IFlowEngineService;
+import com.fjhx.myapp.application.entity.FlowParam;
 import com.fjhx.myapp.application.feign.IFlowApi;
-import org.springblade.core.tenant.annotation.NonDS;
 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
  */
-@NonDS
 @RestController
 public class FlowApi implements IFlowApi {
 
@@ -23,6 +20,7 @@ public class FlowApi implements IFlowApi {
 
     /**
      * 开始流程
+     *
      * @param param
      */
     @PostMapping(startFlow)
@@ -33,6 +31,7 @@ public class FlowApi implements IFlowApi {
 
     /**
      * 审批流程
+     *
      * @param param
      * @return
      */
@@ -44,6 +43,7 @@ public class FlowApi implements IFlowApi {
 
     /**
      * 驳回流程
+     *
      * @param param
      * @return
      */

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

@@ -17,9 +17,7 @@
 package com.fjhx.flow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.flow.entity.FlowApplycheck;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.tenant.annotation.TenantIgnore;
+import com.fjhx.myapp.application.entity.FlowApplycheck;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +36,6 @@ public interface FlowApplycheckMapper extends BaseMapper<FlowApplycheck> {
      * @param condition
      * @return
      */
-    @TenantIgnore
     List<FlowApplycheck> getTaskList(Map<String, Object> condition);
 
     /**
@@ -47,7 +44,6 @@ public interface FlowApplycheckMapper extends BaseMapper<FlowApplycheck> {
      * @param condition
      * @return
      */
-    @TenantIgnore
     Integer getTaskListCount(Map<String, Object> condition);
 
 }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.flow.mapper.FlowApplycheckMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="flowApplycheckResultMap" type="com.fjhx.flow.entity.FlowApplycheck">
+    <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"/>

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.mapper;
 
-import com.fjhx.flow.entity.Flow;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.myapp.application.entity.Flow;
 
 /**
  * 业务附件表 Mapper 接口

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.flow.mapper.FlowMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="flowResultMap" type="com.fjhx.flow.entity.Flow">
+    <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"/>

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

@@ -16,9 +16,8 @@
  */
 package com.fjhx.flow.mapper;
 
-import com.fjhx.flow.entity.FlowNode;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fjhx.myapp.application.entity.FlowNode;
 
 /**
  * 流程节点表 Mapper 接口

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.flow.mapper.FlowNodeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="flowNodeResultMap" type="com.fjhx.flow.entity.FlowNode">
+    <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"/>

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.mapper;
 
-import com.fjhx.flow.entity.FlowNodeline;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.myapp.application.entity.FlowNodeline;
 
 /**
  * 流程节点连线 Mapper 接口

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.flow.mapper.FlowNodelineMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="flowNodelineResultMap" type="com.fjhx.flow.entity.FlowNodeline">
+    <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"/>

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.service;
 
-import com.fjhx.flow.entity.FlowApplycheck;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.myapp.application.entity.FlowApplycheck;
 
 import java.util.List;
 import java.util.Map;
@@ -48,6 +48,7 @@ public interface IFlowApplycheckService extends IService<FlowApplycheck> {
 
     /**
      * 获取流程
+     *
      * @param businessId
      * @return
      */

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

@@ -17,8 +17,8 @@
 package com.fjhx.flow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.flow.entity.Flow;
-import com.fjhx.flow.entity.FlowParam;
+import com.fjhx.myapp.application.entity.Flow;
+import com.fjhx.myapp.application.entity.FlowParam;
 
 /**
  * 流程实现 服务类
@@ -30,18 +30,21 @@ public interface IFlowEngineService extends IService<Flow> {
 
     /**
      * 发起流程
+     *
      * @return
      */
     Boolean startFlow(FlowParam param);
 
     /**
      * 审批流程
+     *
      * @return
      */
     Boolean examineFlow(FlowParam param);
 
     /**
      * 驳回流程
+     *
      * @return
      */
     Boolean rejectFlow(FlowParam param);

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.service;
 
-import com.fjhx.flow.entity.FlowNode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.myapp.application.entity.FlowNode;
 
 /**
  * 流程节点表 服务类

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.service;
 
-import com.fjhx.flow.entity.FlowNodeline;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.myapp.application.entity.FlowNodeline;
 
 /**
  * 流程节点连线 服务类

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

@@ -16,8 +16,8 @@
  */
 package com.fjhx.flow.service;
 
-import com.fjhx.flow.entity.Flow;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.myapp.application.entity.Flow;
 
 /**
  * 业务附件表 服务类

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

@@ -16,10 +16,10 @@
  */
 package com.fjhx.flow.service.impl;
 
-import com.fjhx.flow.entity.FlowApplycheck;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.mapper.FlowApplycheckMapper;
 import com.fjhx.flow.service.IFlowApplycheckService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.myapp.application.entity.FlowApplycheck;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -36,6 +36,7 @@ public class FlowApplycheckServiceImpl extends ServiceImpl<FlowApplycheckMapper,
 
     /**
      * 代办列表
+     *
      * @param condition
      * @return
      */
@@ -46,6 +47,7 @@ public class FlowApplycheckServiceImpl extends ServiceImpl<FlowApplycheckMapper,
 
     /**
      * 代办列表条数
+     *
      * @param condition
      * @return
      */
@@ -56,6 +58,7 @@ public class FlowApplycheckServiceImpl extends ServiceImpl<FlowApplycheckMapper,
 
     /**
      * 获取流程
+     *
      * @param businessId
      * @return
      */

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

@@ -18,9 +18,12 @@ 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.entity.*;
 import com.fjhx.flow.mapper.FlowMapper;
-import com.fjhx.flow.service.*;
+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;
@@ -50,41 +53,43 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
 
     @Autowired
     private IFlowApplycheckService iFlowApplycheckService;
+
     /**
      * 发起流程
+     *
      * @param param
      * @return true 发起成功
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean startFlow(FlowParam param) {
-        if(StringUtil.isEmpty(param.getFlowIdentifying())){
+        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)){
+        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,""));
+                eq(FlowNodeline::getFlowId, flow.getId()).eq(FlowNodeline::getFromNodeId, ""));
         //根据上一个节点查询出下一个节点
         FlowNodeline flowNodelineNext = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFromNodeId,flowNodeline.getToNodeId()));
+                eq(FlowNodeline::getFromNodeId, flowNodeline.getToNodeId()));
         //根据发起节点查询下一个节点
         FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId,flowNodeline.getToNodeId()));
+                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(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()));
+        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();
@@ -93,34 +98,35 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
 
     /**
      * 审批
+     *
      * @param param
      * @return true流程已结束  false还有下一个节点
      */
     @Override
     public Boolean examineFlow(FlowParam param) {
-        if(StringUtil.isEmpty(param.getProInstantsId())){
+        if (StringUtil.isEmpty(param.getProInstantsId())) {
             throw new ServiceException("流程ID不能为空");
         }
         //通过流程ID查询出走向数据
         FlowApplycheck flowApplycheck = iFlowApplycheckService.getById(param.getProInstantsId());
-        if(flowApplycheck.getCheckState()!=1){
+        if (flowApplycheck.getCheckState() != 1) {
             throw new ServiceException("该流程已处理完毕");
         }
-        updateApplyCheck(param,2);
+        updateApplyCheck(param, 2);
         //如果下一个节点是空的，流程已结束
-        if(StringUtil.isEmpty(flowApplycheck.getNextNodeId())){
+        if (StringUtil.isEmpty(flowApplycheck.getNextNodeId())) {
             return true;
         }
         //查询出当前节点连接
         FlowNodeline flowNodelineNext = iFlowNodelineService.getOne(Wrappers.<FlowNodeline>query().lambda().
-                eq(FlowNodeline::getFromNodeId,flowApplycheck.getNextNodeId()));
+                eq(FlowNodeline::getFromNodeId, flowApplycheck.getNextNodeId()));
         //查询出下一个节点基础信息
         FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId,flowApplycheck.getNextNodeId()));
+                eq(FlowNode::getId, flowApplycheck.getNextNodeId()));
         //生成审批节点走向
-        iFlowApplycheckService.save(setFlowApplyCheck(flowNodelineNext.getFlowId(),flowApplycheck.getNextNodeId(),flowApplycheck.getNodeId(),
-                flowNodelineNext.getToNodeId(), "",1,null,null,
-                param.getBusinessId(),param.getTitle()));
+        iFlowApplycheckService.save(setFlowApplyCheck(flowNodelineNext.getFlowId(), flowApplycheck.getNextNodeId(), flowApplycheck.getNodeId(),
+                flowNodelineNext.getToNodeId(), "", 1, null, null,
+                param.getBusinessId(), param.getTitle()));
         //消息通知,根据角色查询用户，通知所有拥有这个角色的人
         String roleId = flowNode.getRoleKey();
         return false;
@@ -128,34 +134,35 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
 
     /**
      * 驳回流程
+     *
      * @param param
      * @return
      */
     @Override
     public Boolean rejectFlow(FlowParam param) {
-        if(StringUtil.isEmpty(param.getProInstantsId())){
+        if (StringUtil.isEmpty(param.getProInstantsId())) {
             throw new ServiceException("流程ID不能为空");
         }
         //通过流程ID查询出走向数据
         FlowApplycheck flowApplycheck = iFlowApplycheckService.getById(param.getProInstantsId());
-        updateApplyCheck(param,3);
+        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())){
+                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()));
+                eq(FlowNodeline::getFromNodeId, flowApplycheck.getPreNodeId()));
         //查询出上一个节点基础信息
         FlowNode flowNode = iFlowNodeService.getOne(Wrappers.<FlowNode>query().lambda().
-                eq(FlowNode::getId,flowNodeline.getFromNodeId()));
+                eq(FlowNode::getId, flowNodeline.getFromNodeId()));
         //生成审批节点走向
-        iFlowApplycheckService.save(setFlowApplyCheck(flowNode.getFlowId(),flowNode.getId(),flowNode.getBackNodeId(),
-                flowNodeline.getToNodeId(), "",1,null,null,
-                param.getBusinessId(),param.getTitle()));
+        iFlowApplycheckService.save(setFlowApplyCheck(flowNode.getFlowId(), flowNode.getId(), flowNode.getBackNodeId(),
+                flowNodeline.getToNodeId(), "", 1, null, null,
+                param.getBusinessId(), param.getTitle()));
         //消息通知,根据角色查询用户，通知所有拥有这个角色的人
         String roleId = flowNode.getRoleKey();
         return false;
@@ -163,6 +170,7 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
 
     /**
      * 设置属性
+     *
      * @param flowId
      * @param nodeId
      * @param preNodeId
@@ -176,7 +184,7 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
      * @return
      */
     public FlowApplycheck setFlowApplyCheck(String flowId, String nodeId, String preNodeId, String nextNodeId,
-                                            String checkUserId, int checkState, Date checkTime,String suggestions,String linkId,String approvalItem){
+                                            String checkUserId, int checkState, Date checkTime, String suggestions, String linkId, String approvalItem) {
         FlowApplycheck flowApplycheck = new FlowApplycheck();
         flowApplycheck.setCreatedTime(new Date());
         flowApplycheck.setFlowId(flowId);
@@ -194,10 +202,11 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, Flow> impleme
 
     /**
      * 修改
+     *
      * @param param
      * @param state
      */
-    public void updateApplyCheck(FlowParam param,int state){
+    public void updateApplyCheck(FlowParam param, int state) {
         //修改流程标识为已审批
         FlowApplycheck update = new FlowApplycheck();
         update.setId(param.getProInstantsId());

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

@@ -16,10 +16,10 @@
  */
 package com.fjhx.flow.service.impl;
 
-import com.fjhx.flow.entity.FlowNode;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.mapper.FlowNodeMapper;
 import com.fjhx.flow.service.IFlowNodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.myapp.application.entity.FlowNode;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -16,12 +16,11 @@
  */
 package com.fjhx.flow.service.impl;
 
-import com.fjhx.flow.entity.FlowNodeline;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.mapper.FlowNodelineMapper;
 import com.fjhx.flow.service.IFlowNodelineService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.myapp.application.entity.FlowNodeline;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 流程节点连线 服务实现类

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

@@ -16,10 +16,10 @@
  */
 package com.fjhx.flow.service.impl;
 
-import com.fjhx.flow.entity.Flow;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.mapper.FlowMapper;
 import com.fjhx.flow.service.IFlowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.myapp.application.entity.Flow;
 import org.springframework.stereotype.Service;
 
 /**
@@ -31,5 +31,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements IFlowService {
 
-
 }

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

@@ -0,0 +1,13 @@
+# 服务器端口
+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/hx-flow/src/main/resources/application-prod.yml

@@ -0,0 +1,11 @@
+# 服务器端口
+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/hx-flow/src/main/resources/application-test.yml

@@ -0,0 +1,11 @@
+# 服务器端口
+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/hx-rocketmq/pom.xml

@@ -0,0 +1,32 @@
+<?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>hx-rocketmq</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>hx-rocketmq-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/rocketmq/message/controller/StockMessageController.java → hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/controller/StockMessageController.java

@@ -5,8 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * <p>
  * 业务附件表 前端控制器

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java → hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java

@@ -2,7 +2,6 @@ package com.fjhx.rocketmq.message.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.message.MessageNotice;
-import org.springblade.core.mp.base.BaseService;
 
 /**
  * <p>

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java → hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java

@@ -1,6 +1,5 @@
 package com.fjhx.rocketmq.producer;
 
-import com.fjhx.attachment.StockAttachmentVo;
 import com.fjhx.rocketmq.Message;
 import com.fjhx.rocketmq.service.RocketMqService;
 import org.springblade.core.tool.api.R;
@@ -10,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.UUID;
-
 /**
  * @author caozhoujun
  * @version 1.2

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java → hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java

@@ -2,7 +2,7 @@ package com.fjhx.rocketmq.service.Impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.message.MessageNotice;
-import com.fjhx.message.enums.MsgSourceEnum;
+import com.fjhx.myapp.application.entity.enums.MsgSourceEnum;
 import com.fjhx.rocketmq.Message;
 import com.fjhx.rocketmq.message.service.StockMessageService;
 import com.fjhx.rocketmq.service.RocketMqService;

hx-common/hx-socket/pom.xml

@@ -0,0 +1,82 @@
+<?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>hx-socket</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>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-rocketmq-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-rocketmq</artifactId>
+        </dependency>
+
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <!-- 过滤掉内嵌的tomcat，防止websocket bean注入失败 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

hx-saas-project/saas-socket/src/main/java/com/fjhx/SocketApplication.java → hx-common/hx-socket/src/main/java/com/fjhx/SocketApplication.java

@@ -11,7 +11,6 @@ import org.springframework.context.annotation.ComponentScan;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-@ComponentScan({"org.springblade", "com.fjhx"})
 public class SocketApplication {
 
     public static void main(String[] args) {

hx-saas-project/saas-socket/src/main/java/com/fjhx/consumer/ConsumerService.java → hx-common/hx-socket/src/main/java/com/fjhx/consumer/ConsumerService.java

@@ -1,6 +1,7 @@
 package com.fjhx.consumer;
+
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.message.enums.MsgSourceEnum;
+import com.fjhx.enums.MsgSourceEnum;
 import com.fjhx.notice.service.ISendNoticeService;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
@@ -14,20 +15,16 @@ import org.springframework.stereotype.Service;
  * @date 2020/6/22
  */
 @Service
-@RocketMQMessageListener(topic = "topic-ws",
-        consumerGroup = "consumer-ws",
-        selectorExpression = "tag-ws")
+@RocketMQMessageListener(topic = "topic-ws", consumerGroup = "consumer-ws", selectorExpression = "tag-ws")
 public class ConsumerService implements RocketMQListener<String> {
 
-    private ISendNoticeService iSendNoticeService = SpringUtils.getBean(ISendNoticeService.class);
+    private final ISendNoticeService iSendNoticeService = SpringUtils.getBean(ISendNoticeService.class);
 
     @Override
     public void onMessage(String message) {
         System.out.println(message);
         JSONObject jsonObject = JSONObject.parseObject(message);
-        /**
-         * 消息来源
-         */
+        // 消息来源
         Integer msgSource = jsonObject.getInteger("msgSource");
         if (MsgSourceEnum.MSG_SOURCE_1.getKey() == msgSource) {//如果等于消息通知
             iSendNoticeService.send(jsonObject);

hx-saas-project/saas-entity/src/main/java/com/fjhx/message/MessageNotice.java → hx-common/hx-socket/src/main/java/com/fjhx/entity/MessageNotice.java

@@ -1,10 +1,9 @@
-package com.fjhx.message;
+package com.fjhx.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.base.BasicEntity;
+import com.fjhx.enums.MessageNoticeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.index.Indexed;
 
 
@@ -32,7 +31,7 @@ public class MessageNotice extends BasicEntity {
     /**
      * 消息类型
      *
-     * @see com.fjhx.message.enums.MessageNoticeEnum
+     * @see MessageNoticeEnum
      */
     private Integer msgType;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/message/enums/MessageNoticeEnum.java → hx-common/hx-socket/src/main/java/com/fjhx/enums/MessageNoticeEnum.java

@@ -1,6 +1,6 @@
-package com.fjhx.message.enums;
+package com.fjhx.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.LinkedHashMap;
@@ -30,7 +30,7 @@ public enum MessageNoticeEnum {
      * @return
      */
     public static LinkedHashMap<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (MessageNoticeEnum ms : values()) {

hx-saas-project/saas-entity/src/main/java/com/fjhx/message/enums/MsgSourceEnum.java → hx-common/hx-socket/src/main/java/com/fjhx/enums/MsgSourceEnum.java

@@ -1,6 +1,6 @@
-package com.fjhx.message.enums;
+package com.fjhx.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.HashMap;
@@ -32,7 +32,7 @@ public enum MsgSourceEnum {
      * @return
      */
     public static Map<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (MsgSourceEnum ms : values()) {

hx-saas-project/saas-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java → hx-common/hx-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java

@@ -1,11 +1,10 @@
 package com.fjhx.notice.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.message.MessageNotice;
+import com.fjhx.entity.MessageNotice;
 import com.fjhx.notice.service.ISendNoticeService;
 import com.fjhx.websocket.service.IWebSocketService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,21 +45,21 @@ public class SendNoticeServiceImpl implements ISendNoticeService {
         Integer msgSource = jsonObject.getInteger("msgSource");
 
         Map<String, User> usersMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(users)) {
+        if (ObjectUtil.isNotEmpty(users)) {
             usersMap = users.stream().collect(Collectors.toMap(o -> String.valueOf(o.getId()), Function.identity(), (key1, key2) -> key2));
         }
         // 消息对象集合map
         Map<String, MessageNotice> noticesMap = notices.stream().collect(Collectors.toMap(MessageNotice::getUserId, Function.identity(), (key1, key2) -> key2));
         for (String userId : userIds) {
             // 获取用户id
-            if (MapUtils.isEmpty(usersMap) || usersMap.get(userId) == null) {
+            if (ObjectUtil.isEmpty(usersMap) || usersMap.get(userId) == null) {
                 continue;
             }
             // 用户对象
             User user = usersMap.get(userId);
 
             // 获取消息体
-            if (MapUtils.isEmpty(noticesMap) || noticesMap.get(userId) == null) {
+            if (ObjectUtil.isEmpty(noticesMap) || noticesMap.get(userId) == null) {
                 continue;
             }
             // 消息体

hx-saas-project/saas-socket/src/main/java/com/fjhx/websocket/endpoint/NoticeServerEndpoint.java → hx-common/hx-socket/src/main/java/com/fjhx/websocket/endpoint/NoticeServerEndpoint.java

@@ -1,10 +1,9 @@
 package com.fjhx.websocket.endpoint;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.websocket.service.IWebSocketService;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.constant.RedisCacheKeyConstant;
 import org.springblade.core.redis.cache.BladeRedis;
@@ -13,11 +12,7 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Component;
 
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
+import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.util.HashMap;
 import java.util.List;
@@ -32,11 +27,11 @@ import java.util.concurrent.ConcurrentHashMap;
 @ServerEndpoint(value = ApiConstant.Project.SAAS_SOCKET_REQUEST_PREFIX + "/websocket/notice")
 public class NoticeServerEndpoint {
 
-    private IWebSocketService webSocketService = SpringUtils.getBean(IWebSocketService.class);
+    private final IWebSocketService webSocketService = SpringUtils.getBean(IWebSocketService.class);
 
-    private BladeRedis redisCache = SpringUtils.getBean(BladeRedis.class);
+    private final BladeRedis redisCache = SpringUtils.getBean(BladeRedis.class);
 
-    private IUserClient iUserClient = SpringUtils.getBean(IUserClient.class);
+    private final IUserClient iUserClient = SpringUtils.getBean(IUserClient.class);
 
     /**
      * 全部在线会话，key=登录账号ID
@@ -52,7 +47,7 @@ public class NoticeServerEndpoint {
     public void onOpen(Session session) {
         // 登入账号ID
         String userId = getUserId(session);
-        if (StringUtils.isBlank(userId)) {
+        if (ObjectUtil.isEmpty(userId)) {
             return;
         }
 
@@ -92,7 +87,7 @@ public class NoticeServerEndpoint {
     public void onClose(Session session) {
         // 登入账号ID
         String userId = getUserId(session);
-        if (StringUtils.isBlank(userId)) {
+        if (ObjectUtil.isEmpty(userId)) {
             return;
         }
 
@@ -135,7 +130,7 @@ public class NoticeServerEndpoint {
      */
     public static Map<String, String> getRequestParameterMap(Session session) {
         Map<String, List<String>> requestParameterMap = session.getRequestParameterMap();
-        if (MapUtils.isEmpty(requestParameterMap)) {
+        if (ObjectUtil.isEmpty(requestParameterMap)) {
             return new HashMap<>();
         }
         HashMap<String, String> hashMap = new HashMap<>();

hx-saas-project/saas-socket/src/main/java/com/fjhx/websocket/service/impl/WebSocketServiceImpl.java → hx-common/hx-socket/src/main/java/com/fjhx/websocket/service/impl/WebSocketServiceImpl.java

@@ -1,17 +1,14 @@
 package com.fjhx.websocket.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.websocket.endpoint.NoticeServerEndpoint;
 import com.fjhx.websocket.service.IWebSocketService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * web socket 消息推送
@@ -46,7 +43,7 @@ public class WebSocketServiceImpl implements IWebSocketService {
     @Override
     public void pushByUserId(String userId, String msg) {
         try {
-            if (StringUtils.isBlank(userId)) {
+            if (ObjectUtil.isEmpty(userId)) {
                 return;
             }
             Session session = NoticeServerEndpoint.ONLINE_SESSIONS.get(userId);
@@ -89,7 +86,7 @@ public class WebSocketServiceImpl implements IWebSocketService {
      */
     @Override
     public void destroy(String userId) {
-        if (StringUtils.isNotBlank(userId)) {
+        if (ObjectUtil.isEmpty(userId)) {
             try {
                 //关闭session
                 Session session = NoticeServerEndpoint.ONLINE_SESSIONS.get(userId);

hx-common/hx-tool/pom.xml

@@ -14,8 +14,6 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-
-        <bladex.version>2.8.2.RELEASE</bladex.version>
     </properties>
 
     <dependencies>

hx-common/pom.xml

@@ -14,6 +14,9 @@
 
     <modules>
         <module>code-generator</module>
+        <module>hx-flow</module>
+        <module>hx-rocketmq</module>
+        <module>hx-socket</module>
         <module>hx-tool</module>
         <module>client-util</module>
         <module>product-library</module>
@@ -78,6 +81,24 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-flow-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-rocketmq</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-rocketmq-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

hx-saas-project/pom.xml

@@ -1,246 +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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>fjhx-cloud</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
-    </parent>
-
-    <artifactId>hx-saas-project</artifactId>
-    <version>2.8.2.RELEASE</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <bladex.project.version>2.8.2.RELEASE</bladex.project.version>
-
-        <java.version>1.8</java.version>
-        <maven.plugin.version>3.8.1</maven.plugin.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <netjson.version>2.4</netjson.version>
-        <flowable.version>6.4.2</flowable.version>
-        <flow.version>7.1.0.M6</flow.version>
-        <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
-        <spring.cloud.version>Hoxton.SR11</spring.cloud.version>
-        <spring.platform.version>Cairo-SR8</spring.platform.version>
-        <rocketmq.version>4.9.0</rocketmq.version>
-        <!-- 推荐使用Harbor -->
-        <docker.registry.url>192.168.0.157</docker.registry.url>
-        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
-        <docker.username>admin</docker.username>
-        <docker.password>Harbor12345</docker.password>
-        <docker.namespace>blade</docker.namespace>
-        <docker.plugin.version>1.4.13</docker.plugin.version>
-    </properties>
-
-    <modules>
-		<module>saas-feign-api</module>
-        <module>saas-entity</module>
-        <module>saas-storage</module>
-        <module>saas-rocketmq</module>
-        <module>saas-socket</module>
-        <module>saas-flow</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- blade -->
-            <dependency>
-                <groupId>org.springblade.platform</groupId>
-                <artifactId>blade-bom</artifactId>
-                <version>${bladex.project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- spring -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring.cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.spring.platform</groupId>
-                <artifactId>platform-bom</artifactId>
-                <version>${spring.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <!-- blade -->
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-tenant</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <!-- 引入feign api -->
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <!-- 工具 -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.name}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring.boot.version}</version>
-                    <configuration>
-                        <fork>true</fork>
-                        <finalName>${project.build.finalName}</finalName>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>${docker.plugin.version}</version>
-                    <configuration>
-                        <username>${docker.username}</username>
-                        <password>${docker.password}</password>
-                        <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                        <tag>${project.version}</tag>
-                        <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                        <buildArgs>
-                            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                        </buildArgs>
-                    </configuration>
-                    <!--子服务添加如下配置，运行 mvn deploy 命令便会自动打包镜像-->
-                    <!--<executions>
-                        <execution>
-                            <id>default</id>
-                            <goals>
-                                <goal>build</goal>
-                                <goal>push</goal>
-                            </goals>
-                        </execution>
-                    </executions>-->
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <copy overwrite="true"
-                                          tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
-                                          file="${project.build.directory}/${project.artifactId}.jar"/>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>UTF-8</encoding>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>aliyun-repos</id>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>blade-release</id>
-            <name>Release Repository</name>
-            <url>http://nexus.bladex.vip/repository/maven-releases/</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>aliyun-plugin</id>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-</project>

hx-saas-project/saas-entity/pom.xml

@@ -1,26 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>saas-entity</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.0.5</version>
-        </dependency>
-    </dependencies>
-    <groupId>com.fjhx</groupId>
-    <name>${project.artifactId}</name>
-    <version>2.8.2.RELEASE</version>
-    <description>saas 实体</description>
-    <packaging>jar</packaging>
-
-</project>

hx-saas-project/saas-feign-api/pom.xml

@@ -1,62 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>saas-feign-api</artifactId>
-    <version>2.8.2.RELEASE</version>
-    <packaging>pom</packaging>
-    <description>saas 微服务API集合</description>
-
-    <modules>
-        <module>saas-rocketmq-api</module>
-        <module>saas-flow-api</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-mybatis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-tenant</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-auto</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 实体 -->
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-entity</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <finalName>${project.name}</finalName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

hx-saas-project/saas-flow/pom.xml

@@ -1,82 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>saas-flow</artifactId>
-    <version>2.8.2.RELEASE</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-rocketmq-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-rocketmq</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.fjhx.HxFlowApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

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

@@ -1,119 +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.entity.FlowApplycheck;
-import com.fjhx.flow.service.IFlowApplycheckService;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.common.utils.ListPageMap;
-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 org.springblade.core.boot.ctrl.BladeController;
-
-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-saas-project/saas-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.entity.Flow;
-import com.fjhx.flow.entity.FlowParam;
-import com.fjhx.flow.service.IFlowEngineService;
-import com.fjhx.flow.service.IFlowService;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
-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 org.springblade.core.boot.ctrl.BladeController;
-
-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-saas-project/saas-flow/src/main/resources/application-dev.yml

@@ -1,23 +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}
-#rocketmq 配置
-rocketmq:
-  name-server: 114.116.8.29:9876
-  producer:
-    group: my-group  # 指定发送者组名
-    send-message-timeout: 3000 #超时时间
-    compress-message-body-threshold: 4096 #消息压缩
-    max-message-size: 4194304 #消息体最大大小
-    retry-times-when-send-failed: 3 # 同步发送消息时，失败重试次数。默认为 2 次。
-    retry-times-when-send-async-failed: 3 # 异步发送消息时，失败重试次数。默认为 2 次

hx-saas-project/saas-flow/src/main/resources/application-prod.yml

@@ -1,21 +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}
-#rocketmq 配置
-rocketmq:
-  name-server: 114.116.8.29:9876
-  producer:
-    group: my-group  # 指定发送者组名
-    send-message-timeout: 3000 #超时时间
-    compress-message-body-threshold: 4096 #消息压缩
-    max-message-size: 4194304 #消息体最大大小
-    retry-times-when-send-failed: 3 # 同步发送消息时，失败重试次数。默认为 2 次。
-    retry-times-when-send-async-failed: 3 # 异步发送消息时，失败重试次数。默认为 2 次

hx-saas-project/saas-flow/src/main/resources/application-test.yml

@@ -1,21 +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}
-#rocketmq 配置
-rocketmq:
-  name-server: 114.116.8.29:9876
-  producer:
-    group: my-group  # 指定发送者组名
-    send-message-timeout: 3000 #超时时间
-    compress-message-body-threshold: 4096 #消息压缩
-    max-message-size: 4194304 #消息体最大大小
-    retry-times-when-send-failed: 3 # 同步发送消息时，失败重试次数。默认为 2 次。
-    retry-times-when-send-async-failed: 3 # 异步发送消息时，失败重试次数。默认为 2 次

hx-saas-project/saas-rocketmq/pom.xml

@@ -1,72 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>saas-rocketmq</artifactId>
-    <version>2.8.2.RELEASE</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-rocketmq-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.fjhx.HxRocketMqApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

hx-saas-project/saas-socket/pom.xml

@@ -1,96 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.fjhx</groupId>
-    <artifactId>saas-socket</artifactId>
-    <name>${project.artifactId}</name>
-    <version>2.8.2.RELEASE</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
-        </dependency>
-        <!-- websocket -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-rocketmq-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <!-- 过滤掉内嵌的tomcat，防止websocket bean注入失败 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.fjhx.SocketApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

hx-saas-project/saas-storage/pom.xml

@@ -1,77 +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-saas-project</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>saas-storage</artifactId>
-    <version>2.8.2.RELEASE</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-rocketmq-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.fjhx.HxStorageApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

hx-saas-project/saas-feign-api/saas-flow-api/pom.xml → hx-service-api/hx-flow-api/pom.xml

@@ -3,16 +3,12 @@
          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>saas-feign-api</artifactId>
+        <artifactId>hx-service-api</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>saas-flow-api</artifactId>
-    <name>${project.artifactId}</name>
-    <version>2.8.2.RELEASE</version>
-    <description>saas 流程模块 微服务API</description>
-    <packaging>jar</packaging>
+    <artifactId>hx-flow-api</artifactId>
 
 </project>

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.flow.entity;
+package com.fjhx.myapp.application.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.flow.entity;
+package com.fjhx.myapp.application.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.flow.entity;
+package com.fjhx.myapp.application.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.flow.entity;
+package com.fjhx.myapp.application.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -1,4 +1,4 @@
-package com.fjhx.flow.entity;
+package com.fjhx.myapp.application.entity;
 
 import lombok.Data;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/flow/enums/FlowTypeEnum.java → hx-service-api/hx-flow-api/src/main/java/com/fjhx/myapp/application/enums/FlowTypeEnum.java

@@ -1,6 +1,6 @@
-package com.fjhx.flow.enums;
+package com.fjhx.myapp.application.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.HashMap;
@@ -14,8 +14,7 @@ import java.util.Map;
 public enum FlowTypeEnum {
 
     type_1(0, "subscribe"),
-    type_2(1, "contract")
-    ;
+    type_2(1, "contract");
 
     private int key;
 
@@ -34,7 +33,7 @@ public enum FlowTypeEnum {
      * @return
      */
     public static Map<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (FlowTypeEnum ms : values()) {

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

@@ -1,13 +1,10 @@
 package com.fjhx.myapp.application.feign;
 
-import com.fjhx.flow.entity.FlowParam;
+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;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
 
 /**
  * 流程API
@@ -22,6 +19,7 @@ public interface IFlowApi {
 
     /**
      * 发起流程
+     *
      * @param param
      */
     @PostMapping(startFlow)
@@ -29,6 +27,7 @@ public interface IFlowApi {
 
     /**
      * 审批流程
+     *
      * @param param
      */
     @PostMapping(examineFlow)
@@ -36,6 +35,7 @@ public interface IFlowApi {
 
     /**
      * 驳回流程
+     *
      * @param param
      */
     @PostMapping(rejectFlow)

hx-saas-project/saas-feign-api/saas-rocketmq-api/pom.xml → hx-service-api/hx-rocketmq-api/pom.xml

@@ -3,16 +3,12 @@
          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>saas-feign-api</artifactId>
+        <artifactId>hx-service-api</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>2.8.2.RELEASE</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>saas-rocketmq-api</artifactId>
-    <name>${project.artifactId}</name>
-    <version>2.8.2.RELEASE</version>
-    <description>saas rocketmq模块 微服务API</description>
-    <packaging>jar</packaging>
+    <artifactId>hx-rocketmq-api</artifactId>
 
 </project>

hx-service-api/pom.xml

@@ -26,6 +26,7 @@
         <module>storage-api</module>
         <module>service-file-api</module>
         <module>iot-production-api</module>
+        <module>storage-restructure-api</module>
     </modules>
 
     <dependencyManagement>

hx-service-api/storage-restructure-api/pom.xml

@@ -0,0 +1,19 @@
+<?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>storage-restructure-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-saas-project/saas-entity/src/main/java/com/fjhx/attachment/enums/AttachmentTypeEnum.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/attachment/enums/AttachmentTypeEnum.java

@@ -1,6 +1,6 @@
 package com.fjhx.attachment.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.LinkedHashMap;
@@ -9,8 +9,8 @@ import java.util.LinkedHashMap;
  * 文件类型枚举
  */
 public enum AttachmentTypeEnum {
-    TYPE_ONE (1, "面料问题反馈图片"),
-    TYPE_TWO (2, "供应商其他资质"),
+    TYPE_ONE(1, "面料问题反馈图片"),
+    TYPE_TWO(2, "供应商其他资质"),
     ;
 
     private int key;
@@ -30,7 +30,7 @@ public enum AttachmentTypeEnum {
      * @return
      */
     public static LinkedHashMap<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (AttachmentTypeEnum ms : values()) {

hx-saas-project/saas-entity/src/main/java/com/fjhx/base/TreeNode.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/TreeNode.java

@@ -1,7 +1,6 @@
 package com.fjhx.base;
 
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
+import cn.hutool.core.util.ObjectUtil;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -61,7 +60,7 @@ public class TreeNode implements Serializable {
      * @param value
      */
     public void putAttrs(String key, Object value) {
-        if (StringUtils.isBlank(key) || value == null) {
+        if (ObjectUtil.isEmpty(key) || value == null) {
             return;
         }
         attrs.put(key, value);
@@ -104,7 +103,7 @@ public class TreeNode implements Serializable {
     }
 
     public void setAttrs(HashMap<String, Object> attrs) {
-        if (MapUtils.isEmpty(attrs)) {
+        if (ObjectUtil.isEmpty(attrs)) {
             return;
         }
         this.attrs.putAll(attrs);

hx-saas-project/saas-entity/src/main/java/com/fjhx/config/entity/BasicsConfig.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/config/entity/BasicsConfig.java

@@ -18,12 +18,9 @@ package com.fjhx.config.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 
 import com.fjhx.base.BaseStockEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/contract/entity/PurchaseContract.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/entity/PurchaseContract.java

@@ -20,14 +20,12 @@ import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+
 import java.util.Date;
 import java.util.List;
 
 import com.fjhx.base.BaseStockEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/contract/entity/PurchaseContractMaterial.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/entity/PurchaseContractMaterial.java

@@ -18,12 +18,9 @@ package com.fjhx.contract.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 
 import com.fjhx.base.BaseStockEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/contract/entity/PurchaseContractbatch.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/entity/PurchaseContractbatch.java

@@ -18,11 +18,9 @@ package com.fjhx.contract.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
-import java.io.Serializable;
 
 import com.fjhx.base.BaseStockEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/contract/enums/ApproveStateEnum.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/enums/ApproveStateEnum.java

@@ -1,6 +1,6 @@
 package com.fjhx.contract.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.LinkedHashMap;
@@ -35,7 +35,7 @@ public enum ApproveStateEnum {
      * @return
      */
     public static LinkedHashMap<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (ApproveStateEnum ms : values()) {

hx-saas-project/saas-entity/src/main/java/com/fjhx/contract/enums/PurchaseContractStatusEnum.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/contract/enums/PurchaseContractStatusEnum.java

@@ -1,6 +1,6 @@
 package com.fjhx.contract.enums;
 
-import org.apache.commons.collections4.MapUtils;
+import cn.hutool.core.util.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 
 import java.util.LinkedHashMap;
@@ -33,7 +33,7 @@ public enum PurchaseContractStatusEnum {
      * @return
      */
     public static LinkedHashMap<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
+        if (ObjectUtil.isNotEmpty(map)) {
             return map;
         }
         for (PurchaseContractStatusEnum ms : values()) {

hx-saas-project/saas-entity/src/main/java/com/fjhx/house/entity/House.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/house/entity/House.java

@@ -16,17 +16,10 @@
  */
 package com.fjhx.house.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 
 import com.fjhx.base.BaseStockEntity;
-import com.fjhx.base.BasicEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

hx-saas-project/saas-entity/src/main/java/com/fjhx/material/entity/Material.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/material/entity/Material.java

@@ -20,12 +20,9 @@ import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 
 import com.fjhx.base.BaseStockEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;