Fix bug about alarm update

Issue-ID: USECASEUI-101
Change-Id: I7b65bc0eb8ca0707026f4147d6f1ae6de309d030
Signed-off-by: shentao <shentao@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
index 5a68269..07ca295 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
@@ -106,7 +106,8 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
                        //Transaction tx = session.beginTransaction();\r
                        //session.beginTransaction();\r
-                       Query q=session.createQuery("select status from AlarmsHeader where sourceName='"+sourceName+"'");\r
+                       Query q=session.createQuery("select status from AlarmsHeader where sourceName='"+sourceName+"' and status='active'");\r
+                       q.setMaxResults(1);\r
                        //tx.commit();\r
                        String s=(String)q.uniqueResult();\r
                        Boolean status=false;\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
index 0632ed3..ee726c7 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
+++ b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
@@ -37,6 +37,7 @@ import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -223,6 +224,7 @@ public class DmaapSubscriber implements Runnable {
 
             Long startEpochMicrosec_s = Long.parseLong(alarm_header.getStartEpochMicrosec());
             String date_get = new DateUtils().getYearMonthDayHourMinuteSecond(startEpochMicrosec_s);
+            Timestamp timestamp = new Timestamp(startEpochMicrosec_s);
 
             if (alarm_header.getEventName().contains("Cleared")) {
                 alarm_header.setStatus("close");
@@ -243,7 +245,7 @@ public class DmaapSubscriber implements Runnable {
                     alarmsHeaderService.updateAlarmsHeader(alarms);
                 });
             } else {
-                alarm_header.setCreateTime(new Date());
+                alarm_header.setCreateTime(timestamp);
                 alarm_header.setStatus("active");
                 logger.info("alarm data header insert is starting......");
                 alarmsHeaderService.saveAlarmsHeader(alarm_header);