浏览代码

fix:修改包路径

韩帛霖 1 年之前
父节点
当前提交
fe4b31e0e6
共有 33 个文件被更改,包括 59 次插入67 次删除
  1. 2 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteNodeController.java
  2. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteNodeMiddleController.java
  3. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteProcessController.java
  4. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmRunController.java
  5. 1 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmScriptController.java
  6. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNode.java
  7. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNodeMiddle.java
  8. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteProcess.java
  9. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/BpmRunNodeVo.java
  10. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/BpmUserScriptVo.java
  11. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IRunBPMEntity.java
  12. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IScriptEntity.java
  13. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IntoProduction.java
  14. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/SysBpmNodeScriptVO.java
  15. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/TriggerExceptionVO.java
  16. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteNodeMapper.java
  17. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteNodeMiddleMapper.java
  18. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteProcessMapper.java
  19. 8 5
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/runbpm/PreExecutionToolClass.java
  20. 2 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/runbpm/RunImplementationClass.java
  21. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteNodeMiddleService.java
  22. 2 3
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteNodeService.java
  23. 1 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteProcessService.java
  24. 1 3
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IRunBPMService.java
  25. 2 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteNodeMiddleServiceImpl.java
  26. 5 6
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteNodeServiceImpl.java
  27. 1 1
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteProcessServiceImpl.java
  28. 1 3
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/runbpm/Test1Bpm.java
  29. 2 2
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/script/common/CommonProductionSchedulingServiceImpl.java
  30. 1 4
      ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/templateimpl/RunBPMImpl.java
  31. 5 5
      ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMapper.xml
  32. 4 4
      ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMiddleMapper.xml
  33. 4 4
      ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

+ 2 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteNodeController.java

@@ -3,7 +3,7 @@ package com.ruoyi.execution.produce.dispersed.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.TriggerExceptionVO;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.TriggerExceptionVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +18,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteNodeMiddleController.java

@@ -17,7 +17,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeMiddleService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteProcessController.java

@@ -17,7 +17,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteProcessService;
 import com.ruoyi.common.core.page.TableDataInfo;
 

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmRunController.java

@@ -3,7 +3,7 @@ package com.ruoyi.execution.produce.dispersed.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.BpmRunNodeVo;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.BpmRunNodeVo;
 import com.ruoyi.execution.produce.dispersed.runbpm.PreExecutionToolClass;
 import com.ruoyi.system.entity.CommonEntity;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmScriptController.java

@@ -3,8 +3,7 @@ package com.ruoyi.execution.produce.dispersed.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IScriptEntity;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IntoProduction;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IScriptEntity;
 import com.ruoyi.execution.produce.dispersed.runbpm.RunImplementationClass;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/BpmExecuteNode.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNode.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity;
+package com.ruoyi.execution.produce.dispersed.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/BpmExecuteNodeMiddle.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNodeMiddle.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity;
+package com.ruoyi.execution.produce.dispersed.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/BpmExecuteProcess.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteProcess.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity;
+package com.ruoyi.execution.produce.dispersed.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/BpmRunNodeVo.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/BpmRunNodeVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 import java.util.Map;
 

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/BpmUserScriptVo.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/BpmUserScriptVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 import com.ruoyi.system.entity.BpmNodeHandleUser;
 import com.ruoyi.system.entity.BpmNodeScriptRelevance;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/IRunBPMEntity.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IRunBPMEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 import java.util.Map;
 

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/IScriptEntity.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IScriptEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 /**
  * @author hanzihang

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/IntoProduction.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/IntoProduction.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 
 import java.util.Map;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/SysBpmNodeScriptVO.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/SysBpmNodeScriptVO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/enetity/runbpm/TriggerExceptionVO.java → ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/runbpm/TriggerExceptionVO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.execution.produce.dispersed.enetity.runbpm;
+package com.ruoyi.execution.produce.dispersed.entity.runbpm;
 
 /**
  * 触发异常VO

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteNodeMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.execution.produce.dispersed.mapper;
 
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteNodeMiddleMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.execution.produce.dispersed.mapper;
 
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
 
 import java.util.List;
 

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteProcessMapper.java

@@ -3,7 +3,7 @@ package com.ruoyi.execution.produce.dispersed.mapper;
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
 import com.ruoyi.system.entity.CommonEntity;
 import io.lettuce.core.dynamic.annotation.Param;
 

+ 8 - 5
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/runbpm/PreExecutionToolClass.java

@@ -4,10 +4,10 @@ import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.utils.bpm.XmlDataParserUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.*;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.*;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeMapper;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeMiddleMapper;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
@@ -155,7 +155,7 @@ public class PreExecutionToolClass<R> {
             runBpmExecuteNodeList.add(bpmExecuteNode);
         });
         runBpmExecuteNodeMapper.insertBpmExecuteNodeList(runBpmExecuteNodeList);
-        /**3️⃣3️⃣3️⃣ 执行流程任务所有关联数据执行用户,执行脚本等*/
+        /**3️⃣3️⃣3️⃣ 执行流程任务所有关联数据执行用户、执行脚本、表单等*/
         List<BpmExecuteNodeMiddle> runBpmExecuteNodeMiddleList = new ArrayList<>();
         int index = 0;
         // bpmUserScriptVoList  当前节点的所有执行用户脚本
