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/TemplateBaseController.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.controller.system;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.TemplateBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 模板库Controller
+ */
+@RestController
+@RequestMapping("/system/templateBase")
+public class TemplateBaseController {
+
+    @Autowired
+    private TemplateBaseService templateBaseService;
+
+    /**
+     * 查询模板数据库表信息
+     */
+    @GetMapping("/queryTemplateBaseTable")
+    public AjaxResult queryTemplateBaseTable(){
+        return AjaxResult.success(templateBaseService.queryTemplateBaseTable());
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBpmNodeScript.java

@@ -33,6 +33,9 @@ public class SysBpmNodeScript extends BaseEntity
     /** 脚本类型 */
     private Long scriptType;
 
+    /** 表名 */
+    private String tableName;
+
     /** 脚本描述 */
     private String scriptDescription;
 
@@ -118,6 +121,14 @@ public class SysBpmNodeScript extends BaseEntity
         this.industryType = industryType;
     }
 
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
     public String getDelFlag()
     {
         return delFlag;
@@ -134,6 +145,7 @@ public class SysBpmNodeScript extends BaseEntity
             .append("scriptType", getScriptType())
             .append("scriptDescription", getScriptDescription())
             .append("industryType",getIndustryType())
+            .append("tableName",getTableName())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TemplateBaseVo.java

@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 模板库VO
+ */
+public class TemplateBaseVo {
+
+    /**
+     * 表名称
+     */
+    private String tableName;
+
+    /**
+     * 表描述
+     */
+    private String tableComment;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getTableComment() {
+        return tableComment;
+    }
+
+    public void setTableComment(String tableComment) {
+        this.tableComment = tableComment;
+    }
+
+    @Override
+    public String toString() {
+        return "TemplateBaseVo{" +
+                "tableName='" + tableName + '\'' +
+                ", tableComment='" + tableComment + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.vo.TemplateBaseVo;
+
+import java.util.List;
+
+/**
+ * 模板库数据层
+ */
+public interface TemplateBaseMapper {
+
+    /**
+     * 查询模板库所有数据表
+     * @return
+     */
+    List<TemplateBaseVo> queryTemplateBaseTable();
+
+}

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

@@ -0,0 +1,17 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.vo.TemplateBaseVo;
+
+import java.util.List;
+
+/**
+ * 模板库业务层
+ */
+public interface TemplateBaseService {
+
+    /**
+     * 查询模板库所有数据表
+     * @return
+     */
+    List<TemplateBaseVo> queryTemplateBaseTable();
+}

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

@@ -0,0 +1,24 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.vo.TemplateBaseVo;
+import com.ruoyi.system.mapper.TemplateBaseMapper;
+import com.ruoyi.system.service.TemplateBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 模板库服务层处理
+ */
+@Service
+public class TemplateBaseServiceImpl implements TemplateBaseService {
+
+    @Autowired
+    private TemplateBaseMapper templateBaseMapper;
+
+    @Override
+    public List<TemplateBaseVo> queryTemplateBaseTable() {
+        return templateBaseMapper.queryTemplateBaseTable();
+    }
+}

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scriptType"    column="script_type"    />
         <result property="scriptDescription"    column="script_description"    />
         <result property="industryType" column="industry_type"/>
+        <result property="tableName" column="table_name"/>
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysBpmNodeScriptVo">
-        select id, script_key, script_function_name, script_name, script_function_code, script_type, script_description, industry_type, del_flag, create_by, create_time, update_by, update_time from sys_bpm_node_script
+        select id, script_key, script_function_name, script_name, script_function_code, script_type, script_description, industry_type,table_name, del_flag, create_by, create_time, update_by, update_time from sys_bpm_node_script
     </sql>
 
     <select id="selectSysBpmNodeScriptList" parameterType="SysBpmNodeScript" resultMap="SysBpmNodeScriptResult">
@@ -34,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptType != null "> and script_type = #{scriptType}</if>
             <if test="scriptDescription != null  and scriptDescription != ''"> and script_description = #{scriptDescription}</if>
             <if test="industryType != null"> and industry_type = #{industryType}</if>
+            <if test="tableName != null and tableName != ''"> and table_name = #{tableName}</if>
              order by create_time desc
     </select>
     
@@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptType != null">script_type,</if>
             <if test="scriptDescription != null">script_description,</if>
             <if test="industryType != null">industry_type,</if>
+            <if test="tableName != null">table_name,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             del_flag
@@ -64,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptType != null">#{scriptType},</if>
             <if test="scriptDescription != null">#{scriptDescription},</if>
             <if test="industryType != null">#{industryType},</if>
+            <if test="tableName != null">#{tableName},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             '0'
@@ -80,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptType != null">script_type = #{scriptType},</if>
             <if test="scriptDescription != null">script_description = #{scriptDescription},</if>
             <if test="industryType != null">industry_type = #{industryType},</if>
+            <if test="tableName != null">table_name = #{tableName},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TemplateBaseMapper">
+
+    <select id="queryTemplateBaseTable" resultType="com.ruoyi.system.domain.vo.TemplateBaseVo">
+        select table_name tableName,create_time createTime,table_comment tableComment from information_schema.tables
+        where table_schema= 'zkqy-template' and table_name != 'table_info' order by createTime asc
+    </select>
+
+</mapper>

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

@@ -15,4 +15,12 @@ export function updateScript(data) {
       url: '/system/script/' + id,
       method: 'delete'
     })
+  }
+
+  //查询模板库数据表
+  export function queryTemplateBaseTable() {
+    return request({
+      url: '/system/templateBase/queryTemplateBaseTable',
+      method: 'get'
+    })
   }

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

@@ -107,11 +107,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="脚本编码" align="center" prop="scriptKey" />
-      <el-table-column
-        label="脚本方法名称"
-        align="center"
-        prop="scriptFunctionName"
-      />
+      <!-- <el-table-column label="脚本方法名称" align="center" prop="scriptFunctionName" /> -->
       <el-table-column label="脚本名称" align="center" prop="scriptName" />
       <!-- <el-table-column
         label="脚本方法体"
@@ -128,6 +124,11 @@
           {{ getDictLabel(scope.row.industryType, dict.type.industry_type) }}
         </template>
       </el-table-column>
+      <el-table-column
+        label="数据表"
+        align="center"
+        prop="tableName"
+      ></el-table-column>
       <el-table-column
         label="脚本描述"
         align="center"
@@ -221,22 +222,37 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="方法名:" prop="scriptFunctionName">
+        <!-- <el-form-item label="方法名:" prop="scriptFunctionName">
           <el-input
             v-model="form.scriptFunctionName"
             placeholder="请输入脚本方法名称"
           />
         </el-form-item>
 
-        <el-form-item label="方法体:" prop="scriptFunctionCode">
-          <!-- <el-input
+        <el-form-item label="方法体:" prop="scriptFunctionCode"> -->
+        <!-- <el-input
             v-model="form.scriptFunctionCode"
             type="textarea"
             placeholder="请输入内容"
           /> -->
-          <!-- <div ref="container" class="monaco-container">
+        <!-- <div ref="container" class="monaco-container">
           </div> -->
-          <el-button icon="el-icon-edit" @click="drawerOpenHandler"></el-button>
+        <!-- <el-button icon="el-icon-edit" @click="drawerOpenHandler"></el-button>
+        </el-form-item> -->
+        <el-form-item label="数据表:" prop="tableName">
+          <el-select
+            v-model="form.tableName"
+            multiple
+            placeholder="请选择数据表"
+          >
+            <el-option
+              v-for="item in tableNameList"
+              :key="item.tableName"
+              :label="item.tableComment"
+              :value="item.tableName"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="脚本描述:" prop="scriptDescription">
           <el-input
@@ -269,6 +285,7 @@ import Editor from "vue2-ace-editor";
 import { v4 as uuidv4 } from "uuid";
 import * as monaco from "monaco-editor";
 import Clipboard from "clipboard";
+import { Cog } from "lucide-vue";
 
 export default {
   name: "Script",
@@ -294,6 +311,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //表数据
+      tableNameList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -325,6 +344,9 @@ export default {
         industryType: [
           { required: true, message: "请选择脚本类型", trigger: "change" },
         ],
+        tableName: [
+          { required: true, message: "请选择数据表", trigger: "change" },
+        ],
       },
 
       // 代码编辑器相关数据
@@ -397,6 +419,7 @@ export default {
         scriptType: null,
         industryType: null,
         scriptDescription: null,
+        tableName: null,
         delFlag: null,
         createBy: null,
         createTime: null,
@@ -442,12 +465,16 @@ export default {
     handleUpdate(row) {
       this.monacoEditor?.dispose();
       this.reset();
+      queryTemplateBaseTable().then((response) => {
+        this.tableNameList = response.data;
+      });
       const id = row.id || this.ids;
       getScript(id).then((response) => {
         response.data.scriptType = response.data.scriptType.toString();
+        response.data.tableName = null?.split(",");
         this.form = response.data;
         this.open = true;
-        this.title = "修改流程节点";
+        this.title = "修改流程节点脚本";
       });
     },
     /** 提交按钮 */
@@ -455,6 +482,7 @@ export default {
       // console.log(this.monacoEditor?.getValue());
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.tableName = this.form.tableName.join(",");
           if (this.form.id != null) {
             updateScript(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -463,6 +491,7 @@ export default {
             });
           } else {
             addScript(this.form).then((response) => {
+              console.log(this.form);
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();