Fix UTC time issue

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/vpp/GenericVppApplicationDAOImpl.java

@@ -27,6 +27,7 @@ import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl;
 import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException;
 import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException;
 import io.entgra.device.mgt.core.application.mgt.core.util.DAOUtil;
+import io.entgra.device.mgt.core.device.mgt.core.dao.util.DeviceManagementDAOUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -56,7 +57,7 @@ public class GenericVppApplicationDAOImpl  extends AbstractDAOImpl implements Vp
         try {
             Connection conn = this.getDBConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-                long currentTime = System.currentTimeMillis();
+                long currentTime = DeviceManagementDAOUtil.getCurrentUTCTime();
                 stmt.setString(1, userDTO.getClientUserId());
                 stmt.setString(2, userDTO.getDmUsername());
                 stmt.setInt(3, tenantId);
@@ -117,7 +118,7 @@ public class GenericVppApplicationDAOImpl  extends AbstractDAOImpl implements Vp
 
         try {
             Connection conn = this.getDBConnection();
-            long updatedTime = System.currentTimeMillis();
+            long updatedTime = DeviceManagementDAOUtil.getCurrentUTCTime();
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 int x = 0;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/DAOUtil.java

@@ -426,16 +426,10 @@ public class DAOUtil {
                 vppUserDTO.setDmUsername(rs.getString("DM_USERNAME"));
             }
             if (rs.getLong("CREATED_TIME") != 0) {
-                Date date = new Date(rs.getLong("CREATED_TIME"));
+                vppUserDTO.setCreatedTime(new Timestamp(rs.getLong("CREATED_TIME") * 1000L).toString());
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String dateString = dateFormat.format(date);
-                vppUserDTO.setCreatedTime(dateString);
             }
             if (rs.getLong("LAST_UPDATED_TIME") != 0) {
-                Date date = new Date(rs.getLong("LAST_UPDATED_TIME"));
+                vppUserDTO.setLastUpdatedTime(new Timestamp(rs.getLong("LAST_UPDATED_TIME") * 1000L).toString());
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String dateString = dateFormat.format(date);
-                vppUserDTO.setLastUpdatedTime(dateString);
             }
             vppUserDTOS.add(vppUserDTO);
         }