@@ -193,6 +193,9 @@ public class PreExecutionToolClass<R> {
             runBpmExecuteNodeMiddleList.add(bpmExecuteNodeMiddle);
         });
         runBpmExecuteNodeMiddleMapper.insertBpmExecuteNodeMiddleList(runBpmExecuteNodeMiddleList);
+
+
+
         /**4️⃣4️⃣4️⃣ 调用执行节点接口 预执行当前投产流程的开始节点,执行开始节点*/
         // bpmUserScriptVoList  节点key对应的脚本
         // 根据节点类型startEvent 筛选得到当前流程的开始节点,进行自动执行    // startEvent  开始节点类型

+ 2 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/runbpm/RunImplementationClass.java

@@ -1,8 +1,8 @@
 package com.ruoyi.execution.produce.dispersed.runbpm;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IRunBPMEntity;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IScriptEntity;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IScriptEntity;
 import com.ruoyi.execution.produce.dispersed.service.IRunBPMService;
 import com.ruoyi.execution.produce.dispersed.service.IScriptService;
 import org.slf4j.Logger;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteNodeMiddleService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.execution.produce.dispersed.service;
 
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
 import com.ruoyi.system.entity.CommonEntity;
 
 import java.util.List;

+ 2 - 3
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteNodeService.java

@@ -1,8 +1,7 @@
 package com.ruoyi.execution.produce.dispersed.service;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.TriggerExceptionVO;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.TriggerExceptionVO;
 
 import java.util.List;
 

+ 1 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteProcessService.java

@@ -1,10 +1,9 @@
 package com.ruoyi.execution.produce.dispersed.service;
 
 import java.util.List;
