Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql

@@ -22,3 +22,89 @@ CREATE TABLE epdc_item_information(
 ) COMMENT = ' ';;
 
 ------------------------------------------2019-11-20-----------------------------------------------
+------------------------------------------2019-11-26-----------------------------------------------
+
+-- 新增分类管理表
+CREATE TABLE `epdc_category` (
+  `id` bigint(32) NOT NULL COMMENT 'id',
+  `pid` bigint(32) DEFAULT NULL COMMENT '上级分类ID',
+  `pids` varchar(500) DEFAULT NULL COMMENT '所有上级分类ID，用逗号分开',
+  `category_name` varchar(50) DEFAULT NULL COMMENT '分类名称',
+  `category_code` varchar(255) DEFAULT NULL COMMENT '分类编码',
+  `category_type` varchar(50) DEFAULT NULL COMMENT '分类类别',
+  `sort` int(10) unsigned DEFAULT NULL COMMENT '排序',
+  `del_flag` tinyint(4) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+  `creator` bigint(20) DEFAULT NULL COMMENT '创建者',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `updater` bigint(20) DEFAULT NULL COMMENT '更新者',
+  `update_date` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `category_code_unique` (`category_code`) USING BTREE COMMENT '类别编码唯一',
+  KEY `idx_pid` (`pid`),
+  KEY `idx_del_flag` (`del_flag`),
+  KEY `idx_create_date` (`create_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分类管理';
+
+-- 事件表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_events ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_events ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_events ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_events ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_events ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 议题表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_issue ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_issue ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_issue ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_issue ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_issue ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 项目表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_item ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_item ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_item ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_item ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_item ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 议题处理进度表增加操作人联系方式字段
+ALTER TABLE epdc_issue_handle ADD MOBILE varchar(20) NULL COMMENT '操作人联系方式';
+
+------------------------------------------2019-11-26-----------------------------------------------
+
+------------------------------------------2019-11-27------------------------------------------------
+DROP TABLE esua_epdc_events.epdc_dept_kpi_config;
+DROP TABLE esua_epdc_events.epdc_dept_respond_log;
+DROP TABLE esua_epdc_events.epdc_dept_respond_time_config;
+DROP TABLE esua_epdc_events.epdc_grid_work_score;
+DROP TABLE esua_epdc_events.pdman_db_version;
+
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+------------------------------------------2019-11-27------------------------------------------------

esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql

@@ -0,0 +1,43 @@
+------------------------------------------2019-11-27-----------------------------------------------
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+------------------------------------------2019-11-27-----------------------------------------------

esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql

@@ -0,0 +1,42 @@
+------------------------------------------2019-11-27-----------------------------------------------
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `STREET_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `COMMUNITY_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `STREET_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `COMMUNITY_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_members ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `DISTRICT`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `DISTRICT_ID`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_user ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_user ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `DISTRICT`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `DISTRICT_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+------------------------------------------2019-11-27-----------------------------------------------

esua-epdc/doc/db/newupdate.sql

@@ -5,4 +5,6 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机
 ALTER TABLE sys_dept ADD party_code varchar(50)
 
 -------------  2019-09-24 --------------------
-ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注'
+ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注';
+
+

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml

@@ -10,7 +10,6 @@
         <result property="startColor" column="START_COLOR"/>
         <result property="endColor" column="END_COLOR"/>
         <result property="lableColor" column="LABLE_COLOR"/>
-        <result property="icon" column="ICON"/>
         <result property="templateCode" column="TEMPLATE_CODE"/>
         <result property="templateName" column="TEMPLATE_NAME"/>
         <result property="revision" column="REVISION"/>

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileToServerUtils.java → esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileUtils.java

@@ -9,7 +9,7 @@ import java.io.File;
  * @Author：liuchuang
  * @Date：2019/11/22 16:28
  */
-public class UploadFileToServerUtils {
+public class UploadFileUtils {
 
     public static String uploadFile(File file) {
         return "";

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -204,6 +204,7 @@ renren:
   workLoginUrls:
     - /api/work/user/getToken #工作端-获取token
     - /api/work/user/login #工作端-登录
+    - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口
 

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml

@@ -12,26 +12,21 @@
     <artifactId>epdc-activiti-client</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <swagger.version>2.7.0</swagger.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.version}</version>
+            <version>2.7.0</version>
         </dependency>
     </dependencies>
 

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml

@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <activiti.version>6.0.0</activiti.version>
+        <activiti.version>5.22.0</activiti.version>
     </properties>
 
     <dependencies>
@@ -41,8 +41,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -60,48 +60,41 @@
                 </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>
+            </exclusions>
+        </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>
     </dependencies>
 
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-    </profiles>
-
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1567478636229" name="" targetNamespace="http://www.activiti.org/testm1567478636229" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="demoTask" isClosed="false" isExecutable="true" name="测试任务流程" processType="None">
-    <startEvent id="_2" name="StartEvent"/>
-    <endEvent id="_3" name="EndEvent"/>
-    <userTask activiti:assignee="${deptId}" activiti:exclusive="true" id="_4" name="初次审核">
-      <extensionElements>
-        <activiti:executionListener event="end" expression="审核完成"/>
-      </extensionElements>
-    </userTask>
-    <userTask activiti:assignee="${deptId}" activiti:exclusive="true" id="_5" name="二次审核">
-      <extensionElements>
-        <activiti:executionListener event="end" expression="审核完成"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="_6" sourceRef="_2" targetRef="_4"/>
-    <sequenceFlow id="_7" sourceRef="_4" targetRef="_5"/>
-    <sequenceFlow id="_8" sourceRef="_5" targetRef="_3"/>
-  </process>
-  <bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="demoTask">
-      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
-        <dc:Bounds height="32.0" width="32.0" x="370.0" y="60.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
-        <dc:Bounds height="32.0" width="32.0" x="375.0" y="640.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
-        <dc:Bounds height="55.0" width="85.0" x="350.0" y="225.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
-        <dc:Bounds height="55.0" width="85.0" x="355.0" y="415.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_4">
-        <di:waypoint x="386.0" y="92.0"/>
-        <di:waypoint x="386.0" y="225.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_4" targetElement="_5">
-        <di:waypoint x="395.0" y="280.0"/>
-        <di:waypoint x="395.0" y="415.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_5" targetElement="_3">
-        <di:waypoint x="391.0" y="470.0"/>
-        <di:waypoint x="391.0" y="640.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1566628843418" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="myProcess_1" isClosed="false" isExecutable="true" processType="None">
-    <startEvent id="_2" name="testTaskStart"/>
-    <endEvent id="_6" name="testTaskEnd"/>
-    <userTask activiti:exclusive="true" id="_11" name="UserTask">
-      <extensionElements>
-        <activiti:executionListener event="start" expression="test"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="_13" sourceRef="_2" targetRef="_11"/>
-    <sequenceFlow id="_14" sourceRef="_11" targetRef="_6"/>
-  </process>
-  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="myProcess_1">
-      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
-        <omgdc:Bounds height="32.0" width="32.0" x="290.0" y="55.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_6" id="Shape-_6">
-        <omgdc:Bounds height="32.0" width="32.0" x="285.0" y="515.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_11" id="Shape-_11">
-        <omgdc:Bounds height="55.0" width="85.0" x="530.0" y="240.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_2" targetElement="_11">
-        <omgdi:waypoint x="322.0" y="71.0"/>
-        <omgdi:waypoint x="530.0" y="267.5"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_11" targetElement="_6">
-        <omgdi:waypoint x="530.0" y="267.5"/>
-        <omgdi:waypoint x="317.0" y="531.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -20,8 +20,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @since 1.1.0
  */
 @SpringBootApplication(exclude = {
-        org.activiti.spring.boot.SecurityAutoConfiguration.class,
+    org.activiti.spring.boot.SecurityAutoConfiguration.class,
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+    org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
 })
 @EnableDiscoveryClient
 @EnableFeignClients

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java

@@ -1,66 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-import com.elink.esua.epdc.exception.ModuleErrorCode;
-import com.elink.esua.epdc.service.ActIdService;
-import com.elink.esua.epdc.service.ActProcessService;
-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.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 rongchao
- * @Date 19-9-6
- */
-@RestController
-@RequestMapping("actId")
-public class ActIdController {
-
-    @Autowired
-    private ActIdService actIdService;
-
-    /**
-     * 添加流程用户
-     *
-     * @param actUserFormDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    @PostMapping("addUser")
-    public Result<String> addUser(ActUserFormDto actUserFormDto) {
-        return actIdService.saveUser(actUserFormDto);
-    }
-
-    /**
-     * 添加用户组
-     *
-     * @param actGroupFormDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    @PostMapping("addGroup")
-    public Result<String> addGroup(ActGroupFormDto actGroupFormDto) {
-        return actIdService.saveGroup(actGroupFormDto);
-    }
-
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.ModelDTO;
+import com.elink.esua.epdc.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.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 sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("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")
+    })
+    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("新增模型")
+    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("部署")
+    public Result deploy(@PathVariable("id") String id) {
+        actModelService.deploy(id);
+        return new Result();
+    }
+
+    @GetMapping("export/{id}")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) {
+        actModelService.export(id, response);
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    public Result delete(@RequestBody String[] ids) {
+        for(String id : ids) {
+            actModelService.delete(id);
+        }
+        return new Result();
+    }
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java

@@ -88,15 +88,15 @@ public class ActProcessController {
         return new Result();
     }
 
-//    @PostMapping("convertToModel/{id}")
+    @PostMapping("convertToModel/{id}")
-//    @ApiOperation("将部署的流程转换为模型")
+    @ApiOperation("将部署的流程转换为模型")
-//    @LogOperation("将部署的流程转换为模型")
+    @LogOperation("将部署的流程转换为模型")
-//    @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String")
+    @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String")
-//    public Result convertToModel(@PathVariable("id") String id) throws Exception {
+    public Result convertToModel(@PathVariable("id") String id) throws Exception {
-//        actProcessService.convertToModel(id);
+        actProcessService.convertToModel(id);
-//
+
-//        return new Result();
+        return new Result();
-//    }
+    }
 
     @DeleteMapping
     @ApiOperation("删除流程")

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java

@@ -1,23 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-/**
- * 流程用户组表单DTO
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Data
-public class ActGroupFormDto {
-
-    /**
-     * 用户组ID
-     */
-    private long groupId;
-
-    /**
-     * 用户组名
-     */
-    private String groupName;
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java

@@ -1,23 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-/**
- * 流程用户表单DTO
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Data
-public class ActUserFormDto {
-
-    /**
-     * 用户ID
-     */
-    private long userId;
-
-    /**
-     * 用户名
-     */
-    private String userName;
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.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 sunlightcs@gmail.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);
+    }
+  }
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.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 sunlightcs@gmail.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;
+    }
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.editor.model;
+
+import com.elink.esua.epdc.commons.tools.xss.XssHttpServletRequestWrapper;
+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.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 sunlightcs@gmail.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);
+        }
+    }
+
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java

