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

Merge branch 'retrieving-devices-fix' into 'master'

Browse Source 
Fix issue in retrieving IoTS devices

See merge request entgra/carbon-device-mgt!290
This commit is contained in:
Dharmakeerthi Lasantha 2019-10-08 16:32:11 +00:00
commit d813888923
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
View File

@ -163,16 +163,20 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
+ "d.NAME, " + "d.NAME, "
+ "t.NAME AS DEVICE_TYPE, " + "t.NAME AS DEVICE_TYPE, "
+ "d.DEVICE_IDENTIFICATION " + "d.DEVICE_IDENTIFICATION "
+ "FROM DM_DEVICE d, DM_DEVICE_TYPE t, DM_DEVICE_DETAIL dt " + "FROM DM_DEVICE d, DM_DEVICE_TYPE t";
+ "WHERE "
if (deviceData.getLastModifiedDate() != null) {
sql += ", DM_DEVICE_DETAIL dt";
}
sql += " WHERE "
+ "t.NAME = ? AND " + "t.NAME = ? AND "
+ "t.ID = d.DEVICE_TYPE_ID AND " + "t.ID = d.DEVICE_TYPE_ID AND "
+ "d.DEVICE_IDENTIFICATION = ? AND " + "d.DEVICE_IDENTIFICATION = ? AND "
+ "d.TENANT_ID = ? AND " + "d.TENANT_ID = ?";
+ "dt.DEVICE_ID = d.ID";
if (deviceData.getLastModifiedDate() != null) { if (deviceData.getLastModifiedDate() != null) {
sql += " AND dt.UPDATE_TIMESTAMP > ?"; sql += " AND dt.DEVICE_ID = d.ID AND dt.UPDATE_TIMESTAMP > ?";
} }
sql += ") d1 WHERE d1.ID = e.DEVICE_ID AND "; sql += ") d1 WHERE d1.ID = e.DEVICE_ID AND ";