流程管理

src/main/java/com/izouma/awesomeadmin/interceptor/CrossFilter.java

@@ -22,7 +22,7 @@ public class CrossFilter implements Filter {
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String sessionId = request.getSession().getId();
         response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
-        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
         response.setHeader("Access-Control-Max-Age", "100");
         response.setHeader("Access-Control-Allow-Headers", "Content-Type");
         response.setHeader("Access-Control-Allow-Credentials", "true");

src/main/java/com/izouma/awesomeadmin/web/ActivitiController.java

@@ -0,0 +1,75 @@
+package com.izouma.awesomeadmin.web;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.izouma.awesomeadmin.dto.Result;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.*;
+import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ModelQuery;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/activiti")
+public class ActivitiController {
+    @Autowired
+    protected IdentityService                identityService;
+    @Autowired
+    protected RepositoryService              repositoryService;
+    @Autowired
+    protected RuntimeService                 runtimeService;
+    @Autowired
+    protected TaskService                    taskService;
+    @Autowired
+    protected ManagementService              managementService;
+    @Autowired
+    protected ProcessEngineConfigurationImpl processEngineConfiguration;
+
+    @RequestMapping(value = "/processList", method = RequestMethod.GET)
+    @ResponseBody
+    public Result processList(String name) {
+        ModelQuery query = repositoryService.createModelQuery();
+        if (StringUtils.isNotEmpty(name)) {
+            query = query.modelNameLike(name);
+        }
+        List<Model> models = query.list();
+        return new Result(true, models);
+    }
+
+    @RequestMapping(value = "/createModel", method = RequestMethod.GET)
+    @ResponseBody
+    public Result createModel(String name, String description) {
+        Model newModel = repositoryService.newModel();
+        try {
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            ObjectNode modelObjectNode = objectMapper.createObjectNode();
+            modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, name);
+            modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
+            modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+            newModel.setMetaInfo(modelObjectNode.toString());
+            newModel.setName(name);
+            repositoryService.saveModel(newModel);
+            ObjectNode editorNode = objectMapper.createObjectNode();
+            editorNode.put("id", "canvas");
+            editorNode.put("resourceId", "canvas");
+            ObjectNode stencilSetNode = objectMapper.createObjectNode();
+            stencilSetNode.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+            editorNode.set("stencilset", stencilSetNode);
+            repositoryService.addModelEditorSource(newModel.getId(),
+                    editorNode.toString().getBytes("utf-8"));
+            return new Result(true, newModel.getId());
+        } catch (Exception e) {
+            e.getStackTrace();
+        }
+        return new Result(false, "创建失败");
+    }
+}

src/main/java/com/izouma/awesomeadmin/web/DemoDataInitConfig.java

