From f82b3aca942bacb4c3d40634317693c6c4332c8e Mon Sep 17 00:00:00 2001 From: shentao Date: Thu, 1 Mar 2018 12:35:39 +0800 Subject: [PATCH] Fix bug about alarm update Issue-ID: USECASEUI-101 Change-Id: I7b65bc0eb8ca0707026f4147d6f1ae6de309d030 Signed-off-by: shentao --- .../onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java | 3 ++- .../src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 5a682698..07ca2958 100755 --- 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={}"); //Transaction tx = session.beginTransaction(); //session.beginTransaction(); - Query q=session.createQuery("select status from AlarmsHeader where sourceName='"+sourceName+"'"); + Query q=session.createQuery("select status from AlarmsHeader where sourceName='"+sourceName+"' and status='active'"); + q.setMaxResults(1); //tx.commit(); String s=(String)q.uniqueResult(); Boolean status=false; 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 0632ed30..ee726c74 100644 --- 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); -- 2.16.6