修改包名

.gitignore

@@ -1 +1,2 @@
 /.idea/*
+/*/target/

README.md

@@ -1,9 +1,5 @@
-renren-security【企业版】版权声明
+etic-security【企业版】版权声明
 
-1. renren-security【企业版】已申请软件著作权，未经授权的企业或个人，请购买正版授权，否则我们会根据事态轻重追究相应法律责任。
+1. eitc-security【企业版】已申请软件著作权，未经授权的企业或个人，请购买正版授权，否则我们会根据事态轻重追究相应法律责任。
 2. 授权者不得擅自将源码上传到包括但不限于GitHub、Gitee、CSDN、百度网盘等互联网分享平台，不得直接对授权的产品本身进行二次转售或倒卖等，否则我们收回产品授权，并移交司法机关处理。
 3. 未经授权的任何公司及个人，无权使用、重构及二次开发，否则，我们将收集并固定相关证据，对侵权者采取一切必要的法律措施，追究侵权行为人的法律责任以维护我司的合法权益。
-
-律师声明函：
-![律师声明函](https://www.renren.io/res/images/lawyer_letter-1.jpg "在这里输入图片标题")
-![律师声明函](https://www.renren.io/res/images/lawyer_letter-2.jpg "在这里输入图片标题")

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2'
 services:
-  renren-admin:
-    image: renren/renren-admin
+  eitc-admin:
+    image: eitc/eitc-admin
     ports:
     - "8080:8080"
     environment:
     - spring.profiles.active=dev
-  renren-api:
-    image: renren/renren-api
+  eitc-api:
+    image: eitc/eitc-api
     ports:
     - "8081:8081"
     environment:

eitc-admin/Dockerfile

@@ -0,0 +1,7 @@
+FROM java:8
+EXPOSE 8080
+
+VOLUME /tmp
+ADD eitc-admin.jar /app.jar
+RUN bash -c 'touch /app.jar'
+ENTRYPOINT ["java","-jar","/app.jar"]

eitc-admin/db/generator/oracle.sql

@@ -0,0 +1,293 @@
+CREATE TABLE gen_datasource (
+    id NUMBER(20, 0) NOT NULL,
+    db_type varchar2(200),
+    conn_name varchar2(200),
+    conn_url varchar2(500),
+    username varchar2(200),
+    password varchar2(200),
+    status NUMBER(2, 0),
+    create_date date,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_datasource IS '数据源管理';
+COMMENT ON COLUMN gen_datasource.id IS 'id';
+COMMENT ON COLUMN gen_datasource.db_type IS '数据库类型 MySQL、Oracle、SQLServer、PostgreSQL';
+COMMENT ON COLUMN gen_datasource.conn_name IS '连接名';
+COMMENT ON COLUMN gen_datasource.conn_url IS 'URL';
+COMMENT ON COLUMN gen_datasource.username IS '用户名';
+COMMENT ON COLUMN gen_datasource.password IS '密码';
+COMMENT ON COLUMN gen_datasource.status IS '状态  0：启用   1：禁用';
+COMMENT ON COLUMN gen_datasource.create_date IS '创建时间';
+
+
+
+CREATE TABLE gen_field_type (
+    id NUMBER(20, 0) NOT NULL,
+    column_type varchar2(200),
+    attr_type varchar2(200),
+    package_name varchar2(200),
+    create_date date,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_field_type_column_type on gen_field_type(column_type);
+
+COMMENT ON TABLE gen_field_type IS '字段类型管理';
+COMMENT ON COLUMN gen_field_type.id IS 'id';
+COMMENT ON COLUMN gen_field_type.column_type IS '字段类型';
+COMMENT ON COLUMN gen_field_type.attr_type IS '属性类型';
+COMMENT ON COLUMN gen_field_type.package_name IS '属性包名';
+COMMENT ON COLUMN gen_field_type.create_date IS '创建时间';
+
+
+CREATE TABLE gen_base_class (
+    id NUMBER(20, 0) NOT NULL,
+    package_name varchar2(200),
+    code varchar2(200),
+    fields varchar2(200),
+    remark varchar2(200),
+    create_date date,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_base_class IS '基类管理';
+COMMENT ON COLUMN gen_base_class.id IS 'id';
+COMMENT ON COLUMN gen_base_class.package_name IS '基类包名';
+COMMENT ON COLUMN gen_base_class.code IS '基类编码';
+COMMENT ON COLUMN gen_base_class.fields IS '基类字段，多个用英文逗号分隔';
+COMMENT ON COLUMN gen_base_class.remark IS '备注';
+COMMENT ON COLUMN gen_base_class.create_date IS '创建时间';
+
+
+CREATE TABLE gen_table_info (
+    id NUMBER(20, 0) NOT NULL,
+    table_name varchar2(200),
+    class_name varchar2(200),
+    table_comment varchar2(200),
+    author varchar2(200),
+    email varchar2(200),
+    package_name varchar2(200),
+    version varchar2(200),
+    backend_path varchar2(500),
+    frontend_path varchar2(500),
+    module_name varchar2(200),
+    sub_module_name varchar2(200),
+    datasource_id NUMBER(20, 0),
+    baseclass_id NUMBER(20, 0),
+    create_date date,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_table_info_table_name on gen_table_info(table_name);
+
+COMMENT ON TABLE gen_table_info IS '代码生成表';
+COMMENT ON COLUMN gen_table_info.id IS 'id';
+COMMENT ON COLUMN gen_table_info.table_name IS '表名';
+COMMENT ON COLUMN gen_table_info.class_name IS '类名';
+COMMENT ON COLUMN gen_table_info.table_comment IS '功能名';
+COMMENT ON COLUMN gen_table_info.author IS '作者';
+COMMENT ON COLUMN gen_table_info.email IS '邮箱';
+COMMENT ON COLUMN gen_table_info.package_name IS '项目包名';
+COMMENT ON COLUMN gen_table_info.version IS '项目版本号';
+COMMENT ON COLUMN gen_table_info.backend_path IS '后端生成路径';
+COMMENT ON COLUMN gen_table_info.frontend_path IS '前端生成路径';
+COMMENT ON COLUMN gen_table_info.module_name IS '模块名';
+COMMENT ON COLUMN gen_table_info.sub_module_name IS '子模块名';
+COMMENT ON COLUMN gen_table_info.datasource_id IS '数据源ID';
+COMMENT ON COLUMN gen_table_info.baseclass_id IS '基类ID';
+COMMENT ON COLUMN gen_table_info.create_date IS '创建时间';
+
+
+CREATE TABLE gen_table_field (
+    id NUMBER(20, 0) NOT NULL,
+    table_id NUMBER(20, 0),
+    table_name varchar2(200),
+    column_name varchar2(200),
+    column_type varchar2(200),
+    column_comment varchar2(200),
+    attr_name varchar2(200),
+    attr_type varchar2(200),
+    package_name varchar2(200),
+    is_pk NUMBER(2, 0),
+    is_required NUMBER(2, 0),
+    is_form NUMBER(2, 0),
+    is_list NUMBER(2, 0),
+    is_query NUMBER(2, 0),
+    query_type varchar2(200),
+    form_type varchar2(200),
+    dict_name varchar2(200),
+    validator_type varchar2(200),
+    sort NUMBER(10, 0),
+    primary key (id)
+);
+
+CREATE INDEX idx_gen_table_field_table_name on gen_table_field(table_name);
+
+COMMENT ON TABLE gen_table_field IS '代码生成表列';
+COMMENT ON COLUMN gen_table_field.id IS 'id';
+COMMENT ON COLUMN gen_table_field.table_id IS '表ID';
+COMMENT ON COLUMN gen_table_field.table_name IS '表名';
+COMMENT ON COLUMN gen_table_field.column_name IS '列名';
+COMMENT ON COLUMN gen_table_field.column_type IS '类型';
+COMMENT ON COLUMN gen_table_field.column_comment IS '列说明';
+COMMENT ON COLUMN gen_table_field.attr_name IS '属性名';
+COMMENT ON COLUMN gen_table_field.attr_type IS '属性类型';
+COMMENT ON COLUMN gen_table_field.package_name IS '属性包名';
+COMMENT ON COLUMN gen_table_field.is_pk IS '是否主键 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_required IS '是否必填 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_form IS '是否表单字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_list IS '是否列表字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_query IS '是否查询字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.query_type IS '查询方式';
+COMMENT ON COLUMN gen_table_field.form_type IS '表单类型';
+COMMENT ON COLUMN gen_table_field.dict_name IS '字典名称';
+COMMENT ON COLUMN gen_table_field.validator_type IS '效验方式';
+COMMENT ON COLUMN gen_table_field.sort IS '排序';
+
+CREATE TABLE gen_template (
+    id NUMBER(20, 0) NOT NULL,
+    name varchar2(200),
+    file_name varchar2(200),
+    content clob,
+    path varchar2(500),
+    status NUMBER(2, 0),
+    create_date date,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_template IS '模板管理';
+COMMENT ON COLUMN gen_template.id IS 'id';
+COMMENT ON COLUMN gen_template.name IS '名称';
+COMMENT ON COLUMN gen_template.file_name IS '文件名';
+COMMENT ON COLUMN gen_template.content IS '内容';
+COMMENT ON COLUMN gen_template.path IS '生成路径';
+COMMENT ON COLUMN gen_template.status IS '状态  0：启用   1：禁用';
+COMMENT ON COLUMN gen_template.create_date IS '创建时间';
+
+
+CREATE TABLE gen_test_data (
+    id NUMBER(20, 0) NOT NULL,
+    username varchar2(50),
+    real_name varchar2(50),
+    gender NUMBER(2, 0),
+    email varchar2(100),
+    notice_type NUMBER(2, 0),
+    content clob,
+    creator NUMBER(20, 0),
+    create_date date,
+    updater NUMBER(20, 0),
+    update_date date,
+    PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE gen_test_data IS '测试功能';
+COMMENT ON COLUMN gen_test_data.id IS 'id';
+COMMENT ON COLUMN gen_test_data.username IS '用户名';
+COMMENT ON COLUMN gen_test_data.real_name IS '姓名';
+COMMENT ON COLUMN gen_test_data.gender IS '性别';
+COMMENT ON COLUMN gen_test_data.email IS '邮箱';
+COMMENT ON COLUMN gen_test_data.notice_type IS '类型';
+COMMENT ON COLUMN gen_test_data.content IS '内容';
+COMMENT ON COLUMN gen_test_data.creator IS '创建者';
+COMMENT ON COLUMN gen_test_data.create_date IS '创建时间';
+COMMENT ON COLUMN gen_test_data.updater IS '更新者';
+COMMENT ON COLUMN gen_test_data.update_date IS '更新时间';
+
+
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850622416084993, 0, '', '', 0, 'icon-rocket', 3, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850783288614913, 1305532398162145281, 'devtools/datasource', '', 0, 'icon-sync', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302862890696564738, 1305532398162145281, 'devtools/fieldtype', '', 0, 'icon-eye', 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302874751835848705, 1305532398162145281, 'devtools/baseclass', '', 0, 'icon-info-circle', 3, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304081184014635010, 1305532398162145281, 'devtools/template', '', 0, 'icon-up-circle', 3, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304802103569809410, 1302850622416084993, 'devtools/generator', '', 0, 'icon-tags', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305513187675144193, 1305532398162145281, 'devtools/param', '', 0, 'icon-setting', 5, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305532398162145281, 1302850622416084993, '', '', 0, 'icon-setting', 3, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', 'DevTools', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '开发者工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '開發者工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', 'DataSource', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '数据源管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '數據源管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', 'Field Management', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', 'BaseClass', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基类管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基類管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', 'Template', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', 'Code Generation', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代码生成工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代碼生成工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', 'Parameter Config', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '参数配置', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '參數配置', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', 'Config Info', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
+
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.eitc","version":"3.0","author":"Mark","email":"eitc@163.com","backendPath":"D:\\adminio\\eitc-erm-tenant\\eitc-admin","frontendPath":"D:\\adminio\\eitc-erm-tenant-admin"}', 0, '代码生成器配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', CURRENT_DATE);
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'admin', '123456', 0, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453660052090881, 'smallint', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453722136178689, 'mediumint', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453808874385409, 'int', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453849735294977, 'integer', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453895029583873, 'bigint', 'Long', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453931373228033, 'float', 'Float', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453967880450050, 'double', 'Double', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454047601586177, 'decimal', 'BigDecimal', 'java.math.BigDecimal', CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454090760974338, 'bit', 'Boolean', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454147010785282, 'char', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454183136325633, 'varchar', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454312664821761, 'tinytext', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454343820111874, 'text', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454372077137921, 'mediumtext', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454401378545665, 'longtext', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454486267064322, 'timestamp', 'Date', 'java.util.Date', CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454630295269378, 'NUMBER', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454715645161474, 'BINARY_INTEGER', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454778828156930, 'BINARY_FLOAT', 'Float', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454828987838466, 'BINARY_DOUBLE', 'Double', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454885745160193, 'VARCHAR2', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454919756771329, 'NVARCHAR', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454952568811521, 'NVARCHAR2', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454986349735938, 'CLOB', 'String', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455109695827970, 'int8', 'Long', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455153002016770, 'int4', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, CURRENT_DATE);
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', CURRENT_DATE);
+
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'eitc@163.com', 'com.eitc', '3.0', 'D:\\adminio\\eitc-erm-tenant\\eitc-admin', 'D:\\adminio\\eitc-erm-tenant-admin', 'gen', NULL, 0, 1302875019642159105, CURRENT_DATE);
+
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773762, 1308327671447859201, 'gen_test_data', 'real_name', 'VARCHAR', '姓名', 'realName', 'String', NULL, 0, 1, 1, 1, 0, 'like', 'text', NULL, NULL, 2);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773763, 1308327671447859201, 'gen_test_data', 'gender', 'TINYINT', '性别', 'gender', 'Integer', NULL, 0, 1, 1, 1, 1, '=', 'select', 'gender', NULL, 3);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773764, 1308327671447859201, 'gen_test_data', 'email', 'VARCHAR', '邮箱', 'email', 'String', NULL, 0, 1, 1, 1, 0, '=', 'text', NULL, NULL, 4);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968065, 1308327671447859201, 'gen_test_data', 'notice_type', 'TINYINT', '类型', 'noticeType', 'Integer', NULL, 0, 1, 1, 1, 0, '=', 'radio', 'notice_type', NULL, 5);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968066, 1308327671447859201, 'gen_test_data', 'content', 'TEXT', '内容', 'content', 'String', NULL, 0, 1, 1, 0, 0, '=', 'editor', NULL, NULL, 6);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968067, 1308327671447859201, 'gen_test_data', 'creator', 'BIGINT', '创建者', 'creator', 'Long', NULL, 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 7);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968068, 1308327671447859201, 'gen_test_data', 'create_date', 'DATETIME', '创建时间', 'createDate', 'Date', 'java.util.Date', 0, 0, 0, 1, 1, '=', 'date', NULL, NULL, 8);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968069, 1308327671447859201, 'gen_test_data', 'updater', 'BIGINT', '更新者', 'updater', 'Long', NULL, 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 9);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671523356674, 1308327671447859201, 'gen_test_data', 'update_date', 'DATETIME', '更新时间', 'updateDate', 'Date', 'java.util.Date', 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 10);
+
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1144564443498168321, 'Entity.java', '${ClassName}Entity.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/entity/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1151104918417948674, 'Dao.java', '${ClassName}Dao.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dao/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222102542519422977, 'Dao.xml', '${ClassName}Dao.xml', '', '${backendPath}/src/main/resources/mapper/${moduleName}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811087900602369, 'Service.java', '${ClassName}Service.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811738672033793, 'ServiceImpl.java', '${ClassName}ServiceImpl.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}/impl', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222814109661753346, 'Excel.java', '${ClassName}Excel.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/excel/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222816187301851138, 'DTO.java', '${ClassName}DTO.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dto/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222817622663983106, 'Controller.java', '${ClassName}Controller.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/controller/${subModuleName!}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, CURRENT_DATE);
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, CURRENT_DATE);
+
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@admin.163.com', 0, '<p>智汇口腔代码生成器！</p>', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);

eitc-admin/db/generator/postgresql.sql

