From b0808978b2b114460af0fa374408e2c6cba6c5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E6=96=87=E8=BF=9C?= <1042732167@qq.com> Date: Fri, 8 Jul 2022 14:48:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20bug=20=E6=B5=81=E7=A8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E6=80=BB=E6=9D=A1=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=9D=A1=E6=95=B0=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/FlowMonitorController.java | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/activiti/FlowMonitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/activiti/FlowMonitorController.java index 4c599be..42d8972 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/activiti/FlowMonitorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/activiti/FlowMonitorController.java @@ -1,47 +1,39 @@ package com.ruoyi.web.controller.activiti; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.system.domain.FlowInfo; -import com.ruoyi.system.domain.TaskInfo; -import com.ruoyi.system.domain.VariableInfo; -import com.ruoyi.web.util.ActivitiTracingChart; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.activiti.bpmn.model.BpmnModel; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; + 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.history.HistoricVariableInstance; -import org.activiti.engine.impl.util.IoUtil; -import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.Execution; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstanceQuery; import org.activiti.engine.task.Comment; import org.activiti.engine.task.Task; -import org.activiti.image.ProcessDiagramGenerator; -import org.apache.commons.io.IOUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.system.domain.FlowInfo; +import com.ruoyi.system.domain.TaskInfo; +import com.ruoyi.system.domain.VariableInfo; +import com.ruoyi.web.util.ActivitiTracingChart; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; /** * 流程监控 @@ -106,8 +98,10 @@ public class FlowMonitorController extends BaseController { if (StringUtils.isNotEmpty(name)) { condition.processDefinitionName(name); } - List processList = condition.orderByProcessDefinitionId().desc().listPage(start, pageSize); + // 先查询总条数 int total = condition.orderByProcessDefinitionId().desc().list().size(); + // 再查询列表(防止出现总条数和列表一致的bug) + List processList = condition.orderByProcessDefinitionId().desc().listPage(start, pageSize); List flows = new ArrayList<>(); processList.stream().forEach(p -> { FlowInfo info = new FlowInfo(); -- Gitee From faaef0d5e8738c8ff43cade322699cec7a14b269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E6=96=87=E8=BF=9C?= <1042732167@qq.com> Date: Tue, 6 Sep 2022 18:27:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20bug=20=E6=B5=81=E7=A8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E6=80=BB=E6=9D=A1=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=9D=A1=E6=95=B0=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/logback.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index a360583..4139d3a 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -85,7 +85,10 @@ - + + + + -- Gitee