挂起和激活

Author: liuguofeng-java

activiti7-java/src/main/java/com/activiti/modules/controller/ProcessDefinitionController.java

@@ -55,6 +55,17 @@ public R<Map<String, Object>> getDefinitionInfo(String deploymentId) {
         return R.ok(result);
     }
 
+    /**
+     * 更新流程定义状态 激活或者挂起
+     *
+     * @param deploymentId 部署id
+     */
+    @GetMapping("updateState")
+    public R<String> updateState(String deploymentId) {
+        processDefinitionService.updateState(deploymentId);
+        return R.ok();
+    }
+
     /**
      * 部署流程
      *

activiti7-java/src/main/java/com/activiti/modules/entity/dto/workflow/DefinitionListDto.java

@@ -10,9 +10,18 @@
  **/
 @Data
 public class DefinitionListDto {
-    // 流程定义名称
+    /**
+     * 流程定义名称
+     */
     private String definitionName;
 
-    // 流程定义key
+    /**
+     * 流程定义key
+     */
     private String definitionKey;
+
+    /**
+     * 是否激活
+     */
+    private boolean isActive;
 }

activiti7-java/src/main/java/com/activiti/modules/entity/vo/workflow/DefinitionListVo.java

@@ -1,7 +1,9 @@
 package com.activiti.modules.entity.vo.workflow;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -42,6 +44,14 @@ public class DefinitionListVo {
      */
     private Map<String, Object> formJson;
 
+    /**
+     * 是否挂起状态
+     */
+    private boolean isSuspended;
 
-
+    /**
+     * 部署时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deploymentTime;
 }

activiti7-java/src/main/java/com/activiti/modules/service/ProcessDefinitionService.java

@@ -4,7 +4,6 @@
 import com.activiti.modules.entity.dto.workflow.DeployProcessDto;
 import com.activiti.utils.page.TableDataInfo;
 
-import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -25,6 +24,7 @@ public interface ProcessDefinitionService {
 
     /**
      * 获取流程定义xml
+     *
      * @param deploymentId 部署id
      * @return 流程xml字符串
      */
@@ -36,17 +36,25 @@ public interface ProcessDefinitionService {
      * @param deploymentId 部署id
      * @return 流程xml字符串和流程表单
      */
-    Map<String,Object> getDefinitionInfo(String deploymentId);
+    Map<String, Object> getDefinitionInfo(String deploymentId);
 
+    /**
+     * 更新流程定义状态 激活或者挂起
+     *
+     * @param deploymentId 部署id
+     */
+    void updateState(String deploymentId);
 
     /**
      * 部署流程
+     *
      * @param dto 参数
      */
     void deployProcess(DeployProcessDto dto);
 
     /**
      * 删除流程
+     *
      * @param deploymentId 部署id
      */
     void delete(String deploymentId);

activiti7-java/src/main/java/com/activiti/modules/service/impl/ProcessDefinitionServiceImpl.java

@@ -1,6 +1,5 @@
 package com.activiti.modules.service.impl;
 
-import com.activiti.modules.dao.TableDao;
 import com.activiti.modules.entity.SysDeployEntity;
 import com.activiti.modules.entity.SysDeployNodeEntity;
 import com.activiti.modules.entity.TableColumns;
@@ -70,19 +69,22 @@ public TableDataInfo queryPage(DefinitionListDto dto) {
                 .orderByProcessDefinitionVersion().desc();
         query.processDefinitionNameLike("%" + dto.getDefinitionName() + "%");
         query.processDefinitionKeyLike("%" + dto.getDefinitionKey() + "%");
+        if (dto.isActive()) query.active();
         List<ProcessDefinition> list =
                 query.listPage(params.getPageNo() - 1, params.getPageSize());
         List<DefinitionListVo> resultList = new ArrayList<>();
         for (ProcessDefinition item : list) {
             DefinitionListVo vo = new DefinitionListVo();
+            Deployment deployment = repositoryService.createDeploymentQuery()
+                    .deploymentId(item.getDeploymentId())
+                    .singleResult();
+            vo.setDeploymentTime(deployment.getDeploymentTime());
             BeanUtils.copyProperties(item, vo);
             // 获取主表单
             SysDeployNodeEntity mainForm = deployNodeService.getOne(new LambdaQueryWrapper<SysDeployNodeEntity>()
                     .eq(SysDeployNodeEntity::getDeployId, item.getDeploymentId())
                     .eq(SysDeployNodeEntity::getIsMainFrom, 1));
-            if (mainForm != null) {
-                vo.setFormJson(mainForm.getFormJson());
-            }
+            if (mainForm != null) vo.setFormJson(mainForm.getFormJson());
             resultList.add(vo);
         }
         return PageUtils.getDataTable(resultList, query.count());
@@ -124,7 +126,6 @@ public String getDefinitionXml(String deploymentId) {
     @Transactional
     @Override
     public void deployProcess(DeployProcessDto dto) {
-
         // 部署xml
         Deployment deploy = repositoryService.createDeployment().disableBpmnValidation()
                 .addString("index.bpmn", dto.getXml())
@@ -221,11 +222,29 @@ public Map<String, Object> getDefinitionInfo(String deploymentId) {
                 nodeColumnsVos.add(nodeColumnsVo);
             }
             result.put("nodeColumns", nodeColumnsVos);
-
         }
         return result;
     }
 
+    /**
+     * 更新流程定义状态 激活或者挂起
+     *
+     * @param deploymentId 部署id
+     */
+    @Override
+    public void updateState(String deploymentId) {
+        ProcessDefinition definition = repositoryService.createProcessDefinitionQuery()
+                .deploymentId(deploymentId)
+                .singleResult();
+        if (definition == null) throw new AException("未知流程");
+        boolean isSuspended = repositoryService.isProcessDefinitionSuspended(definition.getId());
+        if (isSuspended) {
+            repositoryService.activateProcessDefinitionById(definition.getId());
+        } else {
+            repositoryService.suspendProcessDefinitionById(definition.getId());
+        }
+    }
+
     /**
      * 删除流程
      *

activiti7-ui/src/components/BpmnJs/components/Panel/components/ElementGenerations.vue

@@ -88,6 +88,7 @@ const updateElementDoc = (value: string) => {
  * 初始化节点名称,如果节点名称等于空预赋值
  */
 const initElementName = () => {
+  elementName.value = getNameValue(scopedElement) || "";
   if (elementName.value) return;
   const item = list.find((t) => t.elementType === modeler.getActive.type);
   const elements: any[] = modeler.getElRegistry._elements;
@@ -99,7 +100,7 @@ const initElementName = () => {
 // 点击用户节点，初始化用
 EventBus.on("element-init", function () {
   scopedElement = modeler.getActive;
-  getElementData();
   initElementName();
+  getElementData();
 });
 </script>

activiti7-ui/src/store/modeler.ts

@@ -249,7 +249,6 @@ export default defineStore("modeler", {
         this.removeNodeColumn(tableColumn);
         tableItem.columns.push(tableColumn);
       }
-      console.log("nodeColumns->>>/", this.nodeColumns);
     }
   }
 });

activiti7-ui/src/views/activiti/my/start/model/SelectProcess.vue

@@ -36,6 +36,7 @@ import baseService from "@/service/baseService";
 const queryForm = reactive({
   definitionName: "",
   definitionKey: "",
+  active: true,
   pageNo: 1,
   pageSize: 10
 });

activiti7-ui/src/views/activiti/workflow/definition/index.vue

@@ -22,16 +22,25 @@
       <el-table-column label="流程id" align="center" prop="id" />
       <el-table-column label="流程名称" align="center" prop="name" />
       <el-table-column label="流程key" align="center" prop="key" />
-      <el-table-column label="版本" align="center" prop="version" />
-      <el-table-column label="主表单" align="center" prop="version">
+      <el-table-column label="版本" align="center" prop="version" width="100" />
+      <el-table-column label="主表单" align="center" width="100">
         <template #default="scoped">
           <MainForm :form-json="scoped.row.formJson" />
           <h5 v-if="!scoped.row.formJson">暂无信息</h5>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template #default="scoped">
+          <el-tag v-if="scoped.row.suspended" type="danger">挂起</el-tag>
+          <el-tag v-else>激活</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="部署时间" align="center" prop="deploymentTime" />
       <el-table-column>
         <template #default="scope">
           <el-button link type="primary" icon="Crop" @click="handleDesign(scope.row.deploymentId)">设计</el-button>
+          <el-button link type="primary" icon="VideoPlay" @click="updateState(scope.row.deploymentId)" v-if="scope.row.suspended">激活</el-button>
+          <el-button link type="primary" icon="VideoPause" @click="updateState(scope.row.deploymentId)" v-else>挂起</el-button>
           <el-button link type="primary" icon="Pointer" @click="handleDetails(scope.row.deploymentId)">查看</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row.deploymentId)">删除</el-button>
         </template>
@@ -125,6 +134,23 @@ function handleDesign(deploymentId: string) {
   deployBpmn.value.open(deploymentId);
 }
 
+/**
+ * 更新流程定义状态 激活或者挂起
+ * @param deploymentId 流程部署id
+ */
+function updateState(deploymentId: any) {
+  ElMessageBox.confirm("确认要删除当前项吗? 流程实例启动的也将被删除,谨慎删除", "提示").then(() => {
+    baseService.get(`/processDefinition/updateState?deploymentId=${deploymentId}`).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(res.msg);
+        getList();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  });
+}
+
 /**
  * 删除按钮操作
  * @param deploymentId 流程部署id

document/bpmnDataTable.md

@@ -38,11 +38,9 @@
 
 #### 三.关于表单字段和数据库对应关系扩展
 
-> `getWidgetDataType` 是组件和数据库类型对应关系，如: 绑定已有的表后，输入框可以选择数据库中的类型配置
->
-> `getDefaultWidgetDataType` 是默认组件对应数据库的类型，如: 绑定创建数据库表后，输入框绑定字段后生成的数据库类型以字段长度
+> 需要扩展字段或者数据库需要修改或新增 类 `DbConfig` 和 文件`resources` 下的 `widgetDataType`
 
 ![](images/bdt_9.png)
 
-
+![](images/bdt_10.png)