@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.exception;
 
+
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 
 /**

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java

@@ -1,45 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-
-/**
- * 流程用户服务接口类
- *
- * @author rongchao
- * @Date 19-9-6
- */
-public interface ActIdService {
-
-    /**
-     * 添加用户
-     *
-     * @param actUserFormDto 用户名
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> saveUser(ActUserFormDto actUserFormDto);
-
-    /**
-     * 添加用户组
-     *
-     * @param actGroupFormDto 用户组名
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> saveGroup(ActGroupFormDto actGroupFormDto);
-
-    /**
-     * 修改用户组名
-     *
-     * @param newGroupName
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> modifyGroupName(String newGroupName);
-
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java

@@ -1,23 +1,37 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+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.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;
 
@@ -34,104 +48,104 @@ public class ActModelService {
     private ObjectMapper objectMapper;
 
     public PageData<Model> page(Map<String, Object> params) {
-        String key = (String)params.get("key");
+        String key = (String) params.get("key");
-        String name = (String)params.get("name");
+        String name = (String) params.get("name");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if(params.get(Constant.PAGE) != null){
+        if (params.get(Constant.PAGE) != null) {
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
+        if (params.get(Constant.LIMIT) != null) {
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc();
 
-        if(StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotEmpty(key)) {
             modelQuery.modelKey(key);
         }
-        if(StringUtils.isNotEmpty(name)){
+        if (StringUtils.isNotEmpty(name)) {
             modelQuery.modelName(name);
         }
 
         List<Model> list = modelQuery.listPage((curPage - 1) * limit, limit);
-        return new PageData<>(list, (int)modelQuery.count());
+        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 save(String name, String key, String description) throws UnsupportedEncodingException {
+    public void deploy(String id) {
-//        //新建一个空模型
+        try {
-//        Model model = repositoryService.newModel();
+            Model model = repositoryService.getModel(id);
-//
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
-//        //metaInfo信息
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
-//        ObjectNode metaInfo = objectMapper.createObjectNode();
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
-//        metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name);
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
-//        metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
-//        metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion());
+
-//
+            String processName = model.getName();
-//        model.setKey(key);
+            if (!StringUtils.endsWith(processName, ".bpmn20.xml")) {
-//        model.setName(name);
+                processName += ".bpmn20.xml";
-//        model.setMetaInfo(metaInfo.toString());
+            }
-//
+
-//        repositoryService.saveModel(model);
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
-//
+            Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy();
-//        ObjectNode editorNode = objectMapper.createObjectNode();
+
-//        editorNode.put("id", "canvas");
+            List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
-//        editorNode.put("resourceId", "canvas");
+            if (list.size() == 0) {
-//        ObjectNode stencilset = objectMapper.createObjectNode();
+                throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR);
-//        stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+            }
-//        editorNode.set("stencilset", stencilset);
+        } catch (Exception e) {
-//        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8"));
+            throw new RenException(ModuleErrorCode.ACT_MODEL_IMG_ERROR, e);
-//    }
+        }
-//
+    }
-//    public void deploy(String id) {
+
-//        try {
+    /**
-//            Model model = repositoryService.getModel(id);
+     * 导出模型
-//            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+     */
-//            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
+    public void export(String id, HttpServletResponse response) {
-//            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+        try {
-//            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+            Model model = repositoryService.getModel(id);
-//            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
-//
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
-//            String processName = model.getName();
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
-//            if (!StringUtils.endsWith(processName, ".bpmn20.xml")){
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
-//                processName += ".bpmn20.xml";
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
-//            }
+
-//
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
-//            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+            IOUtils.copy(in, response.getOutputStream());
-//            Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy();
+            String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
-//
+            response.setHeader("Content-Disposition", "attachment; filename=" + filename);
-//            List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+            response.flushBuffer();
-//            if (list.size() == 0){
+        } catch (Exception e) {
-//                throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR);
+            throw new RenException(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id);
-//            }
+        }
-//        } catch (Exception e) {
+    }
-//            throw new RenException(ModuleErrorCode.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(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id);
-//        }
-//    }
 
     /**
      * 删除模型

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -12,8 +12,15 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+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.ProcessDefinition;
 import org.activiti.engine.repository.ProcessDefinitionQuery;
 import org.apache.commons.io.FilenameUtils;
@@ -22,8 +29,13 @@ 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;
@@ -42,31 +54,28 @@ public class ActProcessService {
 
     /**
      * 流程列表
-     *
-     * @param params
-     * @return
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String key = (String) params.get("key");
+        String key = (String)params.get("key");
-        String processName = (String) params.get("processName");
+        String processName = (String)params.get("processName");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if (params.get(Constant.PAGE) != null) {
+        if(params.get(Constant.PAGE) != null){
-            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
         }
-        if (params.get(Constant.LIMIT) != null) {
+        if(params.get(Constant.LIMIT) != null){
-            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
         }
 
         ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion()
-                .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
+            .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
 
-        if (StringUtils.isNotEmpty(key)) {
+        if(StringUtils.isNotEmpty(key)){
             processDefinitionQuery.processDefinitionKeyLike(key);
         }
-        if (StringUtils.isNotEmpty(processName)) {
+        if(StringUtils.isNotEmpty(processName)){
             processDefinitionQuery.processDefinitionNameLike(processName);
         }
 
@@ -77,7 +86,7 @@ public class ActProcessService {
             objectList.add(processDefinitionConvert(processDefinition));
         }
 
-        return new PageData<>(objectList, (int) processDefinitionQuery.count());
+        return new PageData<>(objectList, (int)processDefinitionQuery.count());
     }
 
 
@@ -104,90 +113,85 @@ public class ActProcessService {
 
     /**
      * 部署
-     *
      * @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)) {
+        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) {
+        }else if(fileName.indexOf("bpmn20.xml") != -1){
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        } else if ("bpmn".equalsIgnoreCase(extension)) {
+        }else if("bpmn".equalsIgnoreCase(extension)){
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        } else {
+        }else{
             throw new RenException(ModuleErrorCode.ACT_DEPLOY_FORMAT_ERROR);
         }
     }
 
     /**
      * 激活流程
-     *
      * @param id 流程ID
      */
