Browse Source

feat:流程设计

xuezizhuo 1 year ago
parent
commit
6319dfe706

+ 9 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -60,6 +60,9 @@ public class SysLoginController {
     @Value("${parameter.ip.DRAG_FORM_IP}")
     @Value("${parameter.ip.DRAG_FORM_IP}")
     public String DRAG_FORM_IP;
     public String DRAG_FORM_IP;
 
 
+    @Value("${parameter.ip.PROCESS_ENGINE}")
+    public String PROCESS_ENGINE;
+
     RestTemplate restTemplate = new RestTemplate();
     RestTemplate restTemplate = new RestTemplate();
 
 
 
 
@@ -104,10 +107,12 @@ public class SysLoginController {
             //数据源信息
             //数据源信息
             DataSource dataSource = dataSourceService.selectById(sysTenant.getDatasourceId());
             DataSource dataSource = dataSourceService.selectById(sysTenant.getDatasourceId());
             ajax.put("dataSource", dataSource);
             ajax.put("dataSource", dataSource);
-            //调用数据引擎服务切换数据源接口
-            restTemplate.postForEntity(DATA_ENGINE_IP, dataSource, DataSource.class);
-            //调用表单引擎服务切换数据源接口
-            restTemplate.postForEntity(DRAG_FORM_IP, dataSource, DataSource.class);
+//            //调用数据引擎服务切换数据源接口
+//            restTemplate.postForEntity(DATA_ENGINE_IP, dataSource, DataSource.class);
+//            //调用表单引擎服务切换数据源接口
+//            restTemplate.postForEntity(DRAG_FORM_IP, dataSource, DataSource.class);
+            //调用流程引擎服务切换数据源接口
+            restTemplate.postForEntity(PROCESS_ENGINE, dataSource, DataSource.class);
         }
         }
         return ajax;
         return ajax;
     }
     }

+ 7 - 5
ruoyi-admin/src/main/resources/application.yml

@@ -70,13 +70,13 @@ spring:
   # redis 配置
   # redis 配置
   redis:
   redis:
     # 地址
     # 地址
-    host: 192.168.110.15
+    host: localhost
     # 端口,默认为6379
     # 端口,默认为6379
     port: 6379
     port: 6379
     # 数据库索引
     # 数据库索引
     database: 0
     database: 0
     # 密码
     # 密码
-    password:
+    password: 123456
     # 连接超时时间
     # 连接超时时间
     timeout: 10s
     timeout: 10s
     lettuce:
     lettuce:
@@ -134,8 +134,10 @@ xss:
 parameter:
 parameter:
   ip:
   ip:
     # 数据引擎切换数据源接口地址
     # 数据引擎切换数据源接口地址
-    DATA_ENGINE_IP: http://192.168.110.52:8099/dataSource/changeDataSource
+    DATA_ENGINE_IP: http://localhost:8099/dataSource/changeDataSource
     # 动态表单切换数据源接口地址
     # 动态表单切换数据源接口地址
-    DRAG_FORM_IP: http://192.168.110.52:8088/dataSource/changeDataSource
+    DRAG_FORM_IP: http://localhost:8088/dataSource/changeDataSource
+    # 流程引擎切换数据源接口地址
+    PROCESS_ENGINE: http://localhost:8055/dataSource/changeDataSource
     #数据引擎初始化数据库表接口地址
     #数据引擎初始化数据库表接口地址
-    DATA_ENGINE_INITDATABASE_IP: http://192.168.110.52:8099/tableInfo/initDatabase
+    DATA_ENGINE_INITDATABASE_IP: http://localhost:8099/tableInfo/initDatabase

+ 49 - 0
ruoyi-ui/src/api/bpmprocess/process.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+// 查询流程定义列表
+export function listProcess(query) {
+  return request({
+    url: '/system/process/list',
+    method: 'get',
+    params: query,
+    baseURL:process.env.VUE_APP_BASE_API4
+  })
+}
+
+// 查询流程定义详细
+export function getProcess(processId) {
+  return request({
+    url: '/system/process/' + processId,
+    method: 'get',
+    baseURL:process.env.VUE_APP_BASE_API4
+  })
+}
+
+// 新增流程定义
+export function addProcess(data) {
+  return request({
+    url: '/system/process',
+    method: 'post',
+    data: data,
+    baseURL:process.env.VUE_APP_BASE_API4
+  })
+}
+
+// 修改流程定义
+export function updateProcess(data) {
+  return request({
+    url: '/system/process',
+    method: 'put',
+    data: data,
+    baseURL:process.env.VUE_APP_BASE_API4
+  })
+}
+
+// 删除流程定义
+export function delProcess(processId) {
+  return request({
+    url: '/system/process/' + processId,
+    method: 'delete',
+    baseURL:process.env.VUE_APP_BASE_API4
+  })
+}