@@ -52,8 +52,8 @@ public class DemoDataInitConfig {
     @PostConstruct
     public void init() {
 
-        initDemoGroups();
-        initDemoUsers();
+        // initDemoGroups();
+        // initDemoUsers();
         initProcessDefinitions();
         initModelData();
 
@@ -153,7 +153,6 @@ public class DemoDataInitConfig {
 
     protected void createModelData(String name, String description, String jsonFile) {
         List<Model> modelList = repositoryService.createModelQuery().modelName("Demo model").list();
-
         if (modelList == null || modelList.isEmpty()) {
 
             Model model = repositoryService.newModel();

src/main/vue/src/main.js

@@ -11,6 +11,8 @@ import VueI18n from 'vue-i18n'
 import 'normalize.css/normalize.css'
 import 'element-ui/lib/theme-chalk/index.css'
 import './main.less'
+import {format} from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
 
 Vue.config.productionTip = false;
 Vue.use(ElementUI);
@@ -131,6 +133,16 @@ Vue.prototype.$http = {
         });
     }
 };
+Vue.mixin({
+    methods: {
+        timeFormatter(row, column, cellValue, index) {
+            return format(new Date(cellValue), 'HH:mm', {locale: zh})
+        },
+        datetimeFormatter(row, column, cellValue, index) {
+            return format(new Date(cellValue), 'YYYY/MM/DD HH:mm', {locale: zh})
+        }
+    }
+});
 
 const updateTableHeight = () => {
     try {

src/main/vue/src/pages/ProcessDefinitions.vue

@@ -0,0 +1,198 @@
+<template>
+    <div>
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" size="small" v-model="name" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showCreateModelDialog" type="primary" size="small" icon="el-icon-edit"
+                       class="filter-item">创建
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            :height="tableHeight"
+            row-key="id"
+            ref="table">
+            <el-table-column
+                v-if="multipleMode"
+                align="center"
+                type="selection"
+                min-width="50">
+            </el-table-column>
+            <el-table-column
+                prop="id"
+                label="id"
+                width="150">
+            </el-table-column>
+            <el-table-column
+                prop="name"
+                label="名称">
+            </el-table-column>
+            <el-table-column
+                prop="createTime"
+                label="创建时间"
+                :formatter="datetimeFormatter">
+            </el-table-column>
+            <el-table-column
+                prop="lastUpdateTime"
+                label="更新时间"
+                :formatter="datetimeFormatter">
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                width="300">
+                <template slot-scope="scope">
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="success" size="mini" plain>发布</el-button>
+                    <el-button @click="editRow(scope.row)" size="mini" plain>导出</el-button>
+                    <el-button @click="deleteModel(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination
+                background
+                @size-change="pageSizeChange"
+                @current-change="currentPageChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog :visible.sync="dialogVisible" title="创建菜单">
+            <el-form :model="newModel" ref="newModelForm" label-position="top" size="small">
+                <el-form-item label="名称" prop="name" :rules="[{required: true, message: '请填写名称', trigger: 'blur'}]">
+                    <el-input v-model="newModel.name"></el-input>
+                </el-form-item>
+                <el-form-item label="描述" prop="description"
+                              :rules="[{required: true, message: '请填写描述', trigger: 'blur'}]">
+                    <el-input v-model="newModel.description"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="dialogVisible = false" size="small">取消</el-button>
+                <el-button type="primary" @click="createModel" :loading="loading" size="small">保存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import axios from 'axios'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                name: '',
+                multipleMode: false,
+                dialogVisible: false,
+                newModel: {
+                    name: '',
+                    description: ''
+                },
+                loading: false
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+                var data = {};
+                if (this.name) {
+                    data.name = this.name;
+                }
+                this.$http.get({
+                    url: '/rest/repository/process-definitions',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.length;
+                        let i = this.currentPage - 1;
+                        this.tableData = res.data.splice((i < 0 ? 0 : i) * this.pageSize, this.pageSize);
+                    }
+                })
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                window.open(`${this.$baseUrl}/modeler.html?modelId=${row.id}`);
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            showCreateModelDialog() {
+                this.newModel = {
+                    name: '',
+                    description: ''
+                };
+                this.dialogVisible = true;
+            },
+            createModel() {
+                this.$refs.newModelForm.validate(valid => {
+                    if (valid) {
+                        this.loading = true;
+                        this.$http.get({
+                            url: 'activiti/createModel',
+                            data: this.newModel
+                        }).then(res => {
+                            this.loading = false;
+                            if (res.success) {
+                                this.dialogVisible = false;
+                                this.$message.success('创建成功');
+                                this.getData();
+                            }
+                        }).catch(() => {
+                            this.loading = false;
+                        })
+                    }
+                })
+            },
+            deleteModel(row) {
+                this.$alert('确认删除？', '警告', {type: 'error'}).then(() => {
+                    return axios.delete(`rest/repository/models/${row.id}`)
+                }).then(() => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                }).catch(() => {
+                    this.$message.error("删除失败");
+                })
+            }
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/pages/ProcessModels.vue

@@ -0,0 +1,198 @@
+<template>
+    <div>
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" size="small" v-model="name" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showCreateModelDialog" type="primary" size="small" icon="el-icon-edit"
+                       class="filter-item">创建
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            :height="tableHeight"
+            row-key="id"
+            ref="table">
+            <el-table-column
+                v-if="multipleMode"
+                align="center"
+                type="selection"
+                min-width="50">
+            </el-table-column>
+            <el-table-column
+                prop="id"
+                label="id"
+                width="150">
+            </el-table-column>
+            <el-table-column
+                prop="name"
+                label="名称">
+            </el-table-column>
+            <el-table-column
+                prop="createTime"
+                label="创建时间"
+                :formatter="datetimeFormatter">
+            </el-table-column>
+            <el-table-column
+                prop="lastUpdateTime"
+                label="更新时间"
+                :formatter="datetimeFormatter">
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                width="300">
+                <template slot-scope="scope">
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="success" size="mini" plain>发布</el-button>
+                    <el-button @click="editRow(scope.row)" size="mini" plain>导出</el-button>
+                    <el-button @click="deleteModel(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination
+                background
+                @size-change="pageSizeChange"
+                @current-change="currentPageChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog :visible.sync="dialogVisible" title="创建菜单">
+            <el-form :model="newModel" ref="newModelForm" label-position="top" size="small">
+                <el-form-item label="名称" prop="name" :rules="[{required: true, message: '请填写名称', trigger: 'blur'}]">
+                    <el-input v-model="newModel.name"></el-input>
+                </el-form-item>
+                <el-form-item label="描述" prop="description"
+                              :rules="[{required: true, message: '请填写描述', trigger: 'blur'}]">
+                    <el-input v-model="newModel.description"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="dialogVisible = false" size="small">取消</el-button>
+                <el-button type="primary" @click="createModel" :loading="loading" size="small">保存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import axios from 'axios'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                name: '',
+                multipleMode: false,
+                dialogVisible: false,
+                newModel: {
+                    name: '',
+                    description: ''
+                },
+                loading: false
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+                var data = {};
+                if (this.name) {
+                    data.name = this.name;
+                }
+                this.$http.get({
+                    url: '/activiti/processList',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.length;
+                        let i = this.currentPage - 1;
+                        this.tableData = res.data.splice((i < 0 ? 0 : i) * this.pageSize, this.pageSize);
+                    }
+                })
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                window.open(`${this.$baseUrl}/modeler.html?modelId=${row.id}`);
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            showCreateModelDialog() {
+                this.newModel = {
+                    name: '',
+                    description: ''
+                };
+                this.dialogVisible = true;
+            },
+            createModel() {
+                this.$refs.newModelForm.validate(valid => {
+                    if (valid) {
+                        this.loading = true;
+                        this.$http.get({
+                            url: '/activiti/createModel',
+                            data: this.newModel
+                        }).then(res => {
+                            this.loading = false;
+                            if (res.success) {
+                                this.dialogVisible = false;
+                                this.$message.success('创建成功');
+                                this.getData();
+                            }
+                        }).catch(() => {
+                            this.loading = false;
+                        })
+                    }
+                })
+            },
+            deleteModel(row) {
+                this.$alert('确认删除？', '警告', {type: 'error'}).then(() => {
+                    return axios.delete(`/rest/repository/models/${row.id}`)
+                }).then(() => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                }).catch(() => {
+                    this.$message.error("删除失败");
+                })
+            }
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/router/index.js

@@ -107,16 +107,14 @@ const router = new Router({
                     component: () => import('../pages/BubbleChart')
                 },
                 {
-                    path: '/testAaa',
-                    name: 'testAaa',
-                    component: () =>
-                        import('../pages/TestAaa')
+                    path: '/processModels',
+                    name: 'processModels',
+                    component: () => import('../pages/ProcessModels')
                 },
                 {
-                    path: '/testAaas',
-                    name: 'testAaas',
-                    component: () =>
-                        import('../pages/TestAaas')
+                    path: '/processDefinitions',
+                    name: 'processDefinitions',
+                    component: () => import('../pages/ProcessDefinitions')
                 }
             ]
         },