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 2f4ddb707c8b774a548fd4124c8fd9b0c5c12db3..2d1ae4e6a3fd05215db767495448cb8c6a455541 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; 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 557cf18517894e9b55d77a77d3f673af90663d47..e79dc3b53f24b58e1f88ecaaa990da8f82834481 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