-    public void active(String id) {
+    public void active(String id){
         repositoryService.activateProcessDefinitionById(id, true, null);
     }
 
     /**
      * 挂起流程
-     *
      * @param id 流程ID
      */
-    public void suspend(String id) {
+    public void suspend(String id){
         repositoryService.suspendProcessDefinitionById(id, true, null);
     }
 
-//    /**
+    /**
-//     * 将部署的流程转换为模型
+     * 将部署的流程转换为模型
-//     * @param id 流程ID
+     * @param id 流程ID
-//     */
+     */
-//    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
+    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
-//        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
-//        InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+        InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
-//                processDefinition.getResourceName());
+                processDefinition.getResourceName());
-//        XMLInputFactory xif = XMLInputFactory.newInstance();
+        XMLInputFactory xif = XMLInputFactory.newInstance();
-//        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
-//        XMLStreamReader xtr = xif.createXMLStreamReader(in);
+        XMLStreamReader xtr = xif.createXMLStreamReader(in);
-//        BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+        BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
-//
+
-//        BpmnJsonConverter converter = new BpmnJsonConverter();
+        BpmnJsonConverter converter = new BpmnJsonConverter();
-//        ObjectNode modelNode = converter.convertToJson(bpmnModel);
+        ObjectNode modelNode = converter.convertToJson(bpmnModel);
-//        Model modelData = repositoryService.newModel();
+        Model modelData = repositoryService.newModel();
-//        modelData.setKey(processDefinition.getKey());
+        modelData.setKey(processDefinition.getKey());
-//        modelData.setName(processDefinition.getResourceName());
+        modelData.setName(processDefinition.getResourceName());
-//        modelData.setCategory(processDefinition.getCategory());
+        modelData.setCategory(processDefinition.getCategory());
-//        modelData.setDeploymentId(processDefinition.getDeploymentId());
+        modelData.setDeploymentId(processDefinition.getDeploymentId());
-//        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
-//
+
-//        ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+        ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
-//        modelData.setMetaInfo(modelObjectNode.toString());
+        modelData.setMetaInfo(modelObjectNode.toString());
-//
+
-//        repositoryService.saveModel(modelData);
+        repositoryService.saveModel(modelData);
-//
+
-//        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
-//
+
-//        return modelData;
+        return modelData;
-//    }
+    }
 
     /**
      * 删除部署
-     *
+     * @param deploymentId  部署ID
-     * @param deploymentId 部署ID
      */