+ 364 - 0
ruoyi-ui/src/views/bpmprocess/index.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="流程名称" prop="processName">
+        <el-input
+          v-model="queryParams.processName"
+          placeholder="请输入流程名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流程别名" prop="processKey">
+        <el-input
+          v-model="queryParams.processKey"
+          placeholder="请输入流程别名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流程开启状态" prop="processOpneState">
+        <el-input
+          v-model="queryParams.processOpneState"
+          placeholder="请输入流程开启状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流程部署时间" prop="processDeployTime">
+        <el-date-picker clearable
+          v-model="queryParams.processDeployTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择流程部署时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="版本状态" prop="processVersion">
+        <el-input
+          v-model="queryParams.processVersion"
+          placeholder="请输入版本状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="xml文件存放地址" prop="processXmlPath">
+        <el-input
+          v-model="queryParams.processXmlPath"
+          placeholder="请输入xml文件存放地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:process:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:process:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:process:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:process:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="processId" />
+      <el-table-column label="流程名称" align="center" prop="processName" />
+      <el-table-column label="流程别名" align="center" prop="processKey" />
+      <el-table-column label="流程开启状态" align="center" prop="processOpneState" />
+      <el-table-column label="流程类型。例如" align="center" prop="processType" />
+      <el-table-column label="流程部署时间" align="center" prop="processDeployTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.processDeployTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="启动事件类型" align="center" prop="startEventType" />
+      <el-table-column label="版本注释" align="center" prop="note" />
+      <el-table-column label="版本状态" align="center" prop="processVersion" />
+      <el-table-column label="xml流文件" align="center" prop="processXml" />
+      <el-table-column label="节点json串" align="center" prop="processJson" />
+      <el-table-column label="xml标签内容" align="center" prop="processXmlContent" />
+      <el-table-column label="xml文件存放地址" align="center" prop="processXmlPath" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:process:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:process:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改流程定义对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="流程名称" prop="processName">
+          <el-input v-model="form.processName" placeholder="请输入流程名称" />
+        </el-form-item>
+        <el-form-item label="流程别名" prop="processKey">
+          <el-input v-model="form.processKey" placeholder="请输入流程别名" />
+        </el-form-item>
+        <el-form-item label="流程开启状态" prop="processOpneState">
+          <el-input v-model="form.processOpneState" placeholder="请输入流程开启状态" />
+        </el-form-item>
+        <el-form-item label="流程部署时间" prop="processDeployTime">
+          <el-date-picker clearable
+            v-model="form.processDeployTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择流程部署时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="版本注释" prop="note">
+          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="版本状态" prop="processVersion">
+          <el-input v-model="form.processVersion" placeholder="请输入版本状态" />
+        </el-form-item>
+        <el-form-item label="节点json串" prop="processJson">
+          <el-input v-model="form.processJson" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="xml标签内容">
+          <editor v-model="form.processXmlContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="xml文件存放地址" prop="processXmlPath">
+          <el-input v-model="form.processXmlPath" placeholder="请输入xml文件存放地址" />
+        </el-form-item>
+        <el-form-item label="删除标志" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/bpmprocess/process";
+
+export default {
+  name: "Process",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 流程定义表格数据
+      processList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processName: null,
+        processKey: null,
+        processOpneState: null,
+        processType: null,
+        processDeployTime: null,
+        startEventType: null,
+        note: null,
+        processVersion: null,
+        processXml: null,
+        processJson: null,
+        processXmlContent: null,
+        processXmlPath: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      listProcess(this.queryParams).then(response => {
+        this.processList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        processId: null,
+        processName: null,
+        processKey: null,
+        processOpneState: null,
+        processType: null,
+        processDeployTime: null,
+        startEventType: null,
+        note: null,
+        processVersion: null,
+        processXml: null,
+        processJson: null,
+        processXmlContent: null,
+        processXmlPath: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        delFlag: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.processId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加流程定义";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const processId = row.processId || this.ids
+      getProcess(processId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改流程定义";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.processId != null) {
+            updateProcess(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProcess(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const processIds = row.processId || this.ids;
+      this.$modal.confirm('是否确认删除流程定义编号为"' + processIds + '"的数据项?').then(function() {
+        return delProcess(processIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/process/export', {
+        ...this.queryParams
+      }, `process_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>