community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to display statistics in webapps

Browse Source 
Fixed to display the subscription statistics in web apps also.
This commit is contained in:
Ruwin Dissanayake 2024-11-04 15:45:24 +05:30
parent e547199706
commit a149f64d13
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
View File

@ -1590,20 +1590,23 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
int deviceCount = 0; int deviceCount = 0;
try { try {
Connection connection = GroupManagementDAOFactory.getConnection(); Connection connection = GroupManagementDAOFactory.getConnection();
String sql = "SELECT COUNT(e.ID) AS COUNT " + StringBuilder sql = new StringBuilder("SELECT COUNT(e.ID) AS COUNT " +
"FROM DM_GROUP d " + "FROM DM_GROUP d " +
"INNER JOIN DM_DEVICE_GROUP_MAP m ON d.ID = m.GROUP_ID " + "INNER JOIN DM_DEVICE_GROUP_MAP m ON d.ID = m.GROUP_ID " +
"INNER JOIN DM_ENROLMENT e ON m.DEVICE_ID = e.DEVICE_ID " + "INNER JOIN DM_ENROLMENT e ON m.DEVICE_ID = e.DEVICE_ID " +
"INNER JOIN DM_DEVICE r ON e.DEVICE_ID = r.ID " + "INNER JOIN DM_DEVICE r ON e.DEVICE_ID = r.ID " +
"WHERE d.TENANT_ID = ? " + "WHERE d.TENANT_ID = ? " +
"AND d.GROUP_NAME = ? " + "AND d.GROUP_NAME = ? " +
"AND r.DEVICE_TYPE_ID = ? " + "AND e.STATUS NOT IN ('REMOVED', 'DELETED')");
"AND e.STATUS NOT IN ('REMOVED', 'DELETED')"; if (deviceTypeId != 0) {
sql.append(" AND r.DEVICE_TYPE_ID = ?");
try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { }
try (PreparedStatement preparedStatement = connection.prepareStatement(sql.toString())) {
preparedStatement.setInt(1, tenantId); preparedStatement.setInt(1, tenantId);
preparedStatement.setString(2, groupName); preparedStatement.setString(2, groupName);
preparedStatement.setInt(3, deviceTypeId); if (deviceTypeId != 0) {
preparedStatement.setInt(3, deviceTypeId);
}
try (ResultSet resultSet = preparedStatement.executeQuery()) { try (ResultSet resultSet = preparedStatement.executeQuery()) {
if (resultSet.next()) { if (resultSet.next()) {
deviceCount = resultSet.getInt("COUNT"); deviceCount = resultSet.getInt("COUNT");
@ -1618,3 +1621,5 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
} }
} }
} }