-    public void deleteDeployment(String deploymentId) {
+    public void deleteDeployment(String deploymentId){
         repositoryService.deleteDeployment(deploymentId, true);
     }
 
     /**
      * 获取资源文件
-     *
+     * @param deploymentId  部署ID
-     * @param deploymentId 部署ID
      * @param resourceName 资源名称
      */
     public InputStream getResourceAsStream(String deploymentId, String resourceName) {

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -37,24 +37,24 @@ public class ActRunningService {
      * 流程定义列表
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String id = (String)params.get("id");
+        String id = (String) params.get("id");
-        String definitionKey = (String)params.get("definitionKey");
+        String definitionKey = (String) params.get("definitionKey");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if(params.get(Constant.PAGE) != null){
+        if (params.get(Constant.PAGE) != null) {
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
+        if (params.get(Constant.LIMIT) != null) {
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery();
-        if (StringUtils.isNotBlank(id)){
+        if (StringUtils.isNotBlank(id)) {
             processInstanceQuery.processInstanceId(id);
         }
-        if (StringUtils.isNotBlank(definitionKey)){
+        if (StringUtils.isNotBlank(definitionKey)) {
             processInstanceQuery.processDefinitionKey(definitionKey);
         }
 
@@ -63,7 +63,7 @@ public class ActRunningService {
         for (ProcessInstance processInstance : processInstanceList) {
             objectList.add(processInstanceConvert(processInstance));
         }
-        return new PageData<>(objectList, (int)processInstanceQuery.count());
+        return new PageData<>(objectList, (int) processInstanceQuery.count());
     }
 
     /**
@@ -86,7 +86,7 @@ public class ActRunningService {
      * 删除实例
      * @param id  实例ID
      */
-    public void delete(String id){
+    public void delete(String id) {
         runtimeService.deleteProcessInstance(id, null);
     }
 
@@ -94,7 +94,7 @@ public class ActRunningService {
      * 启动流程实例
      * @param key 流程定义标识key
      */
-    public void startProcess(String key){
+    public void startProcess(String key) {
         runtimeService.startProcessInstanceByKey(key);
     }
 }

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java

@@ -1,24 +0,0 @@
-package com.elink.esua.epdc.service;
-
-/**
- * activiti工作流
- *
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/3 11:18
- */
-public interface ActWorkflowCommonService {
-
-    /**
-     * 启动流程并绑定任务
-     *
-     * @param processKey  流程ID
-     * @param businessKey 任务ID
-     * @param deptId      部门ID（通过部门ID，判断是否有权限审核任务）
-     * @return boolean
-     * @author yujintao
-     * @date 2019/9/3 13:58
-     */
-    boolean startProcess(String processKey, String businessKey, String deptId);
-
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java

@@ -1,37 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-import com.elink.esua.epdc.service.ActIdService;
-import org.activiti.engine.IdentityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 流程用户服务实现类
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Service
-public class ActIdServiceImpl implements ActIdService {
-
-    @Autowired
-    private IdentityService identityService;
-
-    @Override
-    public Result<String> saveUser(ActUserFormDto actUserFormDto) {
-        return null;
-    }
-
-    @Override
-    public Result<String> saveGroup(ActGroupFormDto actGroupFormDto) {
-        return null;
-    }
-
-    @Override
-    public Result<String> modifyGroupName(String newGroupName) {
-        return new Result<String>().ok("success");
-    }
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java

@@ -1,50 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.service.ActWorkflowCommonService;
-import com.google.common.collect.Maps;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/3 11:19
- */
-@Service
-public class ActWorkflowCommonServiceImpl implements ActWorkflowCommonService {
-
-    @Autowired
-    private RepositoryService repositoryService;
-
-    @Autowired
-    private RuntimeService runtimeService;
-
-    @Autowired
-    private TaskService taskService;
-
-    @Autowired
-    private HistoryService historyService;
-
-    @Override
-    public boolean startProcess(String processKey, String businessKey, String deptId) {
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("deptId", deptId);
-        map.put("activityId", "_2");
-        //使用正在执行对象表中的一个字段BUSINESS_KEY(Activiti提供的一个字段)，让启动的流程（流程实例）关联业务
-        runtimeService.startProcessInstanceByKey(processKey, businessKey, map);
-        return true;
-    }
-
-
-}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: @server.port@
+  port: 8106
   servlet:
     context-path: /activiti
 
@@ -16,11 +16,10 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   activiti:
-    check-process-definitions: true
+    check-process-definitions: false
-    database-schema-update: false
+    database-schema-update: true
-    process-definition-location-prefix: classpath:/processes/
   redis:
-    database: 2
+    database: 0
     host: 47.104.224.45
     timeout: 30s
     port: 6379
@@ -28,27 +27,24 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://47.104.224.45:3308/epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
+      username: epdc
-      password: shibei@888
+      password: elink833066
   cloud:
     nacos:
       discovery:
-        server-addr: @nacos.server-addr@
+        server-addr: 47.104.224.45:8848
-        register-enabled: @nacos.register-enabled@
+        register-enabled: true
-    alibaba:
-      seata:
-        tx-service-group: epdc-activiti-server-fescar-service-group
       #Oracle
-      #      driver-class-name: oracle.jdbc.OracleDriver
+#      driver-class-name: oracle.jdbc.OracleDriver
-      #      url: jdbc:oracle:thin:@localhost:1521:xe
+#      url: jdbc:oracle:thin:@localhost:1521:xe
-      #      username: renren_cloud
+#      username: renren_cloud
-      #      password: 123456
+#      password: 123456
       #SQLServer
-      #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      #      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
+#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-      #      username: sa
+#      username: sa
-      #      password: 123456
+#      password: 123456
       #postgresql
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://localhost:5432/renren_cloud