@@ -0,0 +1,297 @@
+CREATE TABLE gen_datasource (
+    id int8 NOT NULL,
+    db_type varchar(200),
+    conn_name varchar(200),
+    conn_url varchar(500),
+    username varchar(200),
+    password varchar(200),
+    status int,
+    create_date timestamp,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_datasource IS '数据源管理';
+COMMENT ON COLUMN gen_datasource.id IS 'id';
+COMMENT ON COLUMN gen_datasource.db_type IS '数据库类型 MySQL、Oracle、SQLServer、PostgreSQL';
+COMMENT ON COLUMN gen_datasource.conn_name IS '连接名';
+COMMENT ON COLUMN gen_datasource.conn_url IS 'URL';
+COMMENT ON COLUMN gen_datasource.username IS '用户名';
+COMMENT ON COLUMN gen_datasource.password IS '密码';
+COMMENT ON COLUMN gen_datasource.status IS '状态  0：启用   1：禁用';
+COMMENT ON COLUMN gen_datasource.create_date IS '创建时间';
+
+
+
+CREATE TABLE gen_field_type (
+    id int8 NOT NULL,
+    column_type varchar(200),
+    attr_type varchar(200),
+    package_name varchar(200),
+    create_date timestamp,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_field_type_column_type on gen_field_type(column_type);
+
+COMMENT ON TABLE gen_field_type IS '字段类型管理';
+COMMENT ON COLUMN gen_field_type.id IS 'id';
+COMMENT ON COLUMN gen_field_type.column_type IS '字段类型';
+COMMENT ON COLUMN gen_field_type.attr_type IS '属性类型';
+COMMENT ON COLUMN gen_field_type.package_name IS '属性包名';
+COMMENT ON COLUMN gen_field_type.create_date IS '创建时间';
+
+
+CREATE TABLE gen_base_class (
+    id int8 NOT NULL,
+    package_name varchar(200),
+    code varchar(200),
+    fields varchar(200),
+    remark varchar(200),
+    create_date timestamp,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_base_class IS '基类管理';
+COMMENT ON COLUMN gen_base_class.id IS 'id';
+COMMENT ON COLUMN gen_base_class.package_name IS '基类包名';
+COMMENT ON COLUMN gen_base_class.code IS '基类编码';
+COMMENT ON COLUMN gen_base_class.fields IS '基类字段，多个用英文逗号分隔';
+COMMENT ON COLUMN gen_base_class.remark IS '备注';
+COMMENT ON COLUMN gen_base_class.create_date IS '创建时间';
+
+
+CREATE TABLE gen_table_info (
+    id int8 NOT NULL,
+    table_name varchar(200),
+    class_name varchar(200),
+    table_comment varchar(200),
+    author varchar(200),
+    email varchar(200),
+    package_name varchar(200),
+    version varchar(200),
+    backend_path varchar(500),
+    frontend_path varchar(500),
+    module_name varchar(200),
+    sub_module_name varchar(200),
+    datasource_id int8,
+    baseclass_id int8,
+    create_date timestamp,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_table_info_table_name on gen_table_info(table_name);
+
+COMMENT ON TABLE gen_table_info IS '代码生成表';
+COMMENT ON COLUMN gen_table_info.id IS 'id';
+COMMENT ON COLUMN gen_table_info.table_name IS '表名';
+COMMENT ON COLUMN gen_table_info.class_name IS '类名';
+COMMENT ON COLUMN gen_table_info.column_comment IS '功能名';
+COMMENT ON COLUMN gen_table_info.author IS '作者';
+COMMENT ON COLUMN gen_table_info.email IS '邮箱';
+COMMENT ON COLUMN gen_table_info.package_name IS '项目包名';
+COMMENT ON COLUMN gen_table_info.version IS '项目版本号';
+COMMENT ON COLUMN gen_table_info.backend_path IS '后端生成路径';
+COMMENT ON COLUMN gen_table_info.frontend_path IS '前端生成路径';
+COMMENT ON COLUMN gen_table_info.module_name IS '模块名';
+COMMENT ON COLUMN gen_table_info.sub_module_name IS '子模块名';
+COMMENT ON COLUMN gen_table_info.datasource_id IS '数据源ID';
+COMMENT ON COLUMN gen_table_info.baseclass_id IS '基类ID';
+COMMENT ON COLUMN gen_table_info.create_date IS '创建时间';
+
+
+CREATE TABLE gen_table_field (
+    id int8 NOT NULL,
+    table_id int8,
+    table_name varchar(200),
+    column_name varchar(200),
+    column_type varchar(200),
+    column_comment varchar(200),
+    attr_name varchar(200),
+    attr_type varchar(200),
+    package_name varchar(200),
+    is_pk boolean,
+    is_required boolean,
+    is_form boolean,
+    is_list boolean,
+    is_query boolean,
+    query_type varchar(200),
+    form_type varchar(200),
+    dict_name varchar(200),
+    validator_type varchar(200),
+    sort int,
+    primary key (id)
+);
+
+CREATE INDEX idx_gen_table_field_table_name on gen_table_field(table_name);
+
+COMMENT ON TABLE gen_table_field IS '代码生成表列';
+COMMENT ON COLUMN gen_table_field.id IS 'id';
+COMMENT ON COLUMN gen_table_field.table_id IS '表ID';
+COMMENT ON COLUMN gen_table_field.table_name IS '表名';
+COMMENT ON COLUMN gen_table_field.column_name IS '列名';
+COMMENT ON COLUMN gen_table_field.column_type IS '类型';
+COMMENT ON COLUMN gen_table_field.column_comment IS '列说明';
+COMMENT ON COLUMN gen_table_field.attr_name IS '属性名';
+COMMENT ON COLUMN gen_table_field.attr_type IS '属性类型';
+COMMENT ON COLUMN gen_table_field.package_name IS '属性包名';
+COMMENT ON COLUMN gen_table_field.is_pk IS '是否主键 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_required IS '是否必填 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_form IS '是否表单字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_list IS '是否列表字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.is_query IS '是否查询字段 0：否  1：是';
+COMMENT ON COLUMN gen_table_field.query_type IS '查询方式';
+COMMENT ON COLUMN gen_table_field.form_type IS '表单类型';
+COMMENT ON COLUMN gen_table_field.dict_name IS '字典名称';
+COMMENT ON COLUMN gen_table_field.validator_type IS '效验方式';
+COMMENT ON COLUMN gen_table_field.sort IS '排序';
+
+CREATE TABLE gen_template (
+    id int8 NOT NULL,
+    name varchar(200),
+    file_name varchar(200),
+    content text,
+    path varchar(500),
+    status int,
+    create_date timestamp,
+    primary key (id)
+);
+
+COMMENT ON TABLE gen_template IS '模板管理';
+COMMENT ON COLUMN gen_template.id IS 'id';
+COMMENT ON COLUMN gen_template.name IS '名称';
+COMMENT ON COLUMN gen_template.file_name IS '文件名';
+COMMENT ON COLUMN gen_template.content IS '内容';
+COMMENT ON COLUMN gen_template.path IS '生成路径';
+COMMENT ON COLUMN gen_template.status IS '状态  0：启用   1：禁用';
+COMMENT ON COLUMN gen_template.create_date IS '创建时间';
+
+
+CREATE TABLE gen_test_data (
+    id int8 NOT NULL,
+    username varchar(50),
+    real_name varchar(50),
+    gender int,
+    email varchar(100),
+    notice_type int,
+    content text,
+    creator int8,
+    create_date timestamp,
+    updater int8,
+    update_date timestamp,
+    PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE gen_test_data IS '测试功能';
+COMMENT ON COLUMN gen_test_data.id IS 'id';
+COMMENT ON COLUMN gen_test_data.username IS '用户名';
+COMMENT ON COLUMN gen_test_data.real_name IS '姓名';
+COMMENT ON COLUMN gen_test_data.gender IS '性别';
+COMMENT ON COLUMN gen_test_data.email IS '邮箱';
+COMMENT ON COLUMN gen_test_data.notice_type IS '类型';
+COMMENT ON COLUMN gen_test_data.content IS '内容';
+COMMENT ON COLUMN gen_test_data.creator IS '创建者';
+COMMENT ON COLUMN gen_test_data.create_date IS '创建时间';
+COMMENT ON COLUMN gen_test_data.updater IS '更新者';
+COMMENT ON COLUMN gen_test_data.update_date IS '更新时间';
+
+
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850622416084993, 0, '', '', 0, 'icon-rocket', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850783288614913, 1305532398162145281, 'devtools/datasource', '', 0, 'icon-sync', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302862890696564738, 1305532398162145281, 'devtools/fieldtype', '', 0, 'icon-eye', 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302874751835848705, 1305532398162145281, 'devtools/baseclass', '', 0, 'icon-info-circle', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304081184014635010, 1305532398162145281, 'devtools/template', '', 0, 'icon-up-circle', 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304802103569809410, 1302850622416084993, 'devtools/generator', '', 0, 'icon-tags', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305513187675144193, 1305532398162145281, 'devtools/param', '', 0, 'icon-setting', 5, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305532398162145281, 1302850622416084993, '', '', 0, 'icon-setting', 3, 1067246875800000001, now(), 1067246875800000001, now());
+
+
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', 'DevTools', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '开发者工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '開發者工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', 'DataSource', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '数据源管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '數據源管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', 'Field Management', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', 'BaseClass', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基类管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基類管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', 'Template', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', 'Code Generation', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代码生成工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代碼生成工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', 'Parameter Config', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '参数配置', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '參數配置', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', 'Config Info', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
+
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.eitc","version":"3.0","author":"Mark","email":"eitc@163.com","backendPath":"D:\\adminio\\eitc-erm-tenant\\eitc-admin","frontendPath":"D:\\adminio\\eitc-erm-tenant-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', now());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'admin', '123456', 0, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453660052090881, 'smallint', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453722136178689, 'mediumint', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453808874385409, 'int', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453849735294977, 'integer', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453895029583873, 'bigint', 'Long', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453931373228033, 'float', 'Float', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453967880450050, 'double', 'Double', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454047601586177, 'decimal', 'BigDecimal', 'java.math.BigDecimal', now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454090760974338, 'bit', 'Boolean', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454147010785282, 'char', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454183136325633, 'varchar', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454312664821761, 'tinytext', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454343820111874, 'text', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454372077137921, 'mediumtext', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454401378545665, 'longtext', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454486267064322, 'timestamp', 'Date', 'java.util.Date', now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454630295269378, 'NUMBER', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454715645161474, 'BINARY_INTEGER', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454778828156930, 'BINARY_FLOAT', 'Float', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454828987838466, 'BINARY_DOUBLE', 'Double', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454885745160193, 'VARCHAR2', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454919756771329, 'NVARCHAR', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454952568811521, 'NVARCHAR2', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454986349735938, 'CLOB', 'String', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455109695827970, 'int8', 'Long', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455153002016770, 'int4', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, now());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', now());
+
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'eitc@163.com', 'com.eitc', '3.0', 'D:\\adminio\\eitc-erm-tenant\\eitc-admin', 'D:\\adminio\\eitc-erm-tenant-admin', 'gen', NULL, 0, 1302875019642159105, now());
+
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, true, false, false, false, false, '=', 'text', NULL, NULL, 0);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, false, true, true, true, true, 'like', 'text', NULL, NULL, 1);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773762, 1308327671447859201, 'gen_test_data', 'real_name', 'VARCHAR', '姓名', 'realName', 'String', NULL, false, true, true, true, false, 'like', 'text', NULL, NULL, 2);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773763, 1308327671447859201, 'gen_test_data', 'gender', 'TINYINT', '性别', 'gender', 'Integer', NULL, false, true, true, true, true, '=', 'select', 'gender', NULL, 3);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773764, 1308327671447859201, 'gen_test_data', 'email', 'VARCHAR', '邮箱', 'email', 'String', NULL, false, true, true, true, false, '=', 'text', NULL, NULL, 4);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968065, 1308327671447859201, 'gen_test_data', 'notice_type', 'TINYINT', '类型', 'noticeType', 'Integer', NULL, false, true, true, true, false, '=', 'radio', 'notice_type', NULL, 5);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968066, 1308327671447859201, 'gen_test_data', 'content', 'TEXT', '内容', 'content', 'String', NULL, false, true, true, false, false, '=', 'editor', NULL, NULL, 6);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968067, 1308327671447859201, 'gen_test_data', 'creator', 'BIGINT', '创建者', 'creator', 'Long', NULL, false, false, false, false, false, '=', 'text', NULL, NULL, 7);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968068, 1308327671447859201, 'gen_test_data', 'create_date', 'DATETIME', '创建时间', 'createDate', 'Date', 'java.util.Date', false, false, false, true, true, '=', 'date', NULL, NULL, 8);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968069, 1308327671447859201, 'gen_test_data', 'updater', 'BIGINT', '更新者', 'updater', 'Long', NULL, false, false, false, false, false, '=', 'text', NULL, NULL, 9);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671523356674, 1308327671447859201, 'gen_test_data', 'update_date', 'DATETIME', '更新时间', 'updateDate', 'Date', 'java.util.Date', false, false, false, false, false, '=', 'text', NULL, NULL, 10);
+
+
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1144564443498168321, 'Entity.java', '${ClassName}Entity.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/entity/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1151104918417948674, 'Dao.java', '${ClassName}Dao.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dao/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222102542519422977, 'Dao.xml', '${ClassName}Dao.xml', '', '${backendPath}/src/main/resources/mapper/${moduleName}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811087900602369, 'Service.java', '${ClassName}Service.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811738672033793, 'ServiceImpl.java', '${ClassName}ServiceImpl.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}/impl', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222814109661753346, 'Excel.java', '${ClassName}Excel.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/excel/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222816187301851138, 'DTO.java', '${ClassName}DTO.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dto/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222817622663983106, 'Controller.java', '${ClassName}Controller.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/controller/${subModuleName!}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, now());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, now());
+
+
+
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@admin.163.com', 0, '<p>智汇口腔代码生成器！</p>', 1067246875800000001, now(), 1067246875800000001, now());

eitc-admin/db/generator/sqlserver.sql

@@ -0,0 +1,209 @@
+CREATE TABLE gen_datasource (
+    id bigint NOT NULL,
+    db_type varchar(200),
+    conn_name varchar(200),
+    conn_url varchar(500),
+    username varchar(200),
+    password varchar(200),
+    status int,
+    create_date datetime,
+    primary key (id)
+);
+
+
+CREATE TABLE gen_field_type (
+    id bigint NOT NULL,
+    column_type varchar(200),
+    attr_type varchar(200),
+    package_name varchar(200),
+    create_date datetime,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_field_type_column_type on gen_field_type(column_type);
+
+
+CREATE TABLE gen_base_class (
+    id bigint NOT NULL,
+    package_name varchar(200),
+    code varchar(200),
+    fields varchar(200),
+    remark varchar(200),
+    create_date datetime,
+    primary key (id)
+);
+
+
+CREATE TABLE gen_table_info (
+    id bigint NOT NULL,
+    table_name varchar(200),
+    class_name varchar(200),
+    table_comment varchar(200),
+    author varchar(200),
+    email varchar(200),
+    package_name varchar(200),
+    version varchar(200),
+    backend_path varchar(500),
+    frontend_path varchar(500),
+    module_name varchar(200),
+    sub_module_name varchar(200),
+    datasource_id bigint,
+    baseclass_id bigint,
+    create_date datetime,
+    primary key (id)
+);
+
+CREATE UNIQUE INDEX uk_gen_table_info_table_name on gen_table_info(table_name);
+
+
+CREATE TABLE gen_table_field (
+    id bigint NOT NULL,
+    table_id bigint,
+    table_name varchar(200),
+    column_name varchar(200),
+    column_type varchar(200),
+    column_comment varchar(200),
+    attr_name varchar(200),
+    attr_type varchar(200),
+    package_name varchar(200),
+    is_pk int,
+    is_required int,
+    is_form int,
+    is_list int,
+    is_query int,
+    query_type varchar(200),
+    form_type varchar(200),
+    dict_name varchar(200),
+    validator_type varchar(200),
+    sort int,
+    primary key (id)
+);
+
+CREATE INDEX idx_gen_table_field_table_name on gen_table_field(table_name);
+
+
+CREATE TABLE gen_template (
+    id bigint NOT NULL,
+    name varchar(200),
+    file_name varchar(200),
+    content text,
+    path varchar(500),
+    status int,
+    create_date datetime,
+    primary key (id)
+);
+
+
+CREATE TABLE gen_test_data (
+    id bigint NOT NULL,
+    username varchar(50),
+    real_name varchar(50),
+    gender int,
+    email varchar(100),
+    notice_type int,
+    content text,
+    creator bigint,
+    create_date datetime,
+    updater bigint,
+    update_date datetime,
+    PRIMARY KEY (id)
+);
+
+
+
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850622416084993, 0, '', '', 0, 'icon-rocket', 3, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302850783288614913, 1305532398162145281, 'devtools/datasource', '', 0, 'icon-sync', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302862890696564738, 1305532398162145281, 'devtools/fieldtype', '', 0, 'icon-eye', 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1302874751835848705, 1305532398162145281, 'devtools/baseclass', '', 0, 'icon-info-circle', 3, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304081184014635010, 1305532398162145281, 'devtools/template', '', 0, 'icon-up-circle', 3, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1304802103569809410, 1302850622416084993, 'devtools/generator', '', 0, 'icon-tags', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305513187675144193, 1305532398162145281, 'devtools/param', '', 0, 'icon-setting', 5, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_menu(id, pid, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1305532398162145281, 1302850622416084993, '', '', 0, 'icon-setting', 3, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', 'DevTools', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '开发者工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850622416084993, 'name', '開發者工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', 'DataSource', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '数据源管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302850783288614913, 'name', '數據源管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', 'Field Management', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', 'BaseClass', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基类管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1302874751835848705, 'name', '基類管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', 'Template', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', 'Code Generation', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代码生成工具', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1304802103569809410, 'name', '代碼生成工具', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', 'Parameter Config', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '参数配置', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305513187675144193, 'name', '參數配置', 'zh-TW');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', 'Config Info', 'en-US');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
+INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
+
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.eitc","version":"3.0","author":"Mark","email":"eitc@163.com","backendPath":"D:\\adminio\\eitc-erm-tenant\\eitc-admin","frontendPath":"D:\\adminio\\eitc-erm-tenant-admin"}', 0, '代码生成器配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', getdate());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'admin', '123456', 0, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453660052090881, 'smallint', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453722136178689, 'mediumint', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453808874385409, 'int', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453849735294977, 'integer', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453895029583873, 'bigint', 'Long', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453931373228033, 'float', 'Float', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453967880450050, 'double', 'Double', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454047601586177, 'decimal', 'BigDecimal', 'java.math.BigDecimal', getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454090760974338, 'bit', 'Boolean', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454147010785282, 'char', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454183136325633, 'varchar', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454312664821761, 'tinytext', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454343820111874, 'text', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454372077137921, 'mediumtext', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454401378545665, 'longtext', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454486267064322, 'timestamp', 'Date', 'java.util.Date', getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454630295269378, 'NUMBER', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454715645161474, 'BINARY_INTEGER', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454778828156930, 'BINARY_FLOAT', 'Float', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454828987838466, 'BINARY_DOUBLE', 'Double', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454885745160193, 'VARCHAR2', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454919756771329, 'NVARCHAR', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454952568811521, 'NVARCHAR2', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152454986349735938, 'CLOB', 'String', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455109695827970, 'int8', 'Long', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455153002016770, 'int4', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, getdate());
+INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', getdate());
+
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'eitc@163.com', 'com.eitc', '3.0', 'D:\\adminio\\eitc-erm-tenant\\eitc-admin', 'D:\\adminio\\eitc-erm-tenant-admin', 'gen', NULL, 0, 1302875019642159105, getdate());
+
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773762, 1308327671447859201, 'gen_test_data', 'real_name', 'VARCHAR', '姓名', 'realName', 'String', NULL, 0, 1, 1, 1, 0, 'like', 'text', NULL, NULL, 2);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773763, 1308327671447859201, 'gen_test_data', 'gender', 'TINYINT', '性别', 'gender', 'Integer', NULL, 0, 1, 1, 1, 1, '=', 'select', 'gender', NULL, 3);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773764, 1308327671447859201, 'gen_test_data', 'email', 'VARCHAR', '邮箱', 'email', 'String', NULL, 0, 1, 1, 1, 0, '=', 'text', NULL, NULL, 4);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968065, 1308327671447859201, 'gen_test_data', 'notice_type', 'TINYINT', '类型', 'noticeType', 'Integer', NULL, 0, 1, 1, 1, 0, '=', 'radio', 'notice_type', NULL, 5);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968066, 1308327671447859201, 'gen_test_data', 'content', 'TEXT', '内容', 'content', 'String', NULL, 0, 1, 1, 0, 0, '=', 'editor', NULL, NULL, 6);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968067, 1308327671447859201, 'gen_test_data', 'creator', 'BIGINT', '创建者', 'creator', 'Long', NULL, 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 7);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968068, 1308327671447859201, 'gen_test_data', 'create_date', 'DATETIME', '创建时间', 'createDate', 'Date', 'java.util.Date', 0, 0, 0, 1, 1, '=', 'date', NULL, NULL, 8);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671514968069, 1308327671447859201, 'gen_test_data', 'updater', 'BIGINT', '更新者', 'updater', 'Long', NULL, 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 9);
+INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671523356674, 1308327671447859201, 'gen_test_data', 'update_date', 'DATETIME', '更新时间', 'updateDate', 'Date', 'java.util.Date', 0, 0, 0, 0, 0, '=', 'text', NULL, NULL, 10);
+
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1144564443498168321, 'Entity.java', '${ClassName}Entity.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/entity/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1151104918417948674, 'Dao.java', '${ClassName}Dao.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dao/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222102542519422977, 'Dao.xml', '${ClassName}Dao.xml', '', '${backendPath}/src/main/resources/mapper/${moduleName}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811087900602369, 'Service.java', '${ClassName}Service.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222811738672033793, 'ServiceImpl.java', '${ClassName}ServiceImpl.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/service/${subModuleName!}/impl', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222814109661753346, 'Excel.java', '${ClassName}Excel.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/excel/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222816187301851138, 'DTO.java', '${ClassName}DTO.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/dto/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1222817622663983106, 'Controller.java', '${ClassName}Controller.java', '', '${backendPath}/src/main/java/${packagePath}/modules/${moduleName}/controller/${subModuleName!}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, getdate());
+INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/modules/${moduleName}', 0, getdate());
+
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@admin.163.com', 0, '<p>智汇口腔代码生成器！</p>', 1067246875800000001, getdate(), 1067246875800000001, getdate());

eitc-admin/db/generator/template/add-or-update.vue.ftl

