feat: 流程脚本执行共通接口，脚本共通接口，默认值校验优化

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

@@ -0,0 +1,36 @@
+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.IntoProduction;
+import com.ruoyi.execution.produce.dispersed.runbpm.PreExecutionToolClass;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 流程执行共通Controller
+ *
+ * @author hzh
+ * @date 2023-11-01
+ */
+@RestController
+@RequestMapping("/system/runbpm/process")
+public class BpmRunController {
+
+    @Autowired
+    private PreExecutionToolClass ipreExecutionToolClass;
+
+    /**
+     * 共通投产流程接口
+     */
+    @Log(title = "投产执行流程", businessType = BusinessType.INSERT)
+    @PostMapping("/productionScheduling")
+    public AjaxResult productionScheduling(@RequestBody IntoProduction intoProduction) {
+        return AjaxResult.success(ipreExecutionToolClass.ReadyToExecute(intoProduction));
+    }
+
+}

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

@@ -0,0 +1,30 @@
+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.IntoProduction;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author hanzihang
+ * @date 2023/11/16 6:14 PM
+ */
+@RestController
+@RequestMapping("/system/script")
+public class BpmScriptController {
+
+    /**
+     * 共通投产流程接口
+     */
+    @Log(title = "脚本执行接口", businessType = BusinessType.UPDATE)
+    @PostMapping("/execute")
+    public AjaxResult productionScheduling(@RequestBody IntoProduction intoProduction) {
+        return null;
+//        return AjaxResult.success(ipreExecutionToolClass.ReadyToExecute(intoProduction));
+    }
+
+}

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

@@ -34,6 +34,7 @@ import java.util.Optional;
  */
 @Component
 public class PreExecutionToolClass<R> {
+
     @Autowired // 执行流程
     private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
 

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

@@ -117,3 +117,26 @@ public class BpmExecuteProcessServiceImpl implements IBpmExecuteProcessService {
         return AjaxResult.success(ipreExecutionToolClass.ReadyToExecute(intoProduction));
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

ruoyi-system/src/main/java/com/ruoyi/system/entity/BpmProcess.java

@@ -111,7 +111,6 @@ public class BpmProcess extends BaseEntity {
      * 回传的xml流文件
      */
     // private MultipartFile fileXML;
-
     @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer("BpmProcess{");
@@ -238,7 +237,7 @@ public class BpmProcess extends BaseEntity {
     }
 
     public String getDelFlag() {
-        return delFlag.isEmpty() ? "0" : delFlag;
+        return (delFlag == null || delFlag.isEmpty()) ? "0" : delFlag;
     }
 
     public void setDelFlag(String delFlag) {