Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBpmNodeScriptController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -121,4 +122,13 @@ public class SysBpmNodeScriptController extends BaseController
     public AjaxResult selectSysBpmNodeScriptByScriptKey(@PathVariable("scriptKey") String scriptKey){
         return success(sysBpmNodeScriptService.selectSysBpmNodeScriptByScriptKey(scriptKey));
     }
+
+    /**
+     * 根据scriptKeys获取流程节点脚本详细信息
+     */
+    @PostMapping("/selectSysBpmNodeScriptByScriptKeys")
+    public AjaxResult selectSysBpmNodeScriptByScriptKeys(@RequestBody List<String> scriptKeys){
+        return AjaxResult.success(sysBpmNodeScriptService.selectSysBpmNodeScriptByScriptKeys(scriptKeys));
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysBpmNodeScriptMapper.java

@@ -65,4 +65,11 @@ public interface SysBpmNodeScriptMapper
      * @return
      */
     SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey);
+
+    /**
+     * 根据scriptKey查询流程节点脚本
+     * @param scriptKeys 唯一标识
+     * @return
+     */
+    List<SysBpmNodeScript> selectSysBpmNodeScriptByScriptKeys(List<String> scriptKeys);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysBpmNodeScriptService.java

@@ -65,4 +65,11 @@ public interface ISysBpmNodeScriptService
      * @return
      */
     SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey);
+
+    /**
+     * 根据scriptKey查询流程节点脚本
+     * @param scriptKeys 唯一标识
+     * @return
+     */
+    List<SysBpmNodeScript> selectSysBpmNodeScriptByScriptKeys(List<String> scriptKeys);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysBpmNodeScriptServiceImpl.java

@@ -103,4 +103,9 @@ public class SysBpmNodeScriptServiceImpl implements ISysBpmNodeScriptService
     public SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey) {
         return sysBpmNodeScriptMapper.selectSysBpmNodeScriptByScriptKey(scriptKey);
     }
+
+    @Override
+    public List<SysBpmNodeScript> selectSysBpmNodeScriptByScriptKeys(List<String> scriptKeys) {
+        return sysBpmNodeScriptMapper.selectSysBpmNodeScriptByScriptKeys(scriptKeys);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysBpmNodeScriptMapper.xml

@@ -101,4 +101,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysBpmNodeScriptVo"/>
         where script_key = #{scriptKey}
     </select>
+
+    <select id="selectSysBpmNodeScriptByScriptKeys"  resultMap="SysBpmNodeScriptResult">
+        <include refid="selectSysBpmNodeScriptVo"/>
+        where del_flag = '0' and script_key in
+        <foreach collection="list" item="scriptKey" open="(" close=")" separator=",">
+            #{scriptKey}
+        </foreach>
+    </select>
+
 </mapper>

ruoyi-ui/src/api/bpmprocess/script.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 修改流程节点脚本
+export function updateScript(data) {
+    return request({
+      url: '/system/script',
+      method: 'put',
+      data: data
+    })
+  }
+  
+  // 删除流程节点脚本
+  export function delScript(id) {
+    return request({
+      url: '/system/script/' + id,
+      method: 'delete'
+    })
+  }

ruoyi-ui/src/views/bpmprocess/scriptManage.vue

@@ -173,6 +173,7 @@
  
         <el-form-item label="脚本编码:" prop="scriptKey">
           <el-input v-model="form.scriptKey" placeholder="请输入脚本编码" :disabled="true"/>
+          <el-button icon="el-icon-document-copy"></el-button>
         </el-form-item>
         <el-form-item label="脚本名称:" prop="scriptName">
           <el-input v-model="form.scriptName" placeholder="请输入脚本名称" />
@@ -252,10 +253,9 @@
 import {
   listScript,
   getScript,
-  delScript,
   addScript,
-  updateScript,
 } from "@/api/bpmprocess/process";
+import {updateScript,delScript} from "@/api/bpmprocess/script"
 import uuid from "@/utils/bpmn/uuid";
 import Editor from "vue2-ace-editor";
 import {v4 as uuidv4} from 'uuid';
@@ -306,12 +306,12 @@ export default {
         scriptName: [
           { required: true, message: "请输入脚本名称", trigger: "blur" },
         ],
-        scriptFunctionName: [
-          { required: true, message: "请输入脚本函数名", trigger: "blur" },
-        ],
-        scriptFunctionCode: [
-          { required: true, message: "请输入脚本函数体", trigger: "blur" },
-        ],
+        // scriptFunctionName: [
+        //   { required: true, message: "请输入脚本函数名", trigger: "blur" },
+        // ],
+        // scriptFunctionCode: [
+        //   { required: true, message: "请输入脚本函数体", trigger: "blur" },
+        // ],
         scriptType: [
           { required: true, message: "请选择脚本类型", trigger: "change" },
         ],