@@ -0,0 +1,241 @@
+<#assign editor=false/>
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.${pk.attrName} ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+<#list columnList as column>
+  <#if column.form>
+      <#if column.formType == 'text'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-input v-model="dataForm.${column.attrName}" placeholder="${column.comment!}"></el-input>
+      </el-form-item>
+      <#elseif column.formType == 'textarea'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-input type="textarea" v-model="dataForm.${column.attrName}"></el-input>
+      </el-form-item>
+      <#elseif column.formType == 'editor'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <!-- 富文本编辑器, 容器 -->
+        <div id="J_quillEditor"></div>
+        <!-- 自定义上传图片功能 (使用element upload组件) -->
+        <el-upload
+          :action="uploadUrl"
+          :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle"
+          :on-success="uploadSuccessHandle"
+          style="display: none;">
+          <el-button ref="uploadBtn" type="primary" size="small">{{ $t('upload.button') }}</el-button>
+        </el-upload>
+      </el-form-item>
+      <#assign editor=true/>
+      <#assign editorName="${column.attrName}"/>
+      <#elseif column.formType == 'select'>
+      <#if column.dictName??>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <ren-select v-model="dataForm.${column.attrName}" dict-type="${column.dictName}" placeholder="${column.comment!}"></ren-select>
+      </el-form-item>
+      <#else>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-select v-model="dataForm.${column.attrName}" placeholder="请选择">
+          <el-option label="智汇口腔" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      </#if>
+      <#elseif column.formType == 'radio'>
+      <#if column.dictName??>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <ren-radio-group v-model="dataForm.${column.attrName}" dict-type="${column.dictName}"></ren-radio-group>
+      </el-form-item>
+      <#else>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-radio-group v-model="dataForm.${column.attrName}">
+          <el-radio :label="0">启用</el-radio>
+          <el-radio :label="1">禁用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      </#if>
+      <#elseif column.formType == 'checkbox'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-checkbox-group v-model="dataForm.${column.attrName}">
+          <el-checkbox label="启用" name="type"></el-checkbox>
+          <el-checkbox label="禁用" name="type"></el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <#elseif column.formType == 'date'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-date-picker type="date" placeholder="${column.comment!}" v-model="dataForm.${column.attrName}"></el-date-picker>
+      </el-form-item>
+      <#elseif column.formType == 'datetime'>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-date-picker type="datetime" placeholder="${column.comment!}" v-model="dataForm.${column.attrName}"></el-date-picker>
+      </el-form-item>
+      <#else>
+      <el-form-item label="${column.comment!}" prop="${column.attrName}">
+        <el-input v-model="dataForm.${column.attrName}" placeholder="${column.comment!}"></el-input>
+      </el-form-item>
+      </#if>
+  </#if>
+</#list>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+<#if editor>
+import Cookies from 'js-cookie'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+</#if>
+export default {
+  data () {
+    return {
+      visible: false,
+      <#if editor>
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ 'header': 1 }, { 'header': 2 }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+        [{ 'script': 'sub' }, { 'script': 'super' }],
+        [{ 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'direction': 'rtl' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }],
+        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+        [{ 'color': [] }, { 'background': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      </#if>
+      dataForm: {
+<#list columnList as column>
+        ${column.attrName}: '',
+</#list>
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      <#if editor>
+      const validate${editorName} = (rule, value, callback) => {
+        if (this.quillEditor.getLength() <= 1) {
+          return callback(new Error(this.$t('validate.required')))
+        }
+        callback()
+      }
+      </#if>
+      return {
+<#list columnList as column>
+<#if column.form && column.required>
+        <#if editor && column.attrName == editorName>
+        ${column.attrName}: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { validator: validate${editorName}, trigger: 'blur' }
+        ],
+        <#else>
+        ${column.attrName}: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        </#if>
+</#if>
+</#list>
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        <#if editor>
+        if (this.quillEditor) {
+          this.quillEditor.deleteText(0, this.quillEditor.getLength())
+        } else {
+          this.quillEditorHandle()
+        }
+        </#if>
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.${pk.attrName}) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get('/${moduleName}/${classname}/' + this.dataForm.${pk.attrName}).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        <#if editor>
+        this.quillEditor.root.innerHTML = this.dataForm.${editorName}
+        </#if>
+      }).catch(() => {})
+    },
+    <#if editor>
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      // 自定义上传图片功能 (使用element upload组件)
+      this.uploadUrl = window.SITE_CONFIG['apiURL'] + '/sys/oss/upload?token=' + Cookies.get('token')
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.${editorName} = this.quillEditor.root.innerHTML
+      })
+    },
+    // 上传图片之前
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error('只支持jpg、png、gif格式的图片！')
+        return false
+      }
+    },
+    // 上传图片成功
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.src)
+    },
+    </#if>
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.${pk.attrName} ? 'post' : 'put']('/${moduleName}/${classname}/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

eitc-admin/pom.xml

@@ -0,0 +1,232 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.eitc</groupId>
+		<artifactId>eitc-erm-tenant</artifactId>
+		<version>1.0.1</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>eitc-admin</artifactId>
+	<packaging>jar</packaging>
+	<description>eitc-admin</description>
+
+	<properties>
+		<quartz.version>2.3.0</quartz.version>
+		<shiro.version>1.6.0</shiro.version>
+		<captcha.version>1.6.2</captcha.version>
+		<easyexcel.version>2.2.6</easyexcel.version>
+		<qiniu.version>7.2.27</qiniu.version>
+		<aliyun.oss.version>2.8.3</aliyun.oss.version>
+		<aliyun.core.version>3.2.2</aliyun.core.version>
+		<aliyun.dysmsapi.version>1.1.0</aliyun.dysmsapi.version>
+		<qcloud.cos.version>5.4.4</qcloud.cos.version>
+		<qcloud.qcloudsms.version>1.0.5</qcloud.qcloudsms.version>
+		<fastdfs.version>1.26.2</fastdfs.version>
+		<minio.version>6.0.13</minio.version>
+		<mail.version>1.6.2</mail.version>
+		<freemarker.version>2.3.28</freemarker.version>
+		<activiti.version>5.22.0</activiti.version>
+		<ureport2.version>2.2.9</ureport2.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.eitc</groupId>
+			<artifactId>eitc-common</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.eitc</groupId>
+			<artifactId>eitc-dynamic-datasource</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>${quartz.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.mchange</groupId>
+					<artifactId>c3p0</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.zaxxer</groupId>
+					<artifactId>HikariCP-java6</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.shiro</groupId>
+		    <artifactId>shiro-core</artifactId>
+		    <version>${shiro.version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.shiro</groupId>
+		    <artifactId>shiro-spring</artifactId>
+		    <version>${shiro.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.whvcse</groupId>
+			<artifactId>easy-captcha</artifactId>
+			<version>${captcha.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>${easyexcel.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.qiniu</groupId>
+			<artifactId>qiniu-java-sdk</artifactId>
+			<version>${qiniu.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.aliyun.oss</groupId>
+			<artifactId>aliyun-sdk-oss</artifactId>
+			<version>${aliyun.oss.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.qcloud</groupId>
+			<artifactId>cos_api</artifactId>
+			<version>${qcloud.cos.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>aliyun-java-sdk-core</artifactId>
+			<version>${aliyun.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+			<version>${aliyun.dysmsapi.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.qcloudsms</groupId>
+			<artifactId>qcloudsms</artifactId>
+			<version>${qcloud.qcloudsms.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>javax.mail</artifactId>
+			<version>${mail.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>${freemarker.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.tobato</groupId>
+			<artifactId>fastdfs-client</artifactId>
+			<version>${fastdfs.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.minio</groupId>
+			<artifactId>minio</artifactId>
+			<version>${minio.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+		<!-- activiti -->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring-boot-starter-basic</artifactId>
+			<version>${activiti.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mybatis</groupId>
+					<artifactId>mybatis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-explorer</artifactId>
+			<version>${activiti.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>vaadin</artifactId>
+					<groupId>com.vaadin</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>dcharts-widget</artifactId>
+					<groupId>org.vaadin.addons</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>activiti-simple-workflow</artifactId>
+					<groupId>org.activiti</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>groovy-all</artifactId>
+					<groupId>org.codehaus.groovy</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- 支持JDK11 -->
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>2.4.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-diagram-rest</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-modeler</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<!-- end activiti -->
+		<dependency>
+			<groupId>com.bstek.ureport</groupId>
+			<artifactId>ureport2-console</artifactId>
+			<version>${ureport2.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
+				<configuration>
+					<imageName>eitc/${project.artifactId}</imageName>
+					<dockerDirectory>${project.basedir}/</dockerDirectory>
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

eitc-admin/src/main/java/com/eitc/AdminApplication.java

@@ -0,0 +1,28 @@
+package com.eitc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+
+/**
+ * eitc-admin
+ *
+ * @author Mark eitc@163.com
+ */
+@SpringBootApplication(exclude = {
+	org.activiti.spring.boot.SecurityAutoConfiguration.class,
+	org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
+public class AdminApplication extends SpringBootServletInitializer {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AdminApplication.class, args);
+	}
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(AdminApplication.class);
+	}
+}

eitc-admin/src/main/java/com/eitc/common/annotation/DataFilter.java

@@ -0,0 +1,29 @@
+package com.eitc.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据过滤注解
+ *
+ * @author Mark eitc@163.com
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataFilter {
+    /**
+     * 表的别名
+     */
+    String tableAlias() default "";
+
+    /**
+     * 用户ID
+     */
+    String userId() default "creator";
+
+    /**
+     * 部门ID
+     */
+    String deptId() default "dept_id";
+
+}

eitc-admin/src/main/java/com/eitc/common/annotation/LogOperation.java

@@ -0,0 +1,20 @@
+package com.eitc.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 操作日志注解
+ *
+ * @author Mark eitc@163.com
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface LogOperation {
+
+	String value() default "";
+}

eitc-admin/src/main/java/com/eitc/common/aspect/DataFilterAspect.java

@@ -0,0 +1,100 @@
+package com.eitc.common.aspect;
+
+import cn.hutool.core.collection.CollUtil;
+import com.eitc.common.annotation.DataFilter;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.interceptor.DataScope;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.security.user.UserDetail;
+import com.eitc.modules.sys.enums.SuperAdminEnum;
+import com.eitc.modules.sys.enums.SuperTenantEnum;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据过滤，切面处理类
+ *
+ * @author Mark eitc@163.com
+ */
+@Aspect
+@Component
+public class DataFilterAspect {
+
+    @Pointcut("@annotation(com.eitc.common.annotation.DataFilter)")
+    public void dataFilterCut() {
+
+    }
+
+    @Before("dataFilterCut()")
+    public void dataFilter(JoinPoint point) {
+        Object params = point.getArgs()[0];
+        if(params != null && params instanceof Map){
+            UserDetail user = SecurityUser.getUser();
+
+            //如果是超级管理员或超级租户，则不进行数据过滤
+            if(user.getSuperAdmin() == SuperAdminEnum.YES.value() ||
+                user.getSuperTenant() == SuperTenantEnum.YES.value()) {
+                return ;
+            }
+
+            try {
+                //否则进行数据过滤
+                Map map = (Map)params;
+                String sqlFilter = getSqlFilter(user, point);
+                map.put(Constant.SQL_FILTER, new DataScope(sqlFilter));
+            }catch (Exception e){
+
+            }
+
+            return ;
+        }
+
+        throw new com.eitc.common.exception.RenException(ErrorCode.DATA_SCOPE_PARAMS_ERROR);
+    }
+
+    /**
+     * 获取数据过滤的SQL
+     */
+    private String getSqlFilter(UserDetail user, JoinPoint point) throws Exception {
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = point.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes());
+        DataFilter dataFilter = method.getAnnotation(DataFilter.class);
+
+        //获取表的别名
+        String tableAlias = dataFilter.tableAlias();
+        if(StringUtils.isNotBlank(tableAlias)){
+            tableAlias +=  ".";
+        }
+
+        StringBuilder sqlFilter = new StringBuilder();
+        sqlFilter.append(" (");
+
+        //部门ID列表
+        List<Long> deptIdList = user.getDeptIdList();
+        if(CollUtil.isNotEmpty(deptIdList)){
+            sqlFilter.append(tableAlias).append(dataFilter.deptId());
+
+            sqlFilter.append(" in(").append(StringUtils.join(deptIdList, ",")).append(")");
+        }
+
+        //查询本人数据
+        if(CollUtil.isNotEmpty(deptIdList)){
+            sqlFilter.append(" or ");
+        }
+        sqlFilter.append(tableAlias).append(dataFilter.userId()).append("=").append(user.getId());
+
+        sqlFilter.append(")");
+
+        return sqlFilter.toString();
+    }
+}

eitc-admin/src/main/java/com/eitc/common/aspect/LogOperationAspect.java

@@ -0,0 +1,102 @@
+package com.eitc.common.aspect;
+
+import com.alibaba.fastjson.JSON;
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.utils.HttpContextUtils;
+import com.eitc.common.utils.IpUtils;
+import com.eitc.modules.log.entity.SysLogOperationEntity;
+import com.eitc.modules.log.enums.OperationStatusEnum;
+import com.eitc.modules.log.service.SysLogOperationService;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.security.user.UserDetail;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * 操作日志，切面处理类
+ *
+ * @author Mark eitc@163.com
+ */
+@Aspect
+@Component
+public class LogOperationAspect {
+    @Autowired
+    private SysLogOperationService sysLogOperationService;
+
+    @Pointcut("@annotation(com.eitc.common.annotation.LogOperation)")
+    public void logPointCut() {
+
+    }
+
+    @Around("logPointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        long beginTime = System.currentTimeMillis();
+        try {
+            //执行方法
+            Object result = point.proceed();
+
+            //执行时长(毫秒)
+            long time = System.currentTimeMillis() - beginTime;
+            //保存日志
+            saveLog(point, time, OperationStatusEnum.SUCCESS.value());
+
+            return result;
+        }catch(Exception e) {
+            //执行时长(毫秒)
+            long time = System.currentTimeMillis() - beginTime;
+            //保存日志
+            saveLog(point, time, OperationStatusEnum.FAIL.value());
+
+            throw e;
+        }
+    }
+
+    private void saveLog(ProceedingJoinPoint joinPoint, long time, Integer status) throws Exception {
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes());
+        LogOperation annotation = method.getAnnotation(LogOperation.class);
+
+        SysLogOperationEntity log = new SysLogOperationEntity();
+        if(annotation != null){
+            //注解上的描述
+            log.setOperation(annotation.value());
+        }
+
+        //登录用户信息
+        UserDetail user = SecurityUser.getUser();
+        if(user != null){
+            log.setCreatorName(user.getUsername());
+        }
+
+        log.setStatus(status);
+        log.setRequestTime((int)time);
+
+        //请求相关信息
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        log.setIp(IpUtils.getIpAddr(request));
+        log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+        log.setRequestUri(request.getRequestURI());
+        log.setRequestMethod(request.getMethod());
+
+        //请求参数
+        Object[] args = joinPoint.getArgs();
+        try{
+            String params = JSON.toJSONString(args[0]);
+            log.setRequestParams(params);
+        }catch (Exception e){
+
+        }
+
+        //保存到DB
+        sysLogOperationService.save(log);
+    }
+}

eitc-admin/src/main/java/com/eitc/common/config/MybatisPlusConfig.java

@@ -0,0 +1,36 @@
+package com.eitc.common.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.eitc.common.interceptor.DataFilterInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+/**
+ * mybatis-plus配置
+ *
+ * @author Mark eitc@163.com
+ * @since 1.0.0
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 配置数据权限
+     */
+    @Bean
+    @Order(1)
+    public DataFilterInterceptor dataFilterInterceptor() {
+        return new DataFilterInterceptor();
+    }
+
+    /**
+     * 配置分页
+     */
+    @Bean
+    @Order(0)
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/common/config/SwaggerConfig.java

@@ -0,0 +1,57 @@
+package com.eitc.common.config;
+
+import com.eitc.common.constant.Constant;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+/**
+ * Swagger配置
+ *
+ * @author Mark eitc@163.com
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig{
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+            .apiInfo(apiInfo())
+            .select()
+            //加了ApiOperation注解的类，生成接口文档
+            .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+            //包下的类，生成接口文档
+            //.apis(RequestHandlerSelectors.basePackage("com.eitc.modules.job.controller"))
+            .paths(PathSelectors.any())
+            .build()
+            .directModelSubstitute(java.util.Date.class, String.class)
+            .securitySchemes(security());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+            .title("智汇口腔")
+            .description("eitc-admin文档")
+            .version("2.0.0")
+            .build();
+    }
+
+    private List<ApiKey> security() {
+        return newArrayList(
+            new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
+        );
+    }
+}

eitc-admin/src/main/java/com/eitc/common/context/TenantContext.java

@@ -0,0 +1,29 @@
+package com.eitc.common.context;
+
+import com.eitc.common.utils.HttpContextUtils;
+import com.eitc.modules.security.user.UserDetail;
+import com.eitc.modules.sys.enums.SuperAdminEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 租户
+ *
+ * @author Mark eitc@163.com
+ */
+public class TenantContext {
+
+    public static Long getTenantCode(UserDetail user){
+        if(user.getTenantCode() == null){
+            return null;
+        }
+
+        String tenantCode = HttpContextUtils.getTenantCode();
+        //超级管理员，才可以切换租户
+        if(user.getSuperAdmin() == SuperAdminEnum.YES.value()){
+            if(StringUtils.isNotBlank(tenantCode)){
+                return Long.parseLong(tenantCode);
+            }
+        }
+        return user.getTenantCode();
+    }
+}

eitc-admin/src/main/java/com/eitc/common/exception/RenExceptionHandler.java

@@ -0,0 +1,95 @@
+package com.eitc.common.exception;
+
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
+import com.eitc.common.utils.HttpContextUtils;
+import com.eitc.common.utils.IpUtils;
+import com.eitc.common.utils.Result;
+import com.eitc.modules.log.entity.SysLogErrorEntity;
+import com.eitc.modules.log.service.SysLogErrorService;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+
+/**
+ * 异常处理器
+ *
+ * @author Mark eitc@163.com
+ * @since 1.0.0
+ */
+@RestControllerAdvice
+public class RenExceptionHandler {
+	private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class);
+
+	@Autowired
+	private SysLogErrorService sysLogErrorService;
+
+	/**
+	 * 处理自定义异常
+	 */
+	@ExceptionHandler(RenException.class)
+	public Result handleRenException(RenException ex){
+		Result result = new Result();
+		result.error(ex.getCode(), ex.getMsg());
+
+		return result;
+	}
+
+	@ExceptionHandler(DuplicateKeyException.class)
+	public Result handleDuplicateKeyException(DuplicateKeyException ex){
+		Result result = new Result();
+		result.error(ErrorCode.DB_RECORD_EXISTS);
+
+		return result;
+	}
+
+	@ExceptionHandler(Exception.class)
+	public Result handleException(Exception ex){
+		logger.error(ex.getMessage(), ex);
+
+		saveLog(ex);
+
+		return new Result().error();
+	}
+
+	@ExceptionHandler(UnauthorizedException.class)
+	public Result handleUnauthorizedException(UnauthorizedException ex){
+		Result result = new Result();
+		result.error(ErrorCode.FORBIDDEN);
+
+		return result;
+	}
+
+	/**
+	 * 保存异常日志
+	 */
+	private void saveLog(Exception ex){
+		SysLogErrorEntity log = new SysLogErrorEntity();
+
+		//请求相关信息
+		HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+		log.setIp(IpUtils.getIpAddr(request));
+		log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
+		log.setRequestUri(request.getRequestURI());
+		log.setRequestMethod(request.getMethod());
+		Map<String, String> params = HttpContextUtils.getParameterMap(request);
+		if(MapUtil.isNotEmpty(params)){
+			log.setRequestParams(JSON.toJSONString(params));
+		}
+
+		//异常信息
+		log.setErrorInfo(ExceptionUtils.getErrorStackTrace(ex));
+
+		//保存
+		sysLogErrorService.save(log);
+	}
+}

eitc-admin/src/main/java/com/eitc/common/handler/FieldMetaObjectHandler.java

@@ -0,0 +1,56 @@
+package com.eitc.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.eitc.common.context.TenantContext;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.security.user.UserDetail;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 公共字段，自动填充值
+ *
+ * @author Mark eitc@163.com
+ */
+@Component
+public class FieldMetaObjectHandler implements MetaObjectHandler {
+    private final static String CREATE_DATE = "createDate";
+    private final static String CREATOR = "creator";
+    private final static String UPDATE_DATE = "updateDate";
+    private final static String UPDATER = "updater";
+    private final static String DEPT_ID = "deptId";
+    private final static String TENANT_CODE = "tenantCode";
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        UserDetail user = SecurityUser.getUser();
+        Date date = new Date();
+
+        //创建者
+        strictInsertFill(metaObject, CREATOR, Long.class, user.getId());
+        //创建时间
+        strictInsertFill(metaObject, CREATE_DATE, Date.class, date);
+
+        //创建者所属部门
+        strictInsertFill(metaObject, DEPT_ID, Long.class, user.getDeptId());
+
+
+        //租户编码
+        strictInsertFill(metaObject, TENANT_CODE, Long.class, TenantContext.getTenantCode(user));
+
+        //更新者
+        strictInsertFill(metaObject, UPDATER, Long.class, user.getId());
+        //更新时间
+        strictInsertFill(metaObject, UPDATE_DATE, Date.class, date);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        //更新者
+        strictUpdateFill(metaObject, UPDATER, Long.class, SecurityUser.getUserId());
+        //更新时间
+        strictUpdateFill(metaObject, UPDATE_DATE, Date.class, new Date());
+    }
+}

eitc-admin/src/main/java/com/eitc/common/interceptor/DataFilterInterceptor.java

@@ -0,0 +1,109 @@
+package com.eitc.common.interceptor;
+
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
+
+import java.sql.Connection;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 数据过滤
+ *
+ * @author Mark eitc@163.com
+ * @since 1.0.0
+ */
+@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
+public class DataFilterInterceptor extends AbstractSqlParserHandler implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        StatementHandler statementHandler = (StatementHandler) PluginUtils.realTarget(invocation.getTarget());
+        MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
+
+        // SQL解析
+        this.sqlParser(metaObject);
+
+        // 先判断是不是SELECT操作
+        MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
+        if (!SqlCommandType.SELECT.equals(mappedStatement.getSqlCommandType())) {
+            return invocation.proceed();
+        }
+
+        // 针对定义了rowBounds，做为mapper接口方法的参数
+        BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
+        String originalSql = boundSql.getSql();
+        Object paramObj = boundSql.getParameterObject();
+
+        // 判断参数里是否有DataScope对象
+        DataScope scope = null;
+        if (paramObj instanceof DataScope) {
+            scope = (DataScope) paramObj;
+        } else if (paramObj instanceof Map) {
+            for (Object arg : ((Map) paramObj).values()) {
+                if (arg instanceof DataScope) {
+                    scope = (DataScope) arg;
+                    break;
+                }
+            }
+        }
+
+        // 不用数据过滤
+        if(scope == null){
+            return invocation.proceed();
+        }
+
+        // 拼接新SQL
+        originalSql = getSelect(originalSql, scope);
+
+        // 重写SQL
+        metaObject.setValue("delegate.boundSql.sql", originalSql);
+        return invocation.proceed();
+    }
+
+    private String getSelect(String originalSql, DataScope scope){
+        try {
+            Select select = (Select) CCJSqlParserUtil.parse(originalSql);
+            PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+            Expression expression = plainSelect.getWhere();
+            if(expression == null){
+                plainSelect.setWhere(new StringValue(scope.getSqlFilter()));
+            }else{
+                AndExpression andExpression =  new AndExpression(expression, new StringValue(scope.getSqlFilter()));
+                plainSelect.setWhere(andExpression);
+            }
+
+            return select.toString().replaceAll("'", "");
+        }catch (JSQLParserException e){
+            return originalSql;
+        }
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        if (target instanceof StatementHandler) {
+            return Plugin.wrap(target, this);
+        }
+        return target;
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+
+    }
+}

eitc-admin/src/main/java/com/eitc/common/interceptor/DataScope.java

@@ -0,0 +1,28 @@
+package com.eitc.common.interceptor;
+
+/**
+ * 数据范围
+ *
+ * @author Mark eitc@163.com
+ * @since 1.0.0
+ */
+public class DataScope {
+    private String sqlFilter;
+
+    public DataScope(String sqlFilter) {
+        this.sqlFilter = sqlFilter;
+    }
+
+    public String getSqlFilter() {
+        return sqlFilter;
+    }
+
+    public void setSqlFilter(String sqlFilter) {
+        this.sqlFilter = sqlFilter;
+    }
+
+    @Override
+    public String toString() {
+        return this.sqlFilter;
+    }
+}

eitc-admin/src/main/java/com/eitc/common/utils/ExcelUtils.java

@@ -0,0 +1,65 @@
+package com.eitc.common.utils;
+
+import com.alibaba.excel.EasyExcel;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * excel工具类
+ *
+ * @author Mark eitc@163.com
+ */
+public class ExcelUtils {
+
+    /**
+     * Excel导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param sheetName     sheetName
+     * @param list          数据List
+     * @param pojoClass     对象Class
+     */
+    public static void exportExcel(HttpServletResponse response, String fileName, String sheetName, List<?> list,
+                                     Class<?> pojoClass) throws IOException {
+        if(StringUtils.isBlank(fileName)){
+            //当前日期
+            fileName = DateUtils.format(new Date());
+        }
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("UTF-8");
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" +  fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), pojoClass).sheet(sheetName).doWrite(list);
+    }
+
+    /**
+     * Excel导出，先sourceList转换成List<targetClass>，再导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param sheetName     sheetName
+     * @param sourceList    原数据List
+     * @param targetClass   目标对象Class
+     */
+    public static void exportExcelToTarget(HttpServletResponse response, String fileName, String sheetName, List<?> sourceList,
+                                     Class<?> targetClass) throws Exception {
+        List targetList = new ArrayList<>(sourceList.size());
+        for(Object source : sourceList){
+            Object target = targetClass.newInstance();
+            BeanUtils.copyProperties(source, target);
+            targetList.add(target);
+        }
+
+        exportExcel(response, fileName, sheetName, targetList, targetClass);
+    }
+
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/AliyunGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * 阿里云
+ *
+ * @author Mark eitc@163.com
+ */
+public interface AliyunGroup {
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/FastDFSGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * FastDFS
+ *
+ * @author Mark eitc@163.com
+ */
+public interface FastDFSGroup {
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/LocalGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * 本地上传
+ *
+ * @author Mark eitc@163.com
+ */
+public interface LocalGroup {
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/MinioGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * MinIO
+ *
+ * @author Mark eitc@163.com
+ */
+public interface MinioGroup {
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/QcloudGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * 腾讯云
+ *
+ * @author Mark eitc@163.com
+ */
+public interface QcloudGroup {
+}

eitc-admin/src/main/java/com/eitc/common/validator/group/QiniuGroup.java

@@ -0,0 +1,9 @@
+package com.eitc.common.validator.group;
+
+/**
+ * 七牛
+ *
+ * @author Mark eitc@163.com
+ */
+public interface QiniuGroup {
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/config/ProcessEngineConfig.java

@@ -0,0 +1,27 @@
+package com.eitc.modules.activiti.config;
+
+import org.activiti.spring.SpringProcessEngineConfiguration;
+import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 流程配置信息
+ *
+ * @author Mark eitc@163.com
+ */
+@Configuration
+public class ProcessEngineConfig implements ProcessEngineConfigurationConfigurer {
+
+    @Override
+    public void configure(SpringProcessEngineConfiguration processEngineConfiguration) {
+        processEngineConfiguration.setActivityFontName("宋体");
+        processEngineConfiguration.setLabelFontName("宋体");
+        processEngineConfiguration.setAnnotationFontName("宋体");
+
+        processEngineConfiguration.setJobExecutorActivate(false);
+        processEngineConfiguration.setAsyncExecutorEnabled(false);
+
+        //自定义流程图样式
+        //processEngineConfiguration.setProcessDiagramGenerator(customProcessDiagramGenerator);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/controller/ActModelController.java

@@ -0,0 +1,98 @@
+package com.eitc.modules.activiti.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.common.validator.ValidatorUtils;
+import com.eitc.modules.activiti.dto.ModelDTO;
+import com.eitc.modules.activiti.service.ActModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.activiti.engine.repository.Model;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 模型管理
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("/act/model")
+@Api(tags="模型管理")
+public class ActModelController {
+    @Autowired
+    private ActModelService actModelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "name", value = "name", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:model:all")
+    public Result<PageData<Model>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<Model> page = actModelService.page(params);
+
+        return new Result<PageData<Model>>().ok(page);
+    }
+
+    @PostMapping
+    @ApiOperation("新增模型")
+    @LogOperation("新增模型")
+    @RequiresPermissions("sys:model:all")
+    public Result save(@RequestBody ModelDTO dto) throws Exception{
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+
+        actModelService.save(dto.getName(), dto.getKey(), dto.getDescription());
+
+        return new Result();
+    }
+
+    @PostMapping("deploy/{id}")
+    @ApiOperation("部署")
+    @LogOperation("部署")
+    @RequiresPermissions("sys:model:all")
+    public Result deploy(@PathVariable("id") String id) {
+        actModelService.deploy(id);
+        return new Result();
+    }
+
+    @GetMapping("export/{id}")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @RequiresPermissions("sys:model:all")
+    public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) {
+        actModelService.export(id, response);
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("sys:model:all")
+    public Result delete(@RequestBody String[] ids) {
+        for(String id : ids) {
+            actModelService.delete(id);
+        }
+        return new Result();
+    }
+
+    @GetMapping("image/{deploymentId}")
+    @ApiOperation(value = "查看流程图", produces="application/octet-stream")
+    @LogOperation("查看流程图")
+    @RequiresPermissions("sys:model:all")
+    public void viewDeployImage(@PathVariable("deploymentId") String deploymentId, @ApiIgnore HttpServletResponse response){
+        actModelService.deployImage(deploymentId, response);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/controller/ActProcessController.java

@@ -0,0 +1,214 @@
+package com.eitc.modules.activiti.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.ConvertUtils;
+import com.eitc.common.utils.Result;
+import com.eitc.modules.activiti.dto.ProcessBizRouteAndProcessInstanceDTO;
+import com.eitc.modules.activiti.dto.ProcessBizRouteDTO;
+import com.eitc.modules.activiti.dto.ProcessInstanceDTO;
+import com.eitc.modules.activiti.service.ActHistoryService;
+import com.eitc.modules.activiti.service.ActProcessService;
+import com.eitc.modules.activiti.service.ProcessBizRouteService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * 流程管理
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("/act/process")
+@Api(tags="流程管理")
+public class ActProcessController {
+    @Autowired
+    private ActProcessService actProcessService;
+
+    @Autowired
+    private ProcessBizRouteService processBizRouteService;
+
+    @Autowired
+    private ActHistoryService historyService;
+
+    @GetMapping("page")
+    @ApiOperation("流程管理-分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "processName", value = "processName", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:process:all")
+    public Result<PageData<Map<String, Object>>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<Map<String, Object>> page = actProcessService.page(params);
+        return new Result<PageData<Map<String, Object>>>().ok(page);
+    }
+
+    @GetMapping("lastestPage")
+    @ApiOperation("发起流程-分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "processName", value = "processName", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:process:all")
+    public Result<PageData<Map<String, Object>>> lastestPage(@ApiIgnore @RequestParam Map<String, Object> params){
+        params.put("isLatestVersion", true);
+        PageData<Map<String, Object>> page = actProcessService.page(params);
+        return new Result<PageData<Map<String, Object>>>().ok(page);
+    }
+
+    @PostMapping("deploy")
+    @ApiOperation("部署流程文件")
+    @LogOperation("部署流程文件")
+    @ApiImplicitParam(name = "processFile", value = "流程文件", paramType = "query", dataType="file")
+    @RequiresPermissions("sys:process:all")
+    public Result deploy(@RequestParam("processFile") MultipartFile file) throws IOException {
+        if (file.isEmpty()) {
+            return new Result().error(ErrorCode.UPLOAD_FILE_EMPTY);
+        }
+
+        actProcessService.deploy(file);
+
+        return new Result();
+    }
+
+    @PutMapping("active/{id}")
+    @LogOperation("激活流程")
+    @RequiresPermissions("sys:process:all")
+    public Result active(@PathVariable("id") String id) {
+        actProcessService.active(id);
+
+        return new Result();
+    }
+
+    @PutMapping("suspend/{id}")
+    @ApiOperation("挂起流程")
+    @LogOperation("挂起流程")
+    @RequiresPermissions("sys:process:all")
+    public Result suspend(@PathVariable("id") String id) {
+        actProcessService.suspend(id);
+
+        return new Result();
+    }
+
+    @PostMapping("convertToModel/{id}")
+    @ApiOperation("将部署的流程转换为模型")
+    @LogOperation("将部署的流程转换为模型")
+    @RequiresPermissions("sys:process:all")
+    public Result convertToModel(@PathVariable("id") String id) throws Exception {
+        actProcessService.convertToModel(id);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除流程")
+    @LogOperation("删除流程")
+    @RequiresPermissions("sys:process:all")
+    public Result delete(@RequestBody String[] deploymentIds) {
+        for(String deploymentId : deploymentIds) {
+            actProcessService.deleteDeployment(deploymentId);
+        }
+        return new Result();
+    }
+
+    @GetMapping(value = "resource")
+    @ApiOperation(value="获取资源文件", produces="application/octet-stream")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "deploymentId", value = "部署ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "resourceName", value = "资源名称", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:process:all")
+    public void resource(String deploymentId, String resourceName, @ApiIgnore HttpServletResponse response) throws Exception {
+        InputStream resourceAsStream = actProcessService.getResourceAsStream(deploymentId, resourceName);
+        String[] fileNames = resourceName.split("\\.");
+        if(fileNames.length>1){
+            if(fileNames[fileNames.length-1].toLowerCase().equals("png")){
+                response.setHeader("Content-Type","image/png");
+            } else if(fileNames[fileNames.length-1].toLowerCase().equals("xml")){
+                response.setHeader("Content-Type", "text/xml");
+                response.setHeader("Content-Disposition", "attachment; filename=" + java.net.URLEncoder.encode(resourceName, "UTF-8"));
+            }
+        }
+
+        response.setHeader("Cache-Control", "no-store, no-cache");
+        IOUtils.copy(resourceAsStream, response.getOutputStream());
+    }
+
+    @GetMapping(value = "getProcDefBizRoute/{id}")
+    @ApiOperation("根据流程ID获取业务路由配置")
+    public Result getProcDefBizRoute(@PathVariable("id") String id){
+        ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getProcDefBizRoute(id);
+        return new Result().ok(processBizRouteDTO);
+    }
+
+    @GetMapping(value = "getLatestProcDefBizRoute")
+    @ApiOperation("根据流程定义KEY获取最新的流程配置信息")
+    @ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", paramType = "query", dataType="String")
+    public Result getLatestProcDefBizRoute(String procDefKey){
+        ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getLatestProcDefBizRoute(procDefKey);
+        return new Result().ok(processBizRouteDTO);
+    }
+
+    @GetMapping(value = "getProcDefBizRouteAndProcessInstance")
+    @ApiOperation("根据业务ID获取流程业务路由配置和实例信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", required = true, paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "businessKey", value = "业务KEY", required = true, paramType = "query", dataType="String")
+    })
+    public Result getProcDefBizRouteAndProcessInstance(String procDefKey, String businessKey) {
+        if(StringUtils.isEmpty(businessKey)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        if(StringUtils.isEmpty(procDefKey)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        ProcessInstanceDTO processInstanceDTO = historyService.getHistoryProcessInstanceByBusinessKey(procDefKey, businessKey);
+        if(null == processInstanceDTO){
+            return new Result();
+        }
+        ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getProcDefBizRoute(processInstanceDTO.getProcessDefinitionId());
+        ProcessBizRouteAndProcessInstanceDTO dto = ConvertUtils.sourceToTarget(processBizRouteDTO, ProcessBizRouteAndProcessInstanceDTO.class);
+        if(null != dto) {
+            dto.setProcessDefinitionId(processInstanceDTO.getProcessDefinitionId());
+            dto.setProcessDefinitionKey(procDefKey);
+            dto.setProcessDefinitionName(processInstanceDTO.getProcessDefinitionName());
+            dto.setProcessInstanceId(processInstanceDTO.getProcessInstanceId());
+        }
+        return new Result().ok(dto);
+    }
+
+    @PostMapping("saveProcBizRoute")
+    @ApiOperation("保存业务路由配置")
+    public Result saveProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
+        processBizRouteService.save(processBizRouteDTO);
+        return new Result();
+    }
+
+    @PutMapping("saveProcBizRoute")
+    @ApiOperation("更新业务路由配置")
+    public Result updateProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
+        processBizRouteService.updateProcBizRoute(processBizRouteDTO);
+        return new Result();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/controller/ActRunningController.java

@@ -0,0 +1,77 @@
+package com.eitc.modules.activiti.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.modules.activiti.dto.ProcessInstanceDTO;
+import com.eitc.modules.activiti.dto.ProcessStartDTO;
+import com.eitc.modules.activiti.service.ActRunningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
+
+/**
+ * 运行中的流程
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("/act/running")
+@Api(tags="运行中的流程")
+public class ActRunningController {
+    @Autowired
+    private ActRunningService actRunningService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "id", value = "实例ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "definitionKey", value = "definitionKey", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:running:all")
+    public Result<PageData<Map<String, Object>>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<Map<String, Object>> page = actRunningService.page(params);
+
+        return new Result<PageData<Map<String, Object>>>().ok(page);
+    }
+
+    @DeleteMapping("{id}")
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("sys:running:all")
+    @ApiImplicitParam(name = "id", value = "ID", paramType = "query", dataType="String")
+    public Result deleteInstance(@PathVariable("id") String id) {
+        actRunningService.delete(id);
+        return new Result();
+    }
+
+    @PostMapping("start")
+    @ApiOperation("启动流程实例，依据流程定义KEY，启动流程实例")
+    @LogOperation("启动流程实例，依据流程定义KEY，启动流程实例")
+    @ApiImplicitParam(name = "key", value = "流程定义标识key", paramType = "query", dataType="String")
+    @RequiresPermissions("sys:running:all")
+    public Result<ProcessInstanceDTO> start(String key){
+        ProcessInstanceDTO dto = actRunningService.startProcess(key);
+        return new Result().ok(dto);
+    }
+
+    @PostMapping("startOfBusinessKey")
+    @ApiOperation("启动流程实例，依据流程定义ID和业务唯一标示启动实例")
+    @LogOperation("启动流程实例，依据流程定义ID和业务唯一标示启动实例")
+    @RequiresPermissions("sys:running:all")
+    public Result<ProcessInstanceDTO> startOfBusinessKey(@RequestBody ProcessStartDTO processStartDTO){
+        ProcessInstanceDTO dto = actRunningService.startOfBusinessKey(processStartDTO);
+        return new Result().ok(dto);
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/controller/ActTaskController.java

@@ -0,0 +1,293 @@
+package com.eitc.modules.activiti.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.modules.activiti.dto.TaskDTO;
+import com.eitc.modules.activiti.service.ActTaskService;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.sys.dto.SysUserDTO;
+import com.eitc.modules.sys.service.SysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
+
+/**
+ * 任务管理
+ * @author Jone
+ */
+@RestController
+@RequestMapping("/act/task")
+@Api(tags="任务管理")
+public class ActTaskController {
+
+    @Autowired
+    private ActTaskService actTaskService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+
+    /**
+     * 获取用户任务列表
+     * 根据用户ID或角色组获取任务信息
+     * @return
+     */
+    @GetMapping("page")
+    @ApiOperation("待办任务，默认查询所有待办任务。根据用户ID或角色ID查询个人或组的任务")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "roleIds", value = "roleIds", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "userId", value = "userId", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "isRoleGroup", value = "是否查询分组", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result<PageData<TaskDTO>> queryUserTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<TaskDTO> page = actTaskService.page(params);
+        return new Result<PageData<TaskDTO>>().ok(page);
+    }
+
+    /**
+     * 我的待办列表
+     * @return
+     */
+    @GetMapping("myToDoTaskPage")
+    @ApiOperation("我的待办列表")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int"),
+        @ApiImplicitParam(name = "taskName", value = "任务名称", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
+        params.put("userId", SecurityUser.getUserId().toString());
+        PageData<TaskDTO> page = actTaskService.page(params);
+        for(TaskDTO taskDTO : page.getList()){
+            if(!StringUtils.isEmpty(taskDTO.getAssignee())){
+                SysUserDTO userDTO = sysUserService.get(Long.valueOf(taskDTO.getAssignee()));
+                taskDTO.setAssigneeName(userDTO.getRealName());
+            }
+        }
+        return new Result<PageData<TaskDTO>>().ok(page);
+    }
+
+    /**
+     * 获取任务详情
+     */
+    @GetMapping("task/{id}")
+    @ApiOperation("获取任务详情")
+    @LogOperation("获取任务详情")
+    @RequiresPermissions("sys:task:all")
+    public Result getTaskById(@PathVariable("id") String id){
+        TaskDTO task = actTaskService.taskDetail(id);
+        return new Result().ok(task);
+    }
+
+    /**
+     * 认领任务
+     */
+    @PostMapping("claim")
+    @ApiOperation("认领任务")
+    @ApiImplicitParam(name = "taskId", value = "taskId", paramType = "query", dataType="String")
+    @RequiresPermissions("sys:task:all")
+    public Result claimTask(String taskId){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.claimTask(taskId);
+        return new Result();
+    }
+
+    /**
+     * 释放任务
+     */
+    @PostMapping("unclaim")
+    @ApiOperation("释放任务")
+    @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String")
+    @RequiresPermissions("sys:task:all")
+    public Result unclaimTask(String taskId){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.unclaimTask(taskId);
+        return new Result();
+    }
+
+    /**
+     * 任务处理
+     */
+    @PostMapping("complete")
+    @ApiOperation("任务处理（完成任务）")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "comment", value = "审批意见", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result completeTask(String taskId, String comment){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.completeTask(taskId, comment);
+        return new Result();
+    }
+    /**
+     * 带参数的任务处理
+     */
+    @PostMapping("completeByVariables")
+    @ApiOperation("带参数的任务处理（完成任务）")
+    @RequiresPermissions("sys:task:all")
+    public Result completeTaskByVariables(@RequestBody TaskDTO taskDTO){
+        if(StringUtils.isEmpty(taskDTO.getTaskId())){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.completeTaskByVariables(taskDTO);
+        return new Result();
+    }
+
+    /**
+     * 任务委托
+     */
+    @PostMapping("entrust")
+    @ApiOperation("任务委托")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "assignee", value = "受理人", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result taskEntrust(String taskId, String assignee){
+        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(assignee)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        String depositorId = SecurityUser.getUserId().toString();
+        actTaskService.changeTaskAssignee(taskId, depositorId, assignee);
+        return new Result();
+    }
+
+    /**
+     * 获取流程变量
+     */
+    @GetMapping("getTaskVariables")
+    @ApiOperation("获取流程变量")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "variableName", value = "参数的键", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result getTaskVariables(String taskId, String variableName){
+        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        return new Result().ok(actTaskService.getTaskVariables(taskId, variableName));
+    }
+
+    /**
+     * 更新任务变量
+     */
+    @PostMapping("updateTaskVariable")
+    @ApiOperation("更新任务变量")
+    @RequiresPermissions("sys:task:all")
+    public Result updateTaskVariable(@RequestBody TaskDTO taskDTO){
+        if(StringUtils.isEmpty(taskDTO.getTaskId())){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.updateTaskVariable(taskDTO);
+        return new Result();
+    }
+
+    /**
+     * 删除任务的所有变量
+     */
+    @DeleteMapping("deleteTaskVariables")
+    @ApiOperation("删除任务的所有变量")
+    @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String")
+    @RequiresPermissions("sys:task:all")
+    public Result deleteTaskVariables(String taskId){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.deleteTaskVariables(taskId);
+        return new Result();
+    }
+
+    /**
+     * 删除指定变量
+     */
+    @DeleteMapping("deleteVariable")
+    @ApiOperation("删除指定变量，默认删除本地变量")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "variableName", value = "变量名", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "scope", value = "变量的范围（local：本地；global,全局）", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result deleteVariable(String taskId, String variableName, String scope){
+        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.deleteTaskVariable(taskId, variableName, scope);
+        return new Result();
+    }
+
+    /**
+     * 回退任务到上一节点
+     */
+    @PostMapping("backPreviousTask")
+    @ApiOperation("回退任务到上一节点")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "comment", value = "回退审核意见", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result backPreviousTask(String taskId, String comment){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.doBackPreviousTask(taskId, comment);
+        return new Result();
+    }
+
+    /**
+     * 终止流程
+     */
+    @PostMapping("endProcess")
+    @ApiOperation("终止流程")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "comment", value = "终止审核意见", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result endProcess(String taskId, String comment){
+        actTaskService.endProcess(taskId, comment);
+        return new Result();
+    }
+
+    /**
+     * 驳回
+     */
+    @PostMapping("backToFirst")
+    @ApiOperation("驳回，回退至第一个用户任务")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "comment", value = "驳回审核意见", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:task:all")
+    public Result backToFirst(String taskId, String comment){
+        if(StringUtils.isEmpty(taskId)){
+            return new Result().error(ErrorCode.PARAMS_GET_ERROR);
+        }
+        actTaskService.backToFirst(taskId, comment);
+        return new Result();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/controller/HistoryController.java

@@ -0,0 +1,133 @@
+package com.eitc.modules.activiti.controller;
+
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.modules.activiti.dto.HistoryDetailDTO;
+import com.eitc.modules.activiti.dto.ProcessActivityDTO;
+import com.eitc.modules.activiti.dto.ProcessInstanceDTO;
+import com.eitc.modules.activiti.service.ActHistoryService;
+import com.eitc.modules.activiti.service.ActivitiService;
+import com.eitc.modules.sys.dto.SysUserDTO;
+import com.eitc.modules.sys.service.SysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程的历史信息
+ * @author Jone
+ */
+@RestController
+@RequestMapping("/act/his")
+@Api(tags="流程历史")
+public class HistoryController {
+
+    @Autowired
+    private ActHistoryService historyService;
+
+    @Autowired
+    private ActivitiService activitiService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @GetMapping("getInstImage")
+    @ApiOperation(value ="获取流程活动图", produces="application/octet-stream")
+    @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType="String")
+    @RequiresPermissions("sys:his:all")
+    public void getProcessInstanceDiagram(String processInstanceId, @ApiIgnore HttpServletResponse response) throws Exception {
+        historyService.getProcessInstanceDiagram(processInstanceId, response);
+    }
+
+    @GetMapping("getHistoryProcessInstancePage")
+    @ApiOperation("历史流程实例列表")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:his:all")
+    public Result<ProcessInstanceDTO> getHistoryProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProcessInstanceDTO> page = historyService.getHistoryProcessInstancePage(params);
+        return new Result().ok(page);
+    }
+
+    @GetMapping("getMyProcessInstancePage")
+    @ApiOperation("我发起的流程")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "ended", value = "是否接受（true:是，false:否）", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:his:all")
+    public Result<ProcessInstanceDTO> getMyProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProcessInstanceDTO> page = historyService.getMyProcessInstancePage(params);
+        return new Result().ok(page);
+    }
+
+    @GetMapping("getMyHandledInstancePage")
+    @ApiOperation("已办任务：根据登录账号查询用户已办任务")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType="Date"),
+        @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType="Date")
+    })
+    @RequiresPermissions("sys:his:all")
+    public Result<ProcessActivityDTO> getMyHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProcessActivityDTO> page = activitiService.getMyProcessInstancePage(params);
+        for(ProcessActivityDTO activityDTO : page.getList()){
+            if(StringUtils.isNotEmpty(activityDTO.getStartUserId())){
+                SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getStartUserId()));
+                activityDTO.setStartUserName(userDTO.getRealName());
+            }
+            if(StringUtils.isNotEmpty(activityDTO.getAssignee())){
+                SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));
+                activityDTO.setAssigneeName(userDTO.getRealName());
+            }
+        }
+        return new Result().ok(page);
+    }
+
+    @GetMapping("getTaskHandleDetailInfo")
+    @ApiOperation("获取流程处理详情")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:his:all")
+    public Result<HistoryDetailDTO> getTaskHandleDetailInfo(String processInstanceId){
+        List<HistoryDetailDTO> list = activitiService.getTaskHandleDetailInfo(processInstanceId);
+        return new Result().ok(list);
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dao/ProcessActivityDao.java

@@ -0,0 +1,22 @@
+package com.eitc.modules.activiti.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.activiti.entity.HistoryDetailEntity;
+import com.eitc.modules.activiti.entity.ProcessActivityEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.context.annotation.Primary;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Jone
+ */
+@Mapper
+@Primary
+public interface ProcessActivityDao extends BaseDao<ProcessActivityEntity> {
+
+    List<ProcessActivityEntity> getMyProcessInstancePage(Map<String, Object> params);
+
+    List<HistoryDetailEntity> getTaskHandleDetailInfo(String processInstanceId);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dao/ProcessBizRouteDao.java

@@ -0,0 +1,18 @@
+package com.eitc.modules.activiti.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.activiti.entity.ProcessBizRouteEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author:Jone
+ */
+@Mapper
+public interface ProcessBizRouteDao extends BaseDao<ProcessBizRouteEntity> {
+    ProcessBizRouteEntity getProcDefBizRoute(@Param("proDefId") String id);
+
+    List<ProcessBizRouteEntity> getLatestProcDefBizRoute(@Param("procDefKey") String procDefKey);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/controller/CorrectionController.java

@@ -0,0 +1,117 @@
+package com.eitc.modules.activiti.demo.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.common.validator.AssertUtils;
+import com.eitc.common.validator.ValidatorUtils;
+import com.eitc.common.validator.group.AddGroup;
+import com.eitc.common.validator.group.DefaultGroup;
+import com.eitc.common.validator.group.UpdateGroup;
+import com.eitc.modules.activiti.demo.dto.CorrectionDTO;
+import com.eitc.modules.activiti.demo.service.CorrectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("act/demo/correction")
+@Api(tags="转正申请")
+public class CorrectionController {
+    @Autowired
+    private CorrectionService correctionService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("sys:correction:all")
+    public Result<PageData<CorrectionDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<CorrectionDTO> page = correctionService.page(params);
+
+        return new Result<PageData<CorrectionDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @RequiresPermissions("sys:correction:all")
+    public Result<CorrectionDTO> get(@PathVariable("id") Long id){
+        CorrectionDTO data = correctionService.get(id);
+
+        return new Result<CorrectionDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("sys:correction:all")
+    public Result save(@RequestBody CorrectionDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        correctionService.save(dto);
+        Map<String, Object> map = new HashMap<>();
+        map.put("businessKey", dto.getId().toString());
+        return new Result().ok(map);
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("sys:correction:all")
+    public Result update(@RequestBody CorrectionDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        correctionService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("sys:correction:all")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        correctionService.delete(ids);
+
+        return new Result();
+    }
+
+    @PostMapping("updateInstanceId")
+    @ApiOperation("更新实例ID")
+    @LogOperation("更新实例ID")
+    @RequiresPermissions("sys:correction:all")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", required = true, dataType="String"),
+        @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query",required = true, dataType="String")
+    })
+    public Result updateInstanceId(String businessKey, String processInstanceId){
+        Long id = Long.valueOf(businessKey);
+        correctionService.updateInstanceId(processInstanceId, id);
+        return new Result();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/dao/CorrectionDao.java

@@ -0,0 +1,16 @@
+package com.eitc.modules.activiti.demo.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.activiti.demo.entity.CorrectionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+@Mapper
+public interface CorrectionDao extends BaseDao<CorrectionEntity> {
+
+    void updateInstanceId(String instanceId, Long id);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/dto/CorrectionDTO.java

@@ -0,0 +1,51 @@
+package com.eitc.modules.activiti.demo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@ApiModel(value = "转正申请")
+public class CorrectionDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "申请岗位")
+	private String applyPost;
+
+	@ApiModelProperty(value = "入职日期")
+	@JsonFormat(pattern="yyyy-MM-dd")
+	private Date entryDate;
+
+	@ApiModelProperty(value = "转正日期")
+	@JsonFormat(pattern="yyyy-MM-dd")
+	private Date correctionDate;
+
+	@ApiModelProperty(value = "工作内容")
+	private String workContent;
+
+	@ApiModelProperty(value = "工作成绩")
+	private String achievement;
+
+	@ApiModelProperty(value = "创建者")
+	private Long creator;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createDate;
+
+	@ApiModelProperty(value = "实例ID")
+	private String instanceId;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/entity/CorrectionEntity.java

@@ -0,0 +1,43 @@
+package com.eitc.modules.activiti.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("tb_correction")
+public class CorrectionEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 申请岗位
+     */
+	private String applyPost;
+    /**
+     * 入职日期
+     */
+	private Date entryDate;
+    /**
+     * 转正日期
+     */
+	private Date correctionDate;
+    /**
+     * 工作内容
+     */
+	private String workContent;
+    /**
+     * 工作成绩
+     */
+	private String achievement;
+
+	private String instanceId;
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/service/CorrectionService.java

@@ -0,0 +1,16 @@
+package com.eitc.modules.activiti.demo.service;
+
+
+import com.eitc.common.service.CrudService;
+import com.eitc.modules.activiti.demo.dto.CorrectionDTO;
+import com.eitc.modules.activiti.demo.entity.CorrectionEntity;
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+public interface CorrectionService extends CrudService<CorrectionEntity, CorrectionDTO> {
+
+    void updateInstanceId(String instanceId, Long id);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/demo/service/impl/CorrectionServiceImpl.java

@@ -0,0 +1,37 @@
+package com.eitc.modules.activiti.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.eitc.common.service.impl.CrudServiceImpl;
+import com.eitc.modules.activiti.demo.dao.CorrectionDao;
+import com.eitc.modules.activiti.demo.dto.CorrectionDTO;
+import com.eitc.modules.activiti.demo.entity.CorrectionEntity;
+import com.eitc.modules.activiti.demo.service.CorrectionService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 转正申请
+ *
+ * @author Mark eitc@163.com
+ */
+@Service
+public class CorrectionServiceImpl extends CrudServiceImpl<CorrectionDao, CorrectionEntity, CorrectionDTO> implements CorrectionService {
+
+    @Override
+    public QueryWrapper<CorrectionEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<CorrectionEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+    @Override
+    public void updateInstanceId(String instanceId, Long id) {
+        baseDao.updateInstanceId(instanceId, id);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/HistoryDetailDTO.java

@@ -0,0 +1,53 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 历史细节
+ *
+ * @author Jone
+ */
+@Data
+@Api(tags="历史细节")
+public class HistoryDetailDTO {
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "环节名称")
+    private String activityName;
+
+    @ApiModelProperty(value = "环节类型")
+    private String activityType;
+
+    @ApiModelProperty(value = "流程定义ID")
+    private String processDefinitionId;
+
+    @ApiModelProperty(value = "实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "任务ID")
+    private String taskId;
+
+    @ApiModelProperty(value = "执行ID")
+    private String executionId;
+
+    @ApiModelProperty(value = "受理人")
+    private String assignee;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "时长（秒）")
+    private Long durationInSeconds;
+
+    @ApiModelProperty(value = "审批意见")
+    private String comment;
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ModelDTO.java

@@ -0,0 +1,31 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 模型
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@Api(tags="模型")
+public class ModelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模型名称")
+    @NotBlank(message="{model.name.require}")
+    private String name;
+
+    @ApiModelProperty(value = "模型标识")
+    @NotBlank(message="{model.key.require}")
+    private String key;
+
+    @ApiModelProperty(value = "模型描述")
+    private String description;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ProcessActivityDTO.java

@@ -0,0 +1,50 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Jone
+ */
+@Data
+@Api(tags="流程活动")
+public class ProcessActivityDTO {
+
+
+    @ApiModelProperty(value = "流程定义ID")
+    private String processDefinitionId;
+
+    @ApiModelProperty(value = "流程定义名称")
+    private String processDefinitionName;
+
+    @ApiModelProperty(value = "流程定义版本")
+    private Integer processDefinitionVersion;
+
+    @ApiModelProperty(value = "实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "业务KEY")
+    private String businessKey;
+
+    @ApiModelProperty(value = "发起时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "发起人")
+    private String startUserId;
+
+    @ApiModelProperty(value = "发起人姓名")
+    private String startUserName;
+
+    @ApiModelProperty(value = "受理人")
+    private String assignee;
+
+    @ApiModelProperty(value = "受理人姓名")
+    private String assigneeName;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ProcessBizRouteAndProcessInstanceDTO.java

@@ -0,0 +1,29 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author:Jone
+ * @Description:
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@Api(tags="流程业务配置和实例信息")
+public class ProcessBizRouteAndProcessInstanceDTO extends ProcessBizRouteDTO {
+
+    @ApiModelProperty(value = "实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "流程定义ID")
+    private String processDefinitionId;
+
+    @ApiModelProperty(value = "流程定义名称")
+    private String processDefinitionName;
+
+    @ApiModelProperty(value = "流程定义KEY")
+    private String processDefinitionKey;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ProcessBizRouteDTO.java

@@ -0,0 +1,37 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author:Jone
+ */
+@Data
+@Api(tags="流程业务配置")
+public class ProcessBizRouteDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "流程定义ID")
+    @NotBlank(message="{processBizRoute.procDefId.require}")
+    private String procDefId;
+
+    @ApiModelProperty(value = "业务路由")
+    @NotBlank(message="{processBizRoute.bizRoute.require}")
+    private String bizRoute;
+
+    @ApiModelProperty(value = "流程定义KEY")
+    @NotBlank(message="{processBizRoute.procDefKey.require}")
+    private String procDefKey;
+
+    @ApiModelProperty(value = "版本号")
+    @NotNull(message="{processBizRoute.version.require}")
+    private Integer version;
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ProcessInstanceDTO.java

@@ -0,0 +1,69 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Jone
+ */
+@Data
+@Api(tags="实例")
+public class ProcessInstanceDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "流程定义ID")
+    private String processDefinitionId;
+
+    @ApiModelProperty(value = "流程定义名称")
+    private String processDefinitionName;
+
+    @ApiModelProperty(value = "流程定义KEY")
+    private String processDefinitionKey;
+
+    @ApiModelProperty(value = "流程定义版本")
+    private Integer processDefinitionVersion;
+
+    @ApiModelProperty(value = "部署ID")
+    private String deploymentId;
+
+    @ApiModelProperty(value = "业务唯一KEY")
+    private String businessKey;
+
+    @ApiModelProperty(value = "实例名称")
+    private String name;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "是否结束")
+    private boolean isEnded;
+
+    @ApiModelProperty(value = "是否挂起")
+    private boolean isSuspended;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "发起人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "当前任务")
+    private List<TaskDTO> currentTaskList;
+
+
+
+
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/ProcessStartDTO.java

@@ -0,0 +1,27 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author:Jone
+ */
+@Data
+@Api(tags="流程启动参数")
+public class ProcessStartDTO {
+
+    @ApiModelProperty(value = "流程KEY")
+    @NotBlank(message="{ProcessStart.processDefinitionKey.require}")
+    private String processDefinitionKey;
+
+    @ApiModelProperty(value = "业务KEY")
+    @NotBlank(message="{ProcessStart.businessKey.require}")
+    private String businessKey;
+
+    @ApiModelProperty(value = "流程参数")
+    private Map<String, Object> variables;
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/dto/TaskDTO.java

@@ -0,0 +1,80 @@
+package com.eitc.modules.activiti.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Jone
+ */
+@Data
+@Api(tags="任务")
+public class TaskDTO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    private String taskId;
+
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "任务参数")
+    private Map<String,Object> params;
+
+    @ApiModelProperty(value = "流程定义ID")
+    private String processDefinitionId;
+
+    @ApiModelProperty(value = "实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "角色")
+    private String roleIds;
+
+    @ApiModelProperty(value = "受理人")
+    private String assignee;
+
+    @ApiModelProperty(value = "受理人姓名")
+    private String assigneeName;
+
+    @ApiModelProperty(value = "任务所有人")
+    private String owner;
+
+    @ApiModelProperty(value = "审核意见")
+    private String comment;
+
+    @ApiModelProperty(value = "活动节点ID")
+    private String activityId;
+
+    @ApiModelProperty(value = "角色组")
+    private List<String> lstGroupId;
+
+    @ApiModelProperty(value = "候选人")
+    private List<String> lstUserIds;
+
+    @ApiModelProperty(value = "处理时间")
+    private Date dueDate;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "业务ID")
+    private String businessKey;
+
+    @ApiModelProperty(value = "流程定义名称")
+    private String processDefinitionName;
+
+    @ApiModelProperty(value = "流程定义KEY")
+    private String processDefinitionKey;
+
+    @ApiModelProperty(value = "流程发起时间")
+    private Date startTime;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/entity/HistoryDetailEntity.java

@@ -0,0 +1,40 @@
+package com.eitc.modules.activiti.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author Jone
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class HistoryDetailEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String activityName;
+
+    private String activityType;
+
+    private String processDefinitionId;
+
+    private String processInstanceId;
+
+    private String taskId;
+
+    private String executionId;
+
+    private String assignee;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Long durationInSeconds;
+
+    private String comment;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/entity/ProcessActivityEntity.java

@@ -0,0 +1,37 @@
+
+package com.eitc.modules.activiti.entity;
+
+import com.eitc.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author Jone
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class ProcessActivityEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String processDefinitionId;
+
+    private String processDefinitionName;
+
+    private Integer processDefinitionVersion;
+
+    private String processInstanceId;
+
+    private String businessKey;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private String startUserId;
+
+    private String assignee;
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/entity/ProcessBizRouteEntity.java

@@ -0,0 +1,24 @@
+package com.eitc.modules.activiti.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @Author:Jone
+ */
+@Data
+@TableName("tb_process_biz_route")
+public class ProcessBizRouteEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String procDefId;
+
+    private String bizRoute;
+
+    private String procDefKey;
+
+    private Integer version;
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/org/activiti/rest/editor/main/StencilsetRestResource.java

@@ -0,0 +1,30 @@
+package com.eitc.modules.activiti.org.activiti.rest.editor.main;
+
+import org.activiti.engine.ActivitiException;
+import org.apache.commons.io.IOUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.InputStream;
+
+/**
+ * Stencilset
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("service")
+public class StencilsetRestResource {
+
+  @RequestMapping(value="/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
+  public @ResponseBody String getStencilset() {
+    InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
+    try {
+      return IOUtils.toString(stencilsetStream, "utf-8");
+    } catch (Exception e) {
+      throw new ActivitiException("Error while loading stencil set", e);
+    }
+  }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java

@@ -0,0 +1,61 @@
+package com.eitc.modules.activiti.org.activiti.rest.editor.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Model Editor
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("service")
+public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
+
+  protected static final Logger LOGGER = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
+
+  @Autowired
+  private RepositoryService repositoryService;
+
+  @Autowired
+  private ObjectMapper objectMapper;
+
+  @RequestMapping(value="/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
+  public ObjectNode getEditorJson(@PathVariable String modelId) {
+    ObjectNode modelNode = null;
+
+    Model model = repositoryService.getModel(modelId);
+
+    if (model != null) {
+      try {
+        if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+          modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+        } else {
+          modelNode = objectMapper.createObjectNode();
+          modelNode.put(MODEL_NAME, model.getName());
+        }
+        modelNode.put(MODEL_ID, model.getId());
+        ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
+            new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+        modelNode.set("model", editorJsonNode);
+
+      } catch (Exception e) {
+        LOGGER.error("Error creating model JSON", e);
+        throw new ActivitiException("Error creating model JSON", e);
+      }
+    }
+    return modelNode;
+  }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/org/activiti/rest/editor/model/ModelSaveRestResource.java

@@ -0,0 +1,82 @@
+package com.eitc.modules.activiti.org.activiti.rest.editor.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.eitc.common.xss.XssHttpServletRequestWrapper;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+/**
+ * Model Rest
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("service")
+public class ModelSaveRestResource implements ModelDataJsonConstants {
+    protected static final Logger LOGGER = LoggerFactory.getLogger(ModelSaveRestResource.class);
+
+    @Autowired
+    private RepositoryService repositoryService;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @RequestMapping(value="/model/{modelId}/save", method = RequestMethod.PUT)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void saveModel(@PathVariable String modelId, HttpServletRequest request) {
+        try {
+            HttpServletRequest orgRequest = XssHttpServletRequestWrapper.getOrgRequest(request);
+            String name = orgRequest.getParameter("name");
+            String description = orgRequest.getParameter("description");
+            String jsonXml = orgRequest.getParameter("json_xml");
+            String svgXml = orgRequest.getParameter("svg_xml");
+
+            Model model = repositoryService.getModel(modelId);
+
+            ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+
+            modelJson.put(MODEL_NAME, name);
+            modelJson.put(MODEL_DESCRIPTION, description);
+            model.setMetaInfo(modelJson.toString());
+            model.setName(name);
+
+            repositoryService.saveModel(model);
+
+            repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
+
+            InputStream svgStream = new ByteArrayInputStream(svgXml.getBytes("utf-8"));
+            TranscoderInput input = new TranscoderInput(svgStream);
+
+            PNGTranscoder transcoder = new PNGTranscoder();
+            // Setup output
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            TranscoderOutput output = new TranscoderOutput(outStream);
+
+            // Do the transformation
+            transcoder.transcode(input, output);
+            final byte[] result = outStream.toByteArray();
+            repositoryService.addModelEditorSourceExtra(model.getId(), result);
+            outStream.close();
+
+        } catch (Exception e) {
+            LOGGER.error("Error saving model", e);
+            throw new ActivitiException("Error saving model", e);
+        }
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActHistoryService.java

@@ -0,0 +1,290 @@
+package com.eitc.modules.activiti.service;
+
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.modules.activiti.dto.ProcessInstanceDTO;
+import com.eitc.modules.activiti.dto.TaskDTO;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.sys.dto.SysUserDTO;
+import com.eitc.modules.sys.service.SysUserService;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.engine.*;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricProcessInstanceQuery;
+import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.task.Task;
+import org.activiti.image.ProcessDiagramGenerator;
+import org.activiti.spring.ProcessEngineFactoryBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作流
+ *
+ * @author Jone
+ */
+@Service
+public class ActHistoryService {
+
+    @Autowired
+    protected RepositoryService repositoryService;
+
+    @Autowired
+    protected RuntimeService runtimeService;
+
+    @Autowired
+    protected HistoryService historyService;
+
+    @Autowired
+    protected ProcessEngineConfiguration processEngineConfiguration;
+
+    @Autowired
+    protected ProcessEngineFactoryBean processEngine;
+
+    @Autowired
+    protected TaskService taskService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+
+
+    public void getProcessInstanceDiagram(String processInstanceId, HttpServletResponse response) throws Exception {
+        if(StringUtils.isEmpty(processInstanceId)){
+            return;
+        }
+        HistoricProcessInstance processInstance =  historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId());
+        processEngineConfiguration = processEngine.getProcessEngineConfiguration();
+        Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
+
+        ProcessDiagramGenerator diagramGenerator = processEngineConfiguration.getProcessDiagramGenerator();
+        ProcessDefinitionEntity definitionEntity = (ProcessDefinitionEntity)repositoryService.getProcessDefinition(processInstance.getProcessDefinitionId());
+
+        List<HistoricActivityInstance> highLightedActivitList =  historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime()
+                .asc().list();
+        //高亮环节id集合
+        List<String> highLightedActivitis = new ArrayList<String>();
+        for (HistoricActivityInstance tempActivity : highLightedActivitList) {
+            String activityId = tempActivity.getActivityId();
+            highLightedActivitis.add(activityId);
+        }
+
+        //高亮线路id集合
+        List<String> highLightedFlows = getHighLightedFlows(definitionEntity,highLightedActivitList);
+
+        ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(processInstanceId).singleResult();
+        if(null != execution) {
+            highLightedActivitis.add(execution.getActivityId());
+        }
+
+        InputStream imageStream = diagramGenerator.generateDiagram(bpmnModel, "png", highLightedActivitis,highLightedFlows,"宋体","宋体", "宋体",null,1.0);
+
+        response.setHeader("Content-Type","image/png");
+        response.setHeader("Cache-Control", "no-store, no-cache");
+        BufferedImage bufferedImage =  ImageIO.read(imageStream);
+        ImageIO.write(bufferedImage, "png", response.getOutputStream());
+
+    }
+    /**
+     * 获取需要高亮的线
+     * @param processDefinitionEntity
+     * @param historicActivityInstances
+     * @return
+     */
+    private List<String> getHighLightedFlows(ProcessDefinitionEntity processDefinitionEntity,
+            List<HistoricActivityInstance> historicActivityInstances) {
+        List<String> highFlows = new ArrayList<>();
+        for (int i = 0; i < historicActivityInstances.size() - 1; i++) {
+            ActivityImpl activityImpl = processDefinitionEntity.findActivity(historicActivityInstances.get(i).getActivityId());
+            List<ActivityImpl> sameStartTimeNodes = new ArrayList<>();
+            ActivityImpl sameActivityImpl1 = processDefinitionEntity.findActivity(historicActivityInstances.get(i + 1).getActivityId());
+            sameStartTimeNodes.add(sameActivityImpl1);
+            for (int j = i + 1; j < historicActivityInstances.size() - 1; j++) {
+                HistoricActivityInstance activityImpl1 = historicActivityInstances.get(j);
+                HistoricActivityInstance activityImpl2 = historicActivityInstances.get(j + 1);
+                if (Math.abs(activityImpl1.getStartTime().getTime()-activityImpl2.getStartTime().getTime()) < 200) {
+                    ActivityImpl sameActivityImpl2 = processDefinitionEntity.findActivity(activityImpl2.getActivityId());
+                    sameStartTimeNodes.add(sameActivityImpl2);
+                } else {
+                    break;
+                }
+            }
+            for(int j = i+1; j < historicActivityInstances.size() - 1; j++){
+                HistoricActivityInstance activityImpl1 = historicActivityInstances.get(j);
+                if(null != historicActivityInstances.get(i).getEndTime()){
+                    if (Math.abs(activityImpl1.getStartTime().getTime()-historicActivityInstances.get(i).getEndTime().getTime()) < 200) {
+                        ActivityImpl sameActivityImpl2 = processDefinitionEntity.findActivity(activityImpl1.getActivityId());
+                        sameStartTimeNodes.add(sameActivityImpl2);
+                    }
+                }
+            }
+            List<PvmTransition> pvmTransitions = activityImpl.getOutgoingTransitions();
+            for (PvmTransition pvmTransition : pvmTransitions) {
+                ActivityImpl pvmActivityImpl = (ActivityImpl) pvmTransition.getDestination();
+                if (sameStartTimeNodes.contains(pvmActivityImpl)) {
+                    highFlows.add(pvmTransition.getId());
+                }
+            }
+        }
+        return highFlows;
+    }
+
+
+    public PageData<ProcessInstanceDTO> getHistoryProcessInstancePage(Map<String, Object> params) {
+        HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery();
+        Integer curPage = 1;
+        Integer limit = 10;
+        if(params.get(Constant.PAGE) != null){
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        }
+        if(params.get(Constant.LIMIT) != null){
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        }
+
+        if(StringUtils.isNotEmpty((String)params.get("processInstanceId"))){
+            query.processInstanceId((String)params.get("processInstanceId"));
+        }
+
+        if(StringUtils.isNotEmpty((String)params.get("businessKey"))){
+            query.processInstanceBusinessKey((String)params.get("businessKey"));
+        }
+
+        if(StringUtils.isNotEmpty((String)params.get("processDefinitionId"))){
+            query.processDefinitionId((String)params.get("processDefinitionId"));
+        }
+        if(StringUtils.isNotEmpty((String)params.get("ended"))){
+            if("true".equals((String)params.get("ended"))){
+                query.finished();
+            } else if("false".equals((String)params.get("ended"))){
+                query.unfinished();
+            }
+        }
+        if(null != params.get("finishedBeginTime")){
+            query.finishedAfter((Date) params.get("finishedBeginTime"));
+        }
+        if(null != params.get("finishedEndTime")){
+            query.finishedBefore((Date) params.get("finishedEndTime"));
+        }
+        if(null != params.get("startBeginTime")){
+            query.startedAfter((Date) params.get("startBeginTime"));
+        }
+        if(null != params.get("startEndTime")){
+            query.startedBefore((Date) params.get("startEndTime"));
+        }
+        if(StringUtils.isNotEmpty((String)params.get("startBy"))){
+            query.startedBy((String)params.get("startBy"));
+        }
+        query.orderByProcessInstanceStartTime().desc();
+        List<HistoricProcessInstance> list =  query.listPage((curPage-1)*limit, limit);
+        List<ProcessInstanceDTO> listInstance = new ArrayList<>();
+        if(!list.isEmpty()){
+            this.converHistoricProcessInstance(list, listInstance);
+        }
+
+        return new PageData<ProcessInstanceDTO>(listInstance, (int) query.count());
+    }
+
+    private void converHistoricProcessInstance(List<HistoricProcessInstance> list, List<ProcessInstanceDTO> listInstance) {
+        for(HistoricProcessInstance historicProcessInstance : list){
+            ProcessInstanceDTO dto = new ProcessInstanceDTO();
+            dto.setProcessDefinitionId(historicProcessInstance.getProcessDefinitionId());
+            dto.setProcessInstanceId(historicProcessInstance.getId());
+            dto.setProcessDefinitionVersion(historicProcessInstance.getProcessDefinitionVersion());
+            dto.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
+            dto.setProcessDefinitionKey(historicProcessInstance.getProcessDefinitionKey());
+            if(null != historicProcessInstance.getEndTime()){
+                dto.setEnded(true);
+            } else {
+                dto.setEnded(false);
+            }
+            dto.setEndTime(historicProcessInstance.getEndTime());
+            dto.setStartTime(historicProcessInstance.getStartTime());
+            dto.setBusinessKey(historicProcessInstance.getBusinessKey());
+            dto.setCreateUserId(historicProcessInstance.getStartUserId());
+            listInstance.add(dto);
+        }
+
+    }
+
+    /**
+     * 我发起的流程
+     * 根据登录用户信息获取处理中的示例和任务信息
+     * @param params
+     * @return
+     */
+    public PageData<ProcessInstanceDTO> getMyProcessInstancePage(Map<String, Object> params) {
+        params.put("startBy", SecurityUser.getUserId().toString());
+        PageData<ProcessInstanceDTO> pageData = this.getHistoryProcessInstancePage(params);
+        List<ProcessInstanceDTO> list = pageData.getList();
+        for(ProcessInstanceDTO dto : list){
+            if(dto.isEnded()){
+                continue;
+            }
+            List<Task> listTask = taskService.createTaskQuery().processInstanceId(dto.getProcessInstanceId()).list();
+            List<TaskDTO> taskDTOList = new ArrayList<>();
+            for(Task task : listTask){
+                TaskDTO taskDTO = new TaskDTO();
+                this.convertTaskInfo(task, taskDTO);
+                if(StringUtils.isNotEmpty(taskDTO.getAssignee())){
+                    SysUserDTO userDTO = sysUserService.get(Long.valueOf(taskDTO.getAssignee()));
+                    taskDTO.setAssigneeName(userDTO.getRealName());
+                }
+                taskDTOList.add(taskDTO);
+            }
+            dto.setCurrentTaskList(taskDTOList);
+        }
+        return pageData;
+    }
+
+    /**
+     * 转换Task对象
+     * @param task
+     * @param dto
+     */
+    private void convertTaskInfo(Task task, TaskDTO dto) {
+        dto.setTaskId(task.getId());
+        dto.setTaskName(task.getName());
+        dto.setActivityId(task.getExecutionId());
+        dto.setAssignee(task.getAssignee());
+        dto.setProcessDefinitionId(task.getProcessDefinitionId());
+        dto.setProcessInstanceId(task.getProcessInstanceId());
+        dto.setOwner(task.getOwner());
+        dto.setCreateTime(task.getCreateTime());
+    }
+
+    public ProcessInstanceDTO getHistoryProcessInstanceByBusinessKey(String procDefKey, String businessKey) {
+        HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery();
+        if(StringUtils.isNotEmpty(businessKey)){
+            query.processInstanceBusinessKey(businessKey);
+        }
+
+        if(StringUtils.isNotEmpty(procDefKey)){
+            query.processDefinitionKey(procDefKey);
+        }
+        List<HistoricProcessInstance> list =  query.list();
+        List<ProcessInstanceDTO> listInstance = new ArrayList<>();
+        if(!list.isEmpty()){
+            this.converHistoricProcessInstance(list, listInstance);
+        } else {
+            return null;
+        }
+        return listInstance.get(0);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActModelService.java

@@ -0,0 +1,191 @@
+package com.eitc.modules.activiti.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.exception.RenException;
+import com.eitc.common.page.PageData;
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ModelQuery;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 模型管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Service
+public class ActModelService {
+    @Autowired
+    protected RepositoryService repositoryService;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    public PageData<Model> page(Map<String, Object> params) {
+        String key = (String)params.get("key");
+        String name = (String)params.get("name");
+
+        //分页参数
+        int curPage = 1;
+        int limit = 10;
+        if(params.get(Constant.PAGE) != null){
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        }
+        if(params.get(Constant.LIMIT) != null){
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        }
+
+        ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc();
+
+        if(StringUtils.isNotEmpty(key)){
+            modelQuery.modelKey(key);
+        }
+        if(StringUtils.isNotEmpty(name)){
+            modelQuery.modelName(name);
+        }
+
+        List<Model> list = modelQuery.listPage((curPage - 1) * limit, limit);
+        return new PageData<>(list, (int)modelQuery.count());
+    }
+
+    public void save(String name, String key, String description) throws UnsupportedEncodingException {
+        //新建一个空模型
+        Model model = repositoryService.newModel();
+
+        //metaInfo信息
+        ObjectNode metaInfo = objectMapper.createObjectNode();
+        metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name);
+        metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+        metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion());
+
+        model.setKey(key);
+        model.setName(name);
+        model.setMetaInfo(metaInfo.toString());
+
+        repositoryService.saveModel(model);
+
+        ObjectNode editorNode = objectMapper.createObjectNode();
+        editorNode.put("id", "canvas");
+        editorNode.put("resourceId", "canvas");
+        ObjectNode stencilset = objectMapper.createObjectNode();
+        stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+        editorNode.set("stencilset", stencilset);
+        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8"));
+    }
+
+    public void deploy(String id) {
+        try {
+            Model model = repositoryService.getModel(id);
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+            if(bpmnModel.getProcesses().isEmpty()){
+                throw new RenException(ErrorCode.ACT_DEPLOY_ERROR);
+            }
+            String processName = model.getName();
+            if (!StringUtils.endsWith(processName, ".bpmn20.xml")){
+                processName += ".bpmn20.xml";
+            }
+
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+            Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy();
+
+            List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+            if (list.size() == 0){
+                throw new RenException(ErrorCode.ACT_DEPLOY_ERROR);
+            }
+        } catch (Exception e) {
+            throw new RenException(ErrorCode.ACT_MODEL_IMG_ERROR, e);
+        }
+    }
+
+    /**
+     * 导出模型
+     */
+    public void export(String id, HttpServletResponse response) {
+        try {
+            Model model = repositoryService.getModel(id);
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+            IOUtils.copy(in, response.getOutputStream());
+            String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
+            response.setHeader("Content-Disposition", "attachment; filename=" + filename);
+            response.flushBuffer();
+        } catch (Exception e) {
+            throw new RenException(ErrorCode.ACT_MODEL_EXPORT_ERROR, id);
+        }
+    }
+
+    /**
+     * 删除模型
+     * @param id  模型ID
+     */
+    public void delete(String id) {
+        repositoryService.deleteModel(id);
+    }
+
+    public void deployImage(String deploymentId, HttpServletResponse response) {
+        List <String> names = repositoryService.getDeploymentResourceNames(deploymentId);
+        String imageName = null;
+        for(String name: names){
+            if(name.indexOf(".png")>=0){
+                imageName = name;
+                break;
+            }
+        }
+        InputStream in = null;
+        InputStream in1 = null;
+        try {
+            if(StringUtils.isNotEmpty(imageName)){
+                in = repositoryService.getResourceAsStream(deploymentId,imageName);
+                response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(imageName, "UTF-8"));
+                response.setHeader("Content-Type","image/png");
+                response.setHeader("Cache-Control", "no-store, no-cache");
+                BufferedImage bufferedImage =  ImageIO.read(in);
+                ImageIO.write(bufferedImage, "png", response.getOutputStream());
+            } else {
+                response.getWriter().println("No image Info!");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if(null != in){
+                    in.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActProcessService.java

@@ -0,0 +1,206 @@
+package com.eitc.modules.activiti.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.exception.RenException;
+import com.eitc.common.page.PageData;
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.ProcessEngineConfiguration;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipInputStream;
+
+/**
+ * 流程管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Service
+public class ActProcessService {
+    @Autowired
+    protected RepositoryService repositoryService;
+
+    @Autowired
+    protected HistoryService historyService;
+
+    @Autowired
+    protected ProcessEngineConfiguration processEngineConfiguration;
+
+    /**
+     * 流程列表
+     */
+    public PageData<Map<String, Object>> page(Map<String, Object> params) {
+        String key = (String)params.get("key");
+        String processName = (String)params.get("processName");
+        boolean isLatestVersion = params.get("isLatestVersion")== null? false : (boolean)params.get("isLatestVersion");
+
+        //分页参数
+        int curPage = 1;
+        int limit = 10;
+        if(params.get(Constant.PAGE) != null){
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        }
+        if(params.get(Constant.LIMIT) != null){
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        }
+
+        ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+            .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
+        if(isLatestVersion){
+            processDefinitionQuery.latestVersion();
+        }
+        if(StringUtils.isNotEmpty(key)){
+            processDefinitionQuery.processDefinitionKeyLike(key);
+        }
+        if(StringUtils.isNotEmpty(processName)){
+            processDefinitionQuery.processDefinitionNameLike(processName);
+        }
+
+        List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage((curPage - 1) * limit, limit);
+
+        List<Map<String, Object>> objectList = new ArrayList<>();
+        for (ProcessDefinition processDefinition : processDefinitionList) {
+            objectList.add(processDefinitionConvert(processDefinition));
+        }
+
+        return new PageData<>(objectList, (int)processDefinitionQuery.count());
+    }
+
+
+    /**
+     * 流程定义信息
+     */
+    private Map<String, Object> processDefinitionConvert(ProcessDefinition processDefinition) {
+        String deploymentId = processDefinition.getDeploymentId();
+        Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult();
+
+        Map<String, Object> map = new HashMap<>(9);
+        map.put("suspended", processDefinition.isSuspended());
+        map.put("id", processDefinition.getId());
+        map.put("deploymentId", processDefinition.getDeploymentId());
+        map.put("name", processDefinition.getName());
+        map.put("key", processDefinition.getKey());
+        map.put("version", processDefinition.getVersion());
+        map.put("resourceName", processDefinition.getResourceName());
+        map.put("diagramResourceName", processDefinition.getDiagramResourceName());
+        map.put("deploymentTime", deployment.getDeploymentTime());
+
+        return map;
+    }
+
+    /**
+     * 部署
+     * @param file 文件
+     */
+    public void deploy(MultipartFile file) throws IOException {
+        String fileName = file.getOriginalFilename();
+        String extension = FilenameUtils.getExtension(fileName);
+        if("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
+            ZipInputStream zip = new ZipInputStream(file.getInputStream());
+            repositoryService.createDeployment().addZipInputStream(zip).deploy();
+        }else if(fileName.indexOf("bpmn20.xml") != -1){
+            repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
+        }else if("bpmn".equalsIgnoreCase(extension)){
+            repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
+        }else{
+            throw new RenException(ErrorCode.ACT_DEPLOY_FORMAT_ERROR);
+        }
+    }
+
+    /**
+     * 激活流程
+     * @param id 流程ID
+     */
+    public void active(String id){
+        repositoryService.activateProcessDefinitionById(id, true, null);
+    }
+
+    /**
+     * 挂起流程
+     * @param id 流程ID
+     */
+    public void suspend(String id){
+        repositoryService.suspendProcessDefinitionById(id, true, null);
+    }
+
+    /**
+     * 将部署的流程转换为模型
+     * @param id 流程ID
+     */
+    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
+        InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+                processDefinition.getResourceName());
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+        XMLStreamReader xtr = xif.createXMLStreamReader(in);
+        BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+
+        BpmnJsonConverter converter = new BpmnJsonConverter();
+        ObjectNode modelNode = converter.convertToJson(bpmnModel);
+        org.activiti.engine.repository.Model modelData = repositoryService.newModel();
+        modelData.setKey(processDefinition.getKey());
+        modelData.setName(processDefinition.getResourceName());
+        modelData.setCategory(processDefinition.getCategory());
+        modelData.setDeploymentId(processDefinition.getDeploymentId());
+        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+
+        ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+        modelData.setMetaInfo(modelObjectNode.toString());
+
+        repositoryService.saveModel(modelData);
+
+        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+
+        return modelData;
+    }
+
+    /**
+     * 删除部署
+     * @param deploymentId  部署ID
+     */
+    public void deleteDeployment(String deploymentId){
+        repositoryService.deleteDeployment(deploymentId, true);
+    }
+
+    /**
+     * 获取资源文件
+     * @param deploymentId  部署ID
+     * @param resourceName 资源名称
+     */
+    public InputStream getResourceAsStream(String deploymentId, String resourceName) {
+        InputStream resourceAsStream = repositoryService.getResourceAsStream(deploymentId, resourceName);
+
+        return resourceAsStream;
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActRunningService.java

@@ -0,0 +1,153 @@
+package com.eitc.modules.activiti.service;
+
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.exception.RenException;
+import com.eitc.common.page.PageData;
+import com.eitc.modules.activiti.dto.ProcessInstanceDTO;
+import com.eitc.modules.activiti.dto.ProcessStartDTO;
+import com.eitc.modules.security.user.SecurityUser;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.impl.RepositoryServiceImpl;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 运行中的流程
+ *
+ * @author Mark eitc@163.com
+ */
+@Service
+public class ActRunningService {
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @Autowired
+    private IdentityService identityService;
+
+    @Autowired
+    protected RepositoryService repositoryService;
+
+    /**
+     * 流程定义列表
+     */
+    public PageData<Map<String, Object>> page(Map<String, Object> params) {
+        String id = (String)params.get("id");
+        String definitionKey = (String)params.get("definitionKey");
+
+        //分页参数
+        int curPage = 1;
+        int limit = 10;
+        if(params.get(Constant.PAGE) != null){
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        }
+        if(params.get(Constant.LIMIT) != null){
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        }
+
+        ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery();
+        if (StringUtils.isNotBlank(id)){
+            processInstanceQuery.processInstanceId(id);
+        }
+        if (StringUtils.isNotBlank(definitionKey)){
+            processInstanceQuery.processDefinitionKey(definitionKey);
+        }
+
+        List<ProcessInstance> processInstanceList = processInstanceQuery.listPage((curPage - 1) * limit, limit);
+        List<Map<String, Object>> objectList = new ArrayList<>();
+        for (ProcessInstance processInstance : processInstanceList) {
+            objectList.add(processInstanceConvert(processInstance));
+        }
+        return new PageData<>(objectList, (int)processInstanceQuery.count());
+    }
+
+    /**
+     * 流程实例信息
+     */
+    private Map<String, Object> processInstanceConvert(ProcessInstance processInstance) {
+        Map<String, Object> map = new HashMap<>(9);
+        map.put("id", processInstance.getId());
+        map.put("processInstanceId", processInstance.getProcessInstanceId());
+        map.put("processDefinitionId", processInstance.getProcessDefinitionId());
+        map.put("processDefinitionName", processInstance.getProcessDefinitionName());
+        map.put("processDefinitionKey", processInstance.getProcessDefinitionKey());
+        map.put("businessKey", processInstance.getBusinessKey());
+        map.put("activityId", processInstance.getActivityId());
+
+        ProcessDefinitionEntity definition = (ProcessDefinitionEntity)((RepositoryServiceImpl)repositoryService).getDeployedProcessDefinition(processInstance.getProcessDefinitionId());
+        ActivityImpl activity = definition.findActivity(processInstance.getActivityId());
+        map.put("activityName", activity.getProperty("name"));
+        map.put("suspended", processInstance.isSuspended());
+
+        return map;
+    }
+
+    /**
+     * 删除实例
+     * @param id  实例ID
+     */
+    public void delete(String id){
+        runtimeService.deleteProcessInstance(id, null);
+    }
+
+    /**
+     * 启动流程实例
+     * @param key 流程定义标识key
+     */
+    public ProcessInstanceDTO startProcess(String key){
+        String userId = SecurityUser.getUserId().toString();
+        identityService.setAuthenticatedUserId(userId);
+        ProcessDefinitionEntity definition = (ProcessDefinitionEntity)repositoryService.createProcessDefinitionQuery().processDefinitionKey(key).latestVersion().singleResult();
+        if(definition.isSuspended()){
+            throw new RenException(ErrorCode.PROCESS_START_ERROR);
+        }
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(key);
+        ProcessInstanceDTO dto = new ProcessInstanceDTO();
+        this.convertInstance(processInstance, dto);
+        return dto;
+    }
+
+    private void convertInstance(ProcessInstance processInstance, ProcessInstanceDTO dto) {
+        dto.setBusinessKey(processInstance.getBusinessKey());
+        dto.setDeploymentId(processInstance.getDeploymentId());
+        dto.setDescription(processInstance.getDescription());
+        dto.setName(processInstance.getName());
+        dto.setEnded(processInstance.isEnded());
+        dto.setSuspended(processInstance.isSuspended());
+        dto.setProcessDefinitionId(processInstance.getProcessDefinitionId());
+        dto.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+        dto.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+        dto.setProcessDefinitionVersion(processInstance.getProcessDefinitionVersion());
+        dto.setProcessInstanceId(processInstance.getProcessInstanceId());
+    }
+
+    /**
+     * 根据流程Key，启动实例
+     * @param processStartDTO
+     * @return
+     */
+    public ProcessInstanceDTO startOfBusinessKey(ProcessStartDTO processStartDTO) {
+        String userId = SecurityUser.getUserId().toString();
+        identityService.setAuthenticatedUserId(userId);
+        ProcessDefinitionEntity definition = (ProcessDefinitionEntity)repositoryService.createProcessDefinitionQuery().processDefinitionKey(processStartDTO.getProcessDefinitionKey()).latestVersion().singleResult();
+        if(definition.isSuspended()){
+            throw new RenException(ErrorCode.PROCESS_START_ERROR);
+        }
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processStartDTO.getProcessDefinitionKey(), processStartDTO.getBusinessKey(),processStartDTO.getVariables());
+        ProcessInstanceDTO dto = new ProcessInstanceDTO();
+        this.convertInstance(processInstance, dto);
+        return dto;
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActTaskService.java

@@ -0,0 +1,558 @@
+package com.eitc.modules.activiti.service;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.exception.ErrorCode;
+import com.eitc.common.exception.RenException;
+import com.eitc.common.page.PageData;
+import com.eitc.common.service.impl.BaseServiceImpl;
+import com.eitc.common.utils.MessageUtils;
+import com.eitc.modules.activiti.dto.TaskDTO;
+import com.eitc.modules.security.user.SecurityUser;
+import com.eitc.modules.sys.service.SysRoleUserService;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.delegate.Expression;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.impl.RepositoryServiceImpl;
+import org.activiti.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
+import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.process.TransitionImpl;
+import org.activiti.engine.impl.task.TaskDefinition;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.activiti.engine.task.TaskInfo;
+import org.activiti.engine.task.TaskQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 任务管理
+ *
+ * @author Jone
+ */
+@Service
+public class ActTaskService extends BaseServiceImpl {
+    @Autowired
+    protected TaskService taskService;
+    @Autowired
+    protected HistoryService historyService;
+    @Autowired
+    protected RepositoryService repositoryService;
+    @Autowired
+    protected RuntimeService runtimeService;
+    @Autowired
+    private SysRoleUserService sysRoleUserService;
+
+    /**
+     * 根据参数获取当前运行的任务信息
+     *
+     * @param params
+     * @return
+     */
+    public PageData<TaskDTO> page(Map<String, Object> params) {
+        String userId = (String) params.get("userId");
+        Integer curPage = 1;
+        Integer limit = 10;
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
+        }
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
+        }
+        TaskQuery taskQuery = taskService.createTaskQuery();
+        if (StringUtils.isNotEmpty(userId)) {
+            taskQuery.taskAssignee(userId);
+        }
+        if (StringUtils.isNotEmpty((String)params.get("taskName"))){
+            taskQuery.taskNameLike("%"+(String)params.get("taskName")+"%");
+        }
+        if(StringUtils.isNotEmpty((String)params.get("isRoleGroup"))&&"1".equals(params.get("isRoleGroup"))){
+            List<Long> listRoles = sysRoleUserService.getRoleIdList(SecurityUser.getUserId());
+            List<String> listStr = new ArrayList<>();
+            for(Long role : listRoles){
+                listStr.add(role.toString());
+            }
+            listStr.add(SecurityUser.getUserId().toString());
+            if(!listStr.isEmpty()){
+                taskQuery.taskCandidateGroupIn(listStr);
+            } else {
+                return new PageData<>(new ArrayList<>(), 0);
+            }
+        }
+        taskQuery.orderByTaskCreateTime().desc();
+        List<Task> list = taskQuery.listPage((curPage - 1) * limit, limit);
+        List<TaskDTO> listDto = new ArrayList<>();
+        for (Task task : list) {
+            TaskDTO dto = new TaskDTO();
+            this.convertTaskInfo(task, dto);
+            listDto.add(dto);
+        }
+        return new PageData<>(listDto, (int) taskQuery.count());
+    }
+
+    /**
+     * 获取任务详情信息
+     *
+     * @param id
+     * @return
+     */
+    public TaskDTO taskDetail(String id) {
+        Task task = taskService.createTaskQuery().taskId(id).singleResult();
+        TaskDTO dto = new TaskDTO();
+        this.convertTaskInfo(task, dto);
+        return dto;
+    }
+
+    /**
+     * 签收任务
+     *
+     * @param taskId
+     */
+    public void claimTask(String taskId) {
+        String userId = SecurityUser.getUserId().toString();
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        if(StringUtils.isNotEmpty(task.getAssignee())){
+            throw new RenException(ErrorCode.TASK_CLIME_FAIL);
+        }
+        taskService.claim(taskId, userId);
+    }
+
+    /**
+     * 释放任务
+     *
+     * @param taskId
+     */
+    public void unclaimTask(String taskId) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String procInstId = task.getProcessInstanceId();
+        String processDefinitionId = historyService.createHistoricProcessInstanceQuery().processInstanceId(procInstId)
+                .singleResult().getProcessDefinitionId();
+        ProcessDefinitionEntity def = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
+        ExecutionEntity execution = (ExecutionEntity) runtimeService.createProcessInstanceQuery().processInstanceId(procInstId).singleResult();
+        String activitiId = execution.getActivityId();
+        List<ActivityImpl> activitiList = def.getActivities();
+        List<String> lstGroupId = new ArrayList<>();
+        for (ActivityImpl activityImpl : activitiList) {
+            if (activitiId.equals(activityImpl.getId())) {
+                TaskDefinition taskDef = ((UserTaskActivityBehavior) activityImpl.getActivityBehavior()).getTaskDefinition();
+                Set<Expression> groupIds = taskDef.getCandidateGroupIdExpressions();
+                for (Expression exp : groupIds) {
+                    lstGroupId.add(exp.getExpressionText());
+                }
+            }
+        }
+        if(lstGroupId.isEmpty()){
+            throw new RenException(ErrorCode.UNCLAIM_ERROR_MESSAGE);
+        }
+        taskService.unclaim(taskId);
+    }
+
+    /**
+     * 处理任务
+     *
+     * @param taskId
+     * @param comment
+     */
+    public void completeTask(String taskId, String comment) {
+        String userId = SecurityUser.getUserId().toString();
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        if(StringUtils.isNotEmpty(task.getAssignee())){
+            taskService.setAssignee(taskId, userId);
+        }
+        if(StringUtils.isNotEmpty(comment)){
+            taskService.addComment(taskId, task.getProcessInstanceId(), comment);
+        }
+        taskService.complete(taskId);
+    }
+
+    /**
+     * 任务转办
+     *
+     * @param taskId
+     * @param depositorId
+     * @param assignee
+     */
+    public void changeTaskAssignee(String taskId, String depositorId, String assignee) {
+        taskService.setOwner(taskId, depositorId);
+        taskService.setAssignee(taskId, assignee);
+    }
+
+    /**
+     * 获取流程参数
+     *
+     * @param taskId
+     * @param variableName
+     * @return
+     */
+    public Map<String, Object> getTaskVariables(String taskId, String variableName) {
+        Map<String, Object> map = null;
+        if (StringUtils.isNotBlank(variableName)) {
+            Object value = taskService.getVariable(taskId, variableName);
+            if(null != value){
+                map = new HashMap<>();
+                map.put(variableName, value);
+            }
+        } else {
+            map = taskService.getVariables(taskId);
+        }
+        return map;
+    }
+
+    /**
+     * 更新任务变量
+     * @param taskDTO
+     */
+    public void updateTaskVariable(TaskDTO taskDTO) {
+        taskService.setVariables(taskDTO.getTaskId(), taskDTO.getParams());
+    }
+
+
+    /**
+     * 根据任务ID判断是否为多实例任务
+     * @param taskId
+     * @return
+     */
+    private boolean isMultiInstance(String taskId) {
+        boolean flag = false;
+        Task task=taskService.createTaskQuery().taskId(taskId).singleResult();
+        if(task != null){
+            // 获取流程定义id
+            String processDefinitionId=task.getProcessDefinitionId();
+            ProcessDefinitionEntity processDefinitionEntity=(ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
+            // 根据活动id获取活动实例
+            ActivityImpl activityImpl=processDefinitionEntity.findActivity(task.getTaskDefinitionKey());
+            if((activityImpl).getActivityBehavior() instanceof ParallelMultiInstanceBehavior){
+                ParallelMultiInstanceBehavior behavior = (ParallelMultiInstanceBehavior)activityImpl.getActivityBehavior();
+                if(behavior != null && behavior.getCollectionExpression() != null){
+                    flag = true;
+                }
+            }
+        }
+
+        return flag;
+    }
+
+    /**
+     * 删除任务下的所有变量
+     *
+     * @param taskId
+     * @return
+     */
+    public void deleteTaskVariables(String taskId) {
+        Collection<String> currentVariables = taskService.getVariablesLocal(taskId).keySet();
+        taskService.removeVariables(taskId, currentVariables);
+    }
+
+    public void deleteTaskVariable(String taskId, String variableName, String scope) {
+        if (StringUtils.isNotEmpty(scope)) {
+            if ("global".equals(scope.toLowerCase())) {
+                Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+                runtimeService.removeVariable(task.getExecutionId(), variableName);
+            } else if ("local".equals(scope.toLowerCase())) {
+                taskService.removeVariable(taskId, variableName);
+            }
+        } else {
+            taskService.removeVariable(taskId, variableName);
+        }
+    }
+
+    /**
+     * 任务回退至上一用户任务节点
+     * @param taskId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void doBackPreviousTask(String taskId, String comment) {
+        Map<String, Object> variables = null;
+        HistoricTaskInstance currTask = historyService.createHistoricTaskInstanceQuery().taskId(taskId).singleResult();
+        if(this.isMultiInstance(taskId)){
+            throw new RenException(ErrorCode.BACK_PROCESS_PARALLEL_ERROR);
+        }
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(currTask.getProcessInstanceId()).singleResult();
+        ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
+                .getDeployedProcessDefinition(currTask.getProcessDefinitionId());
+        ActivityImpl currActivity = processDefinitionEntity.findActivity(currTask.getTaskDefinitionKey());
+        List<ActivityImpl>  canBackActivitys = new ArrayList<>();
+        this.getCanBackUpActivitys(currActivity, canBackActivitys);
+        if(canBackActivitys.isEmpty()) {
+            throw new RenException(ErrorCode.SUPERIOR_NOT_EXIST);
+        }
+        List<PvmTransition> originPvmTransitionList = new ArrayList<PvmTransition>();
+        List<PvmTransition> pvmTransitionList = currActivity.getOutgoingTransitions();
+        for (PvmTransition pvmTransition : pvmTransitionList) {
+            originPvmTransitionList.add(pvmTransition);
+        }
+        pvmTransitionList.clear();
+        List<HistoricActivityInstance> historicActivityInstances = historyService
+                .createHistoricActivityInstanceQuery().activityType("userTask")
+                .processInstanceId(processInstance.getId())
+                .finished().orderByHistoricActivityInstanceEndTime().desc().list();
+        List<ActivityImpl> backActivitys = new ArrayList<>();
+        for(HistoricActivityInstance historicActivityInstance: historicActivityInstances){
+            for(ActivityImpl activity : canBackActivitys){
+                if(historicActivityInstance.getActivityId().equals(activity.getId())){
+                    boolean flag = false;
+                    for(ActivityImpl activity1 : backActivitys){
+                        if(activity.getId().equals(activity1.getId())){
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if(!flag){
+                        backActivitys.add(activity);
+                    }
+                }
+            }
+        }
+
+        if(backActivitys.isEmpty()){
+            throw new RenException(ErrorCode.SUPERIOR_NOT_EXIST);
+        }
+        List<TransitionImpl> transitionList = new ArrayList<>();
+        for(ActivityImpl activity : backActivitys) {
+            TransitionImpl transition = currActivity.createOutgoingTransition(IdWorker.get32UUID());
+            transition.setDestination(activity);
+            transitionList.add(transition);
+        }
+
+        variables = processInstance.getProcessVariables();
+        List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId())
+                .taskDefinitionKey(currTask.getTaskDefinitionKey()).list();
+        for (Task task : tasks) {
+            String commentMode = MessageUtils.getMessage(ErrorCode.ROLLBACK_MESSAGE);
+            if(StringUtils.isNotEmpty(comment)){
+                commentMode += "[" +comment+"]";
+            }
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), commentMode);
+            taskService.complete(task.getId(), variables);
+        }
+        currActivity.getOutgoingTransitions().clear();
+        for (PvmTransition pvmTransition : originPvmTransitionList) {
+            currActivity.getOutgoingTransitions().add(pvmTransition);
+        }
+        for(ActivityImpl activity : backActivitys) {
+            List<PvmTransition> incomingTransitions = activity.getIncomingTransitions();
+            Iterator<PvmTransition> iterator = incomingTransitions.iterator();
+            while (iterator.hasNext()) {
+                PvmTransition pvmTransition = iterator.next();
+                for(TransitionImpl transition : transitionList) {
+                    if(transition.getId().equals(pvmTransition.getId())){
+                        iterator.remove();
+                    }
+                }
+            }
+        }
+    }
+
+    private void getCanBackUpActivitys(ActivityImpl currActivity, List<ActivityImpl> rtnList) {
+        List<PvmTransition> incomingTransitions = currActivity.getIncomingTransitions();
+        for(PvmTransition pvmTransition : incomingTransitions){
+            TransitionImpl transitionImpl = (TransitionImpl) pvmTransition;
+            ActivityImpl activityImpl = transitionImpl.getSource();
+            String type = (String) activityImpl.getProperty("type");
+            if ("parallelGateway".equals(type)){
+                // 并行路线
+                if(activityImpl.getOutgoingTransitions().size() > 1){
+                    throw new RenException(ErrorCode.BACK_PROCESS_HANDLEING_ERROR);
+                }
+                this.getCanBackUpActivitys(activityImpl, rtnList);
+            } else if ("startEvent".equals(type)) {
+                return;
+            } else if ("userTask".equals(type)) {
+                rtnList.add(activityImpl);
+            } else if ("exclusiveGateway".equals(type)) {
+                this.getCanBackUpActivitys(activityImpl, rtnList);
+            } else if("inclusiveGateway".equals(type)) {
+                if(activityImpl.getOutgoingTransitions().size() > 1){
+                    return;
+                }
+                this.getCanBackUpActivitys(activityImpl, rtnList);
+            }
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void endProcess(String taskId, String comment) {
+        if(isMultiInstance(taskId)){
+            throw new RenException(ErrorCode.END_PROCESS_PARALLEL_ERROR);
+        }
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        List<Task> tasks = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId())
+                .taskDefinitionKey(task.getTaskDefinitionKey()).list();
+        if(tasks.size() > 1){
+            throw new RenException(ErrorCode.END_PROCESS_HANDLEING_ERROR);
+        }
+        ActivityImpl endActivity = findActivitiImpl(taskId, "end");
+        if (endActivity == null) {
+            return;
+        }
+        if (StringUtils.isEmpty(endActivity.getId())) {
+            if (!StringUtils.isEmpty(task.getOwner())) {
+                taskService.resolveTask(task.getId());
+            }
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), comment);
+            taskService.complete(taskId);
+        } else {
+            ActivityImpl currActivity = findActivitiImpl(taskId, null);
+            List<PvmTransition> oriPvmTransitionList = new ArrayList<PvmTransition>();
+            List<PvmTransition> pvmTransitionList = currActivity
+                    .getOutgoingTransitions();
+            for (PvmTransition pvmTransition : pvmTransitionList) {
+                oriPvmTransitionList.add(pvmTransition);
+            }
+            pvmTransitionList.clear();
+            TransitionImpl newTransition = currActivity.createOutgoingTransition();
+            ActivityImpl pointActivity = findActivitiImpl(taskId, endActivity.getId());
+            newTransition.setDestination(pointActivity);
+            if (StringUtils.isNotEmpty(task.getOwner())) {
+                taskService.resolveTask(task.getId());
+            }
+            String message = MessageUtils.getMessage(ErrorCode.END_PROCESS_MESSAGE);
+            comment = message + "["+ comment+ "]";
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), comment);
+            taskService.complete(taskId);
+            pointActivity.getIncomingTransitions().remove(newTransition);
+            List<PvmTransition> pvmTransitionListC = currActivity.getOutgoingTransitions();
+            pvmTransitionListC.clear();
+            for (PvmTransition pvmTransition : oriPvmTransitionList) {
+                pvmTransitionListC.add(pvmTransition);
+            }
+        }
+
+    }
+
+    private ActivityImpl findActivitiImpl(String taskId, String activityId) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        if (task == null) {
+            return null;
+        }
+        ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(task.getProcessDefinitionId());
+        if (processDefinition == null) {
+            throw new RenException(ErrorCode.NONE_EXIST_PROCESS);
+        }
+        if (StringUtils.isEmpty(activityId)) {
+            activityId = task.getTaskDefinitionKey();
+        }
+        if ("END".equals(activityId.toUpperCase())) {
+            for (ActivityImpl activityImpl : processDefinition.getActivities()) {
+                String type = (String)activityImpl.getProperty("type");
+                if("endEvent".equals(type)){
+                    return activityImpl;
+                }
+            }
+        }
+        ActivityImpl activityImpl = processDefinition.findActivity(activityId);
+        return activityImpl;
+    }
+
+    /**
+     * 转换Task对象
+     * @param task
+     * @param dto
+     */
+    private void convertTaskInfo(Task task, TaskDTO dto) {
+        dto.setTaskId(task.getId());
+        dto.setTaskName(task.getName());
+        dto.setActivityId(task.getExecutionId());
+        dto.setAssignee(task.getAssignee());
+        dto.setProcessDefinitionId(task.getProcessDefinitionId());
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+        dto.setProcessDefinitionName(processDefinition.getName());
+        dto.setProcessDefinitionKey(processDefinition.getKey());
+        HistoricProcessInstance processInstance =  historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+        dto.setStartTime(processInstance.getStartTime());
+        dto.setBusinessKey(processInstance.getBusinessKey());
+        dto.setProcessInstanceId(task.getProcessInstanceId());
+        dto.setOwner(task.getOwner());
+        dto.setCreateTime(task.getCreateTime());
+        dto.setDueDate(task.getDueDate());
+    }
+
+    /**
+     * 驳回至第一个用户任务
+     * @param taskId
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void backToFirst(String taskId, String comment) {
+        if(this.isMultiInstance(taskId)){
+            throw new RenException(ErrorCode.REJECT_PROCESS_PARALLEL_ERROR);
+        }
+        Map variables = null;
+        HistoricTaskInstance currTask = historyService.createHistoricTaskInstanceQuery().taskId(taskId).singleResult();
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(currTask.getProcessInstanceId()).singleResult();
+        ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
+                .getDeployedProcessDefinition(currTask.getProcessDefinitionId());
+        if (processDefinitionEntity == null) {
+            throw new RenException(ErrorCode.NONE_EXIST_PROCESS);
+        }
+        List<Task> tasks = taskService.createTaskQuery().processInstanceId(currTask.getProcessInstanceId())
+                .taskDefinitionKey(currTask.getTaskDefinitionKey()).list();
+        if(tasks.size() > 1){
+            throw new RenException(ErrorCode.REJECT_PROCESS_HANDLEING_ERROR);
+        }
+        ActivityImpl currActivity = processDefinitionEntity.findActivity(currTask.getTaskDefinitionKey());
+        List<PvmTransition> originPvmTransitionList = new ArrayList<>();
+        List<PvmTransition> pvmTransitionList = currActivity.getOutgoingTransitions();
+        for (PvmTransition pvmTransition : pvmTransitionList) {
+            originPvmTransitionList.add(pvmTransition);
+        }
+        pvmTransitionList.clear();
+        List<HistoricActivityInstance> historicActivityInstances = historyService
+                .createHistoricActivityInstanceQuery().activityType("userTask")
+                .processInstanceId(processInstance.getId())
+                .finished().orderByHistoricActivityInstanceEndTime().asc().list();
+        TransitionImpl transitionImpl = null;
+        if (historicActivityInstances.size() > 0) {
+            ActivityImpl lastActivity = processDefinitionEntity.findActivity(historicActivityInstances.get(0).getActivityId());
+            transitionImpl = currActivity.createOutgoingTransition();
+            transitionImpl.setDestination(lastActivity);
+        } else {
+            throw new RenException(ErrorCode.SUPERIOR_NOT_EXIST);
+        }
+        variables = processInstance.getProcessVariables();
+        for (Task task : tasks) {
+            String commentMode = MessageUtils.getMessage(ErrorCode.REJECT_MESSAGE);
+            if(StringUtils.isNotEmpty(comment)){
+                commentMode += "[" + comment+"]";
+            }
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), commentMode);
+            taskService.complete(task.getId(), variables);
+        }
+        currActivity.getOutgoingTransitions().remove(transitionImpl);
+
+        for (PvmTransition pvmTransition : originPvmTransitionList) {
+            pvmTransitionList.add(pvmTransition);
+        }
+    }
+
+    public void completeTaskByVariables(TaskDTO taskDTO) {
+        if(null != taskDTO.getParams()){
+            Set keySet = taskDTO.getParams().keySet();
+            Iterator iterator = keySet.iterator();
+            while(iterator.hasNext()){
+                String key = (String)iterator.next();
+                this.setTaskVariable(taskDTO.getTaskId(),key , taskDTO.getParams().get(key));
+            }
+        }
+        this.completeTask(taskDTO.getTaskId(), taskDTO.getComment());
+    }
+
+    private void setTaskVariable(String taskId, String key, Object value){
+        TaskInfo taskInfo = taskService.createTaskQuery().taskId(taskId).singleResult();
+        runtimeService.setVariable(taskInfo.getExecutionId(), key, value);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActivitiService.java

@@ -0,0 +1,22 @@
+package com.eitc.modules.activiti.service;
+
+import com.eitc.common.page.PageData;
+import com.eitc.common.service.BaseService;
+import com.eitc.modules.activiti.dto.HistoryDetailDTO;
+import com.eitc.modules.activiti.dto.ProcessActivityDTO;
+import com.eitc.modules.activiti.entity.ProcessActivityEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程自定义查询
+ *
+ * @author Jone
+ */
+public interface ActivitiService  extends BaseService<ProcessActivityEntity> {
+
+    PageData<ProcessActivityDTO> getMyProcessInstancePage(Map<String, Object> params);
+
+    List<HistoryDetailDTO> getTaskHandleDetailInfo(String processInstanceId);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ProcessBizRouteService.java

@@ -0,0 +1,19 @@
+package com.eitc.modules.activiti.service;
+
+import com.eitc.common.service.BaseService;
+import com.eitc.modules.activiti.dto.ProcessBizRouteDTO;
+import com.eitc.modules.activiti.entity.ProcessBizRouteEntity;
+
+/**
+ * @Author:Jone
+ */
+public interface ProcessBizRouteService  extends BaseService<ProcessBizRouteEntity> {
+
+    ProcessBizRouteDTO getProcDefBizRoute(String id);
+
+    void save(ProcessBizRouteDTO processBizRouteDTO);
+
+    void updateProcBizRoute(ProcessBizRouteDTO processBizRouteDTO);
+
+    ProcessBizRouteDTO getLatestProcDefBizRoute(String procDefKey);
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/impl/ActivitiServiceImpl.java

@@ -0,0 +1,46 @@
+package com.eitc.modules.activiti.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.eitc.common.page.PageData;
+import com.eitc.common.service.impl.BaseServiceImpl;
+import com.eitc.common.utils.ConvertUtils;
+import com.eitc.modules.activiti.dao.ProcessActivityDao;
+import com.eitc.modules.activiti.dto.HistoryDetailDTO;
+import com.eitc.modules.activiti.dto.ProcessActivityDTO;
+import com.eitc.modules.activiti.entity.HistoryDetailEntity;
+import com.eitc.modules.activiti.entity.ProcessActivityEntity;
+import com.eitc.modules.activiti.service.ActivitiService;
+import com.eitc.modules.security.user.SecurityUser;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作流
+ *
+ * @author Jone
+ */
+@Service
+public class ActivitiServiceImpl extends BaseServiceImpl<ProcessActivityDao, ProcessActivityEntity> implements ActivitiService {
+
+    @Override
+    public PageData<ProcessActivityDTO> getMyProcessInstancePage(Map<String, Object> params) {
+        params.put("userId", SecurityUser.getUserId().toString());
+        IPage<ProcessActivityEntity> page = getPage(params, null, false);
+        List<ProcessActivityEntity> list = baseDao.getMyProcessInstancePage(params);
+        return getPageData(list, page.getTotal(), ProcessActivityDTO.class);
+    }
+
+    @Override
+    public List<HistoryDetailDTO> getTaskHandleDetailInfo(String processInstanceId) {
+        List<HistoryDetailEntity> listEntity = baseDao.getTaskHandleDetailInfo(processInstanceId);
+        for(HistoryDetailEntity entity : listEntity){
+            if(entity.getEndTime() != null && entity.getStartTime() != null){
+                long diff = entity.getEndTime().getTime() - entity.getStartTime().getTime();
+                entity.setDurationInSeconds(diff/1000);
+            }
+        }
+        return ConvertUtils.sourceToTarget(listEntity, HistoryDetailDTO.class);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/activiti/service/impl/ProcessBizRouteServiceImpl.java

@@ -0,0 +1,47 @@
+package com.eitc.modules.activiti.service.impl;
+
+import com.eitc.common.service.impl.BaseServiceImpl;
+import com.eitc.common.utils.ConvertUtils;
+import com.eitc.modules.activiti.dao.ProcessBizRouteDao;
+import com.eitc.modules.activiti.dto.ProcessBizRouteDTO;
+import com.eitc.modules.activiti.entity.ProcessBizRouteEntity;
+import com.eitc.modules.activiti.service.ProcessBizRouteService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author:Jone
+ */
+@Service
+public class ProcessBizRouteServiceImpl  extends BaseServiceImpl<ProcessBizRouteDao, ProcessBizRouteEntity> implements ProcessBizRouteService {
+
+    @Override
+    public ProcessBizRouteDTO getProcDefBizRoute(String id) {
+        ProcessBizRouteEntity entity = baseDao.getProcDefBizRoute(id);
+        ProcessBizRouteDTO dto = ConvertUtils.sourceToTarget(entity, ProcessBizRouteDTO.class);
+        return dto;
+    }
+
+    @Override
+    public void save(ProcessBizRouteDTO processBizRouteDTO) {
+        ProcessBizRouteEntity entity = ConvertUtils.sourceToTarget(processBizRouteDTO, ProcessBizRouteEntity.class);
+        this.insert(entity);
+    }
+
+    @Override
+    public void updateProcBizRoute(ProcessBizRouteDTO processBizRouteDTO) {
+        ProcessBizRouteEntity entity = ConvertUtils.sourceToTarget(processBizRouteDTO, ProcessBizRouteEntity.class);
+        this.updateById(entity);
+    }
+
+    @Override
+    public ProcessBizRouteDTO getLatestProcDefBizRoute(String procDefKey) {
+        List<ProcessBizRouteEntity> list = baseDao.getLatestProcDefBizRoute(procDefKey);
+        if(list.isEmpty()){
+            return null;
+        }
+        ProcessBizRouteEntity entity = list.get(0);
+        return ConvertUtils.sourceToTarget(entity, ProcessBizRouteDTO.class);
+    }
+}

eitc-admin/src/main/java/com/eitc/modules/demo/controller/NewsController.java

@@ -0,0 +1,104 @@
+package com.eitc.modules.demo.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.common.validator.AssertUtils;
+import com.eitc.common.validator.ValidatorUtils;
+import com.eitc.common.validator.group.AddGroup;
+import com.eitc.common.validator.group.DefaultGroup;
+import com.eitc.common.validator.group.UpdateGroup;
+import com.eitc.modules.demo.dto.NewsDTO;
+import com.eitc.modules.demo.service.NewsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 新闻
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("demo/news")
+@Api(tags="新闻管理")
+public class NewsController {
+    @Autowired
+    private NewsService newsService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = "title", value = "标题", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("demo:news:all")
+    public Result<PageData<NewsDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<NewsDTO> page = newsService.page(params);
+
+        return new Result<PageData<NewsDTO>>().ok(page);
+    }
+
+    @ApiOperation("信息")
+    @GetMapping("{id}")
+    @RequiresPermissions("demo:news:all")
+    public Result<NewsDTO> info(@PathVariable("id") Long id){
+        NewsDTO news = newsService.get(id);
+
+        return new Result<NewsDTO>().ok(news);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("demo:news:all")
+    public Result save(NewsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        newsService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("demo:news:all")
+    public Result update(NewsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        newsService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("demo:news:all")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        newsService.deleteBatchIds(Arrays.asList(ids));
+
+        return new Result();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/controller/ProductController.java

@@ -0,0 +1,101 @@
+package com.eitc.modules.demo.controller;
+
+import com.eitc.common.annotation.LogOperation;
+import com.eitc.common.constant.Constant;
+import com.eitc.common.page.PageData;
+import com.eitc.common.utils.Result;
+import com.eitc.common.validator.AssertUtils;
+import com.eitc.common.validator.ValidatorUtils;
+import com.eitc.common.validator.group.AddGroup;
+import com.eitc.common.validator.group.DefaultGroup;
+import com.eitc.common.validator.group.UpdateGroup;
+import com.eitc.modules.demo.dto.ProductDTO;
+import com.eitc.modules.demo.service.ProductService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
+
+
+/**
+ * 产品管理
+ *
+ * @author Mark eitc@163.com
+ */
+@RestController
+@RequestMapping("demo/product")
+@Api(tags="产品管理")
+public class ProductController {
+    @Autowired
+    private ProductService productService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("demo:product:page")
+    public Result<PageData<ProductDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProductDTO> page = productService.page(params);
+
+        return new Result<PageData<ProductDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @RequiresPermissions("demo:product:info")
+    public Result<ProductDTO> get(@PathVariable("id") Long id){
+        ProductDTO data = productService.get(id);
+
+        return new Result<ProductDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("demo:product:save")
+    public Result save(@RequestBody ProductDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        productService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("demo:product:update")
+    public Result update(@RequestBody ProductDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        productService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("demo:product:delete")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        productService.delete(ids);
+
+        return new Result();
+    }
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dao/NewsDao.java

@@ -0,0 +1,20 @@
+package com.eitc.modules.demo.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.demo.entity.NewsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 新闻
+ *
+ * @author Mark eitc@163.com
+ */
+@Mapper
+public interface NewsDao extends BaseDao<NewsEntity> {
+
+    List<NewsEntity> getList(Map<String, Object> params);
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dao/ProductDao.java

@@ -0,0 +1,15 @@
+package com.eitc.modules.demo.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.demo.entity.ProductEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 产品管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Mapper
+public interface ProductDao extends BaseDao<ProductEntity> {
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dao/ProductParamsDao.java

@@ -0,0 +1,19 @@
+package com.eitc.modules.demo.dao;
+
+import com.eitc.common.dao.BaseDao;
+import com.eitc.modules.demo.entity.ProductParamsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 产品参数管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Mapper
+public interface ProductParamsDao extends BaseDao<ProductParamsEntity> {
+
+    /**
+     * 根据产品id，删除产品参数
+     */
+    void deleteByProductIds(Long[] productIds);
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dto/NewsDTO.java

@@ -0,0 +1,46 @@
+package com.eitc.modules.demo.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.eitc.common.validator.group.AddGroup;
+import com.eitc.common.validator.group.DefaultGroup;
+import com.eitc.common.validator.group.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 新闻管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@ApiModel(value = "新闻管理")
+public class NewsDTO implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    @Null(message="{id.null}", groups = AddGroup.class)
+    @NotNull(message="{id.require}", groups = UpdateGroup.class)
+    private Long id;
+
+    @ApiModelProperty(value = "标题")
+    @NotBlank(message="{news.title.require}", groups = DefaultGroup.class)
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    @NotBlank(message="{news.content.require}", groups = DefaultGroup.class)
+    private String content;
+
+    @ApiModelProperty(value = "发布时间")
+    private Date pubDate;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Date createDate;
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dto/ProductDTO.java

@@ -0,0 +1,37 @@
+package com.eitc.modules.demo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 产品管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@ApiModel(value = "产品管理")
+public class ProductDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "产品名称")
+	private String name;
+
+	@ApiModelProperty(value = "产品介绍")
+	private String content;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createDate;
+
+	@ApiModelProperty(value = "产品参数列表")
+	private List<ProductParamsDTO> subList;
+
+}

eitc-admin/src/main/java/com/eitc/modules/demo/dto/ProductParamsDTO.java

@@ -0,0 +1,25 @@
+package com.eitc.modules.demo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 产品参数管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@ApiModel(value = "产品参数管理")
+public class ProductParamsDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "参数名")
+	private String paramName;
+
+	@ApiModelProperty(value = "参数值")
+	private String paramValue;
+}

eitc-admin/src/main/java/com/eitc/modules/demo/entity/NewsEntity.java

@@ -0,0 +1,50 @@
+package com.eitc.modules.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 新闻
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("tb_news")
+public class NewsEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 标题
+	 */
+	private String title;
+	/**
+	 * 内容
+	 */
+	private String content;
+	/**
+	 * 发布时间
+	 */
+	private Date pubDate;
+	/**
+	 * 创建者dept_id
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long deptId;
+	/**
+	 * 更新者
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updater;
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateDate;
+}

eitc-admin/src/main/java/com/eitc/modules/demo/entity/ProductEntity.java

@@ -0,0 +1,41 @@
+package com.eitc.modules.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 产品管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("tb_product")
+public class ProductEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 产品名称
+     */
+	private String name;
+    /**
+     * 产品介绍
+     */
+	private String content;
+    /**
+     * 更新者
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateDate;
+}

eitc-admin/src/main/java/com/eitc/modules/demo/entity/ProductParamsEntity.java

@@ -0,0 +1,45 @@
+package com.eitc.modules.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eitc.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 产品参数管理
+ *
+ * @author Mark eitc@163.com
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("tb_product_params")
+public class ProductParamsEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数名
+     */
+	private String paramName;
+    /**
+     * 参数值
+     */
+	private String paramValue;
+    /**
+     * 产品ID
+     */
+	private Long productId;
+    /**
+     * 更新者
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateDate;
+}

eitc-admin/src/main/java/com/eitc/modules/demo/service/NewsService.java

@@ -0,0 +1,25 @@
+package com.eitc.modules.demo.service;
+
+import com.eitc.common.page.PageData;
+import com.eitc.common.service.BaseService;
+import com.eitc.modules.demo.dto.NewsDTO;
+import com.eitc.modules.demo.entity.NewsEntity;
+
+import java.util.Map;
+
+/**
+ * 新闻
+ *
+ * @author Mark eitc@163.com
+ */
+public interface NewsService extends BaseService<NewsEntity> {
+
+    PageData<NewsDTO> page(Map<String, Object> params);
+
+    NewsDTO get(Long id);
+
+    void save(NewsDTO dto);
+
+    void update(NewsDTO dto);
+}
+