-import java.util.Map;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
 import com.ruoyi.system.entity.CommonEntity;
 
 /**

+ 1 - 3
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IRunBPMService.java

@@ -2,9 +2,7 @@ package com.ruoyi.execution.produce.dispersed.service;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IRunBPMEntity;
-
-import java.util.Map;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
 
 /**
  * 执行流程接口

+ 2 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteNodeMiddleServiceImpl.java

@@ -8,8 +8,8 @@ import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.config.bpm.BpmProperties;
 import com.ruoyi.common.utils.http.sending;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.SysBpmNodeScriptVO;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.SysBpmNodeScriptVO;
 import com.ruoyi.system.entity.CommonEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

+ 5 - 6
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteNodeServiceImpl.java

@@ -3,15 +3,14 @@ package com.ruoyi.execution.produce.dispersed.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.constant.BpmNodeTypeConstants;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.bpm.XmlDataParserUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.SysBpmNodeScriptVO;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.TriggerExceptionVO;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.SysBpmNodeScriptVO;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.TriggerExceptionVO;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeMiddleMapper;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteProcessServiceImpl.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.execution.produce.dispersed.runbpm.PreExecutionToolClass;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess;
 import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeMiddleService;
 import com.ruoyi.system.entity.CommonEntity;

+ 1 - 3
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/runbpm/Test1Bpm.java

@@ -3,13 +3,11 @@ package com.ruoyi.execution.produce.dispersed.service.impl.runbpm;
 import com.ruoyi.common.config.bpm.BpmProperties;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.http.sending;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IRunBPMEntity;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
 import com.ruoyi.execution.produce.dispersed.service.IRunBPMService;
 import com.ruoyi.system.entity.CommonEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;

+ 2 - 2
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/script/common/CommonProductionSchedulingServiceImpl.java

@@ -1,10 +1,10 @@
 package com.ruoyi.execution.produce.dispersed.service.impl.script.common;
 
 import com.ruoyi.common.utils.http.sending;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
+import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeService;
 import com.ruoyi.execution.produce.dispersed.service.IScriptService;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IntoProduction;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IntoProduction;
 import com.ruoyi.system.entity.CommonEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;

+ 1 - 4
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/templateimpl/RunBPMImpl.java

@@ -2,16 +2,13 @@ package com.ruoyi.execution.produce.dispersed.service.templateimpl;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.execution.produce.dispersed.enetity.runbpm.IRunBPMEntity;
+import com.ruoyi.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
 import com.ruoyi.execution.produce.dispersed.service.IRunBPMService;
-import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode;
 import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author hanzihang

+ 5 - 5
ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeMapper">
 
-    <resultMap type="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode" id="BpmExecuteNodeResult">
+    <resultMap type="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode" id="BpmExecuteNodeResult">
         <result property="id" column="id"/>
         <result property="taskProcessKey" column="task_process_key"/>
         <result property="taskNodeKey" column="task_node_key"/>
@@ -59,7 +59,7 @@
         from bpm_execute_node
     </sql>
 
-    <select id="selectBpmExecuteNodeList" parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode"
+    <select id="selectBpmExecuteNodeList" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode"
             resultMap="BpmExecuteNodeResult">
         <include refid="selectBpmExecuteNodeVo"/>
         <where>
@@ -95,7 +95,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertBpmExecuteNode" parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode"
+    <insert id="insertBpmExecuteNode" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode"
             useGeneratedKeys="true" keyProperty="id">
         insert into bpm_execute_node
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -203,7 +203,7 @@
         </foreach>
     </insert>
 
-    <update id="updateBpmExecuteNode" parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode">
+    <update id="updateBpmExecuteNode" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode">
         update bpm_execute_node
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
@@ -247,7 +247,7 @@
         </foreach>
     </delete>
 
-    <update id="updateNodeState" parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNode">
+    <update id="updateNodeState" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNode">
         update bpm_execute_node
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>

+ 4 - 4
ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMiddleMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeMiddleMapper">
 
-    <resultMap type="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle"
+    <resultMap type="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle"
                id="BpmExecuteNodeMiddleResult">
         <result property="id" column="id"/>
         <result property="taskProcessKey" column="task_process_key"/>
@@ -31,7 +31,7 @@
     </sql>
 
     <select id="selectBpmExecuteNodeMiddleList"
-            parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle"
+            parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle"
             resultMap="BpmExecuteNodeMiddleResult">
         <include refid="selectBpmExecuteNodeMiddleVo"/>
         <where>
@@ -59,7 +59,7 @@
     </select>
 
     <insert id="insertBpmExecuteNodeMiddle"
-            parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle" useGeneratedKeys="true"
+            parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle" useGeneratedKeys="true"
             keyProperty="id">
         insert into bpm_execute_node_middle
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -105,7 +105,7 @@
     </insert>
 
     <update id="updateBpmExecuteNodeMiddle"
-            parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteNodeMiddle">
+            parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeMiddle">
         update bpm_execute_node_middle
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>

+ 4 - 4
ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteProcessMapper">
 
-    <resultMap type="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess" id="BpmExecuteProcessResult">
+    <resultMap type="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess" id="BpmExecuteProcessResult">
         <result property="id" column="id"/>
         <result property="taskKey" column="task_key"/>
         <result property="taskName" column="task_name"/>
@@ -41,7 +41,7 @@
     </sql>
 
     <select id="selectBpmExecuteProcessList"
-            parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess"
+            parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess"
             resultMap="BpmExecuteProcessResult">
         <include refid="selectBpmExecuteProcessVo"/>
         <where>
@@ -67,7 +67,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertBpmExecuteProcess" parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess"
+    <insert id="insertBpmExecuteProcess" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess"
             useGeneratedKeys="true" keyProperty="id">
         insert into bpm_execute_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,7 +99,7 @@
     </insert>
 
     <update id="updateBpmExecuteProcess"
-            parameterType="com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess">
+            parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteProcess">
         update bpm_execute_process
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskKey != null">task_key = #{taskKey},</if>