From c657c03752401d4601aecd13f2cc73bd6189fe84 Mon Sep 17 00:00:00 2001 From: hecaifeng <18810382694@163.com> Date: Tue, 19 Nov 2024 09:40:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=B1=BB=E5=BC=95=E5=85=A5CollectionUtils=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tongtech/web/controller/console/RdsMonitorController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/rds-console/console-admin/src/main/java/com/tongtech/web/controller/console/RdsMonitorController.java b/rds-console/console-admin/src/main/java/com/tongtech/web/controller/console/RdsMonitorController.java index 2f4ddb7..2d1ae4e 100644 --- a/rds-console/console-admin/src/main/java/com/tongtech/web/controller/console/RdsMonitorController.java +++ b/rds-console/console-admin/src/main/java/com/tongtech/web/controller/console/RdsMonitorController.java @@ -12,6 +12,7 @@ import com.tongtech.console.service.CenterStatSrcService; import com.tongtech.console.service.NodeStatService; import com.tongtech.console.service.RdsServiceService; import com.tongtech.console.service.ServiceStatService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -- Gitee From a44b09eefa86a8f6a30429031aa07cdd701ad9ba Mon Sep 17 00:00:00 2001 From: hecaifeng <18810382694@163.com> Date: Tue, 19 Nov 2024 09:44:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E8=AF=A6=E6=83=85sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/console/NodeStatMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rds-console/console-system/src/main/resources/mapper/console/NodeStatMapper.xml b/rds-console/console-system/src/main/resources/mapper/console/NodeStatMapper.xml index 557cf18..e79dc3b 100644 --- a/rds-console/console-system/src/main/resources/mapper/console/NodeStatMapper.xml +++ b/rds-console/console-system/src/main/resources/mapper/console/NodeStatMapper.xml @@ -219,6 +219,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND create_second <= #{endCreateSecond} - AND expired=0 GROUP BY node_id,DATE_FORMAT(FROM_UNIXTIME(create_second),#{interval.groupTimeFormater}) + AND expired=0 GROUP BY node_id -- Gitee