*/
package org.onap.usecaseui.server.bo;
-import org.onap.usecaseui.server.bean.AlarmsHeader;
-import org.onap.usecaseui.server.bean.AlarmsInformation;
+import org.onap.usecaseui.server.bean.*;
import org.onap.usecaseui.server.util.Page;
import java.io.Serializable;
private AlarmsHeader alarmsHeader;
+
+
private List<AlarmsInformation> alarmsInformation;
+
+
public AlarmBo() {
}
+
+
public AlarmsHeader getAlarmsHeader() {
return alarmsHeader;
}
*/
package org.onap.usecaseui.server.bo;
-import org.onap.usecaseui.server.bean.PerformanceHeader;
-import org.onap.usecaseui.server.bean.PerformanceInformation;
+import org.onap.usecaseui.server.bean.*;
import org.onap.usecaseui.server.util.Page;
import java.io.Serializable;
private List<PerformanceInformation> performanceInformation;
+
+
public PerformanceBo() {
}
public void setPerformanceInformation(List<PerformanceInformation> performanceInformation) {
this.performanceInformation = performanceInformation;
}
+
+
+
+
+
+
+
+
}
import org.slf4j.LoggerFactory;\r
import org.springframework.context.annotation.EnableAspectJAutoProxy;\r
import org.springframework.web.bind.annotation.*;\r
-import org.springframework.web.servlet.ModelAndView;\r
+\r
\r
import java.io.*;\r
-import java.text.DateFormat;\r
+\r
import java.text.ParseException;\r
import java.text.SimpleDateFormat;\r
-import java.time.LocalDateTime;\r
-import java.time.ZoneId;\r
-import java.time.ZonedDateTime;\r
-import java.time.format.DateTimeFormatter;\r
+\r
import java.util.*;\r
\r
\r
@Resource(name = "AlarmsHeaderService")\r
private AlarmsHeaderService alarmsHeaderService;\r
\r
+ /* public AlarmsHeaderService getAlarmsHeaderService() {\r
+ return alarmsHeaderService;\r
+ }*/\r
+\r
+ public void setAlarmsHeaderService(AlarmsHeaderService alarmsHeaderService) {\r
+ this.alarmsHeaderService = alarmsHeaderService;\r
+ }\r
+\r
+\r
+ public void setAlarmsInformationService(AlarmsInformationService alarmsInformationService) {\r
+ this.alarmsInformationService = alarmsInformationService;\r
+ }\r
+\r
@Resource(name = "AlarmsInformationService")\r
private AlarmsInformationService alarmsInformationService;\r
\r
\r
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");\r
\r
+\r
+ @RequestMapping("/alarm/getAllByDatetime/{eventId}/{eventServrity}/{startTime}/{endTime}")\r
+ public String getAllByDatetime(@PathVariable(required = false) String eventId,@PathVariable(required = false) String eventServrity,@PathVariable(required = false) String startTime, @PathVariable(required = false) String endTime) throws ParseException, JsonProcessingException {\r
+ //String startime_s = "2017-10-29";\r
+ //String endtime_s = "2017-12-24";\r
+ String startime_s = startTime;\r
+ String endtime_s = endTime;\r
+ String string ="";\r
+ if(startime_s!=null && endtime_s!=null && !"".equals(startime_s) && !"".equals(endtime_s) ) {\r
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");\r
+ Date startime = formatter.parse(startime_s);\r
+ Date endtime = formatter.parse(endtime_s);\r
+ DateUtils dateUtils = new DateUtils();\r
+ List<Date> datelist = dateUtils.getBetweenDates(startime, endtime);\r
+ StringBuffer dateB = new StringBuffer();\r
+ StringBuffer allB = new StringBuffer();\r
+ StringBuffer activeB = new StringBuffer();\r
+ StringBuffer closeB = new StringBuffer();\r
+\r
+ for (Date dates : datelist) {\r
+ String date_s = formatter.format(dates);\r
+ dateB.append(date_s).append(",");\r
+ int aa = alarmsHeaderService.getAllByDatetime("active", eventId, eventServrity, date_s);\r
+ activeB.append(aa + "").append(",");\r
+ int bb = alarmsHeaderService.getAllByDatetime("close", eventId, eventServrity, date_s);\r
+ closeB.append(bb + "").append(",");\r
+ int cc = alarmsHeaderService.getAllByDatetime("0", eventId, eventServrity, date_s);\r
+ allB.append(cc + "").append(",");\r
+\r
+ }\r
+ String dateBa = dateB.toString();\r
+ String allBa = allB.toString();\r
+ String activeBa = activeB.toString();\r
+ String closeBa = closeB.toString();\r
+\r
+ String[] dateArr = dateBa.substring(0, dateBa.length() - 1).split(",");\r
+ String[] activeArr = activeBa.substring(0, activeBa.length() - 1).split(",");\r
+ String[] closeArr = closeBa.substring(0, closeBa.length() - 1).split(",");\r
+ String[] allArr = allBa.substring(0, activeBa.length() - 1).split(",");\r
+\r
+ Map map = new HashMap();\r
+ map.put("dateArr", dateArr);\r
+ map.put("activeArr", activeArr);\r
+ map.put("closeArr", closeArr);\r
+ map.put("allArr", allArr);\r
+ string = omAlarm.writeValueAsString(map);\r
+ }\r
+\r
+ return string;\r
+ }\r
+\r
+\r
+ @RequestMapping("/alarm/getAlarmsHeaderDetail/{id}")\r
+ public String getAlarmsHeaderDetail(@PathVariable Integer id) throws JsonProcessingException {\r
+ AlarmsHeader alarmsHeader= alarmsHeaderService.getAlarmsHeaderDetail(id);\r
+ String eventId = alarmsHeader.getEventId();\r
+ List<AlarmsInformation> list = alarmsInformationService.getAllAlarmsInformationByeventId(eventId);\r
+ Map map = new HashMap();\r
+ map.put("alarmsHeader",alarmsHeader);\r
+ map.put("list",list);\r
+\r
+ String string =omAlarm.writeValueAsString(map);\r
+ return string;\r
+ }\r
+\r
+\r
+ @RequestMapping(value = {"/alarm/getAlarmDataByStatus/{status}","/alarm/getAlarmDataByStatus/{status}/{eventName}/{sourceName}/{eventServerity}/{reportingEntityName}/{createTime}/{endTime}"},method =RequestMethod.GET,produces = "application/json")\r
+ public String getAlarmDataByStatus(@PathVariable String status, @PathVariable(required = false) String eventName,@PathVariable(required = false) String sourceName,@PathVariable(required = false) String eventServerity,@PathVariable(required = false) String reportingEntityName,@PathVariable(required = false) String createTime,@PathVariable(required = false) String endTime) throws JsonProcessingException {\r
+ Map map = new HashMap();\r
+ Date createTime_s=null;\r
+ Date endTime_s=null;\r
+\r
+ /* Date currentTime = new Date();\r
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
+ String dateString = formatter.format(currentTime);*/\r
+\r
+\r
+\r
+ try {\r
+ createTime_s =(!"null".equals(createTime) ? new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(createTime) : null);\r
+ endTime_s =(!"null".equals(endTime) ? new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime) : null);\r
+ } catch (ParseException e) {\r
+ logger.error("Parse date error :" + e.getMessage());\r
+ }\r
+ int countClose = alarmsHeaderService.getAllCountByStatus("close");\r
+ int countActive = alarmsHeaderService.getAllCountByStatus("active");\r
+ int countAll =countActive + countClose;\r
+ Set<String> eventNameList = new HashSet();\r
+ Set<String> sourceNameList = new HashSet<>();\r
+ Set<String> reportingEntityNameList = new HashSet<>();\r
+ Set<String> eventServerityList = new HashSet<>();\r
+ Set<String> sourceIdList = new HashSet<>();\r
+\r
+\r
+ List<AlarmsHeader> list = alarmsHeaderService.getAllByStatus(status,eventName,sourceName,eventServerity,reportingEntityName,createTime_s,endTime_s);\r
+ AlarmsHeader alarmsHeader;\r
+ for(int a=0;a<list.size();a++){\r
+ alarmsHeader = list.get(a);\r
+ eventNameList.add(alarmsHeader.getEventName());\r
+ sourceNameList.add(alarmsHeader.getSourceName());\r
+ reportingEntityNameList.add(alarmsHeader.getReportingEntityName());\r
+ eventServerityList.add(alarmsHeader.getEventServrity());\r
+ sourceIdList.add(alarmsHeader.getSourceId());\r
+\r
+ }\r
+\r
+ map.put("countClose",countClose);\r
+ map.put("countActive",countActive);\r
+ map.put("countAll",countAll);\r
+ map.put("list",list);\r
+ map.put("eventNameList",eventNameList);\r
+ map.put("sourceNameList",sourceNameList);\r
+ map.put("reportingEntityNameList",reportingEntityNameList);\r
+ map.put("eventServerityList",eventServerityList);\r
+ map.put("sourceIdList",sourceIdList);\r
+\r
+\r
+ String string =omAlarm.writeValueAsString(map);\r
+\r
+ return string;\r
+ }\r
+\r
+\r
+\r
@RequestMapping(value = {"/alarm/{currentPage}/{pageSize}",\r
"/alarm/{currentPage}/{pageSize}/{sourceId}/{sourceName}/{priority}/{startTime}/{endTime}/{vfStatus}"},\r
method = RequestMethod.GET, produces = "application/json")\r
- public String getAlarmData(@PathVariable(required = false) String sourceId, @PathVariable(required = false) String sourceName,\r
+ public String getAlarmData(@PathVariable int currentPage, @PathVariable int pageSize,\r
+ @PathVariable(required = false) String sourceId, @PathVariable(required = false) String sourceName,\r
@PathVariable(required = false) String priority, @PathVariable(required = false) String startTime,\r
- @PathVariable(required = false) String endTime, @PathVariable(required = false) String vfStatus,\r
- @PathVariable int currentPage, @PathVariable int pageSize) throws JsonProcessingException {\r
+ @PathVariable(required = false) String endTime, @PathVariable(required = false) String vfStatus\r
+ ) throws JsonProcessingException, ParseException {\r
logger.info("transfer getAlarmData Apis, " +\r
"Parameter all follows : [currentPage : {} , pageSize : {} , sourceId : {} , " +\r
"sourceName : {} , priority : {} , startTime :{} , endTime : {} , vfStatus : {}]"\r
, currentPage, pageSize, sourceId, sourceName, priority, startTime, endTime, vfStatus);\r
List<AlarmsHeader> alarmsHeaders = null;\r
List<AlarmBo> list = new ArrayList<>();\r
- Page pa = null;\r
+ Page pa = new Page();\r
if (null != sourceId || null != sourceName || null != priority || null != startTime || null != endTime\r
|| null != vfStatus) {\r
AlarmsHeader alarm = new AlarmsHeader();\r
alarm.setSourceId(!"null".equals(sourceId) ? sourceId : null);\r
alarm.setSourceName(!"null".equals(sourceName) ? sourceName : null);\r
alarm.setStatus(!"null".equals(vfStatus) ? vfStatus : null);\r
+ alarm.setPriority(!"null".equals(priority) ? vfStatus : null);\r
+\r
try {\r
alarm.setCreateTime(!"null".equals(startTime) ? new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(startTime) : null);\r
alarm.setUpdateTime(!"null".equals(endTime) ? new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime) : null);\r
\r
alarmsHeaders = pa.getList();\r
if (null != alarmsHeaders && alarmsHeaders.size() > 0) {\r
+\r
+ //if (null != pa) {\r
+ alarmsHeaders = pa.getList();\r
alarmsHeaders.forEach(a -> {\r
logger.info(a.toString());\r
AlarmBo abo = new AlarmBo();\r
@Resource(name = "PerformanceHeaderService")
private PerformanceHeaderService performanceHeaderService;
+
+ public void setPerformanceHeaderService(PerformanceHeaderService performanceHeaderService) {
+ this.performanceHeaderService = performanceHeaderService;
+ }
+
+
+ public void setPerformanceInformationService(PerformanceInformationService performanceInformationService) {
+ this.performanceInformationService = performanceInformationService;
+ }
+
@Resource(name = "PerformanceInformationService")
private PerformanceInformationService performanceInformationService;
String updateAlarmsHeader(AlarmsHeader alarmsHeader);
+ //public String updateAlarmsHeader2018(String status, String date, String eventNameCleared,String eventName, String reportingEntityName,String specificProblem);
public String updateAlarmsHeader2018(String status, Timestamp date, String startEpochMicrosecCleared, String lastEpochMicroSecCleared, String eventName, String reportingEntityName, String specificProblem);
public Boolean getStatusBySourceName(String sourceName);
public AlarmsHeader getIdByStatusSourceName(String sourceName);
List<AlarmsHeader> queryId(String[] id);
String queryStatusCount(String status);
+
+ public int getAllCountByStatus(String status);
+ public List<AlarmsHeader> getAllByStatus(String status,String eventName,String sourceName,String eventServerity,String reportingEntityName ,Date createTime, Date endTime);
+
+ public AlarmsHeader getAlarmsHeaderDetail(Integer id);
+
+ public int getAllByDatetime(String status,String eventId,String eventServerity,String createTime);
+
}
List<AlarmsInformation> queryId(String[] id);
List<Map<String,String>> queryDateBetween(String sourceId, String startTime, String endTime);
+
+
+ List<AlarmsInformation> getAllAlarmsInformationByeventId(String eventId);
}
*/
package org.onap.usecaseui.server.service;
+import java.util.Date;
import java.util.List;
import org.onap.usecaseui.server.bean.AlarmsHeader;
List<PerformanceHeader> queryId(String[] id);
List<String> queryAllSourceId();
+
+
+ public int getAllCountByStatus(String status);
+ public List<PerformanceHeader> getAllByStatus(String status, String eventName, String sourceName, String eventServerity,String reportingEntityName, Date createTime, Date endTime);
}
package org.onap.usecaseui.server.service.impl;\r
\r
\r
+\r
+import java.util.Date;\r
import java.sql.Timestamp;\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
}\r
\r
+ /*@Override\r
+ public String updateAlarmsHeader2018(String status, String date,String eventNameCleared,String eventName, String reportingEntityName,String specificProblem) {\r
+\r
+ try(Session session = sessionFactory.getCurrentSession();){\r
+\r
+ logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
+ session.beginTransaction();\r
+ Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"' ");\r
+ q.executeUpdate();\r
+ session.getTransaction().commit();\r
+ session.flush();\r
+ return "1";\r
+ } catch (Exception e) {\r
+ logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
+ return "0";\r
+ }\r
+ }*/\r
+\r
+\r
@Override\r
public String updateAlarmsHeader2018(String status, Timestamp date, String startEpochMicrosecCleared, String lastEpochMicroSecCleared, String eventName, String reportingEntityName, String specificProblem) {\r
\r
try(Session session = sessionFactory.openSession();){\r
+ //try(Session session = sessionFactory.getCurrentSession();){\r
logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
session.beginTransaction();\r
\r
+ //Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' , startEpochMicrosecCleared='"+startEpochMicrosecCleared+"' ,lastEpochMicroSecCleared='"+lastEpochMicroSecCleared+"' where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"'");\r
Query q=session.createQuery("update AlarmsHeader set status=:status, updateTime=:date, startEpochMicrosecCleared=:startEpochMicrosecCleared ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");\r
\r
q.setString("status",status);\r
logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
return false;\r
}\r
+ //return null;\r
}\r
\r
\r
@Override\r
public AlarmsHeader getIdByStatusSourceName(String sourceName) {\r
+ //List<AlarmsHeader> list = new ArrayList<>();\r
AlarmsHeader s = new AlarmsHeader();\r
try(Session session = sessionFactory.openSession()){\r
logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
+ //Transaction tx = session.beginTransaction();\r
+ //session.beginTransaction();\r
+ //Query q=session.createQuery("select sourceName,createTime from AlarmsHeader where sourceName='"+sourceName+"' and status='active' order by createTime desc");\r
Query q=session.createQuery("from AlarmsHeader where sourceName='"+sourceName+"' and status='active' order by createTime desc");\r
\r
+ //q.setString(1,sourceName);\r
q.setMaxResults(1);\r
+ //tx.commit();\r
+ //String s=(String)q.uniqueResult();\r
s = (AlarmsHeader)q.uniqueResult();\r
+ // list= q.list();\r
\r
session.flush();\r
return s;\r
+ //return "1";\r
} catch (Exception e) {\r
logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
return s;\r
}\r
+ //return null;\r
}\r
\r
\r
}\r
}\r
\r
+\r
+\r
+\r
+\r
+ @Override\r
+ public int getAllCountByStatus(String status){\r
+ try (Session session = sessionFactory.openSession()){\r
+ StringBuffer count = new StringBuffer("select count(*) from AlarmsHeader a where 1=1");\r
+ if(!"0".equals(status)){\r
+ count.append(" and a.status=:status");\r
+ }\r
+ Query query =session.createQuery(count.toString());\r
+ query.setString("status",status);\r
+ //int q = (int)query.uniqueResult();\r
+ long q=(long)query.uniqueResult();\r
+ session.flush();\r
+ return (int)q;\r
+ }catch (Exception e){\r
+ logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
+ return 0;\r
+ }\r
+ }\r
+\r
+ @Override\r
+ public List<AlarmsHeader> getAllByStatus(String status,String eventName,String sourceName,String eventServerity,String reportingEntityName, Date createTime, Date endTime){\r
+ try (Session session = sessionFactory.openSession()){\r
+ StringBuffer string = new StringBuffer("from AlarmsHeader a where 1=1");\r
+ if(!"0".equals(status)){\r
+ string.append(" and a.status=:status");\r
+ }\r
+ if(!"0".equals(eventName) && eventName!=null){\r
+ string.append(" and a.eventName=:eventName");\r
+ }\r
+ if(!"0".equals(sourceName) && sourceName!=null){\r
+ string.append(" and a.sourceName=:sourceName");\r
+ }\r
+ if(!"0".equals(eventServerity) && eventServerity!=null){\r
+ string.append(" and a.eventServerity=:eventServerity");\r
+ }\r
+ if(!"0".equals(reportingEntityName) && eventServerity!=null){\r
+ string.append(" and a.reportingEntityName=:reportingEntityName");\r
+ }\r
+ if( null!=createTime && endTime!= null) {\r
+ string.append(" and a.createTime between :startTime and :endTime");\r
+ }\r
+ Query query = session.createQuery(string.toString());\r
+ query.setString("status",status);\r
+ query.setString("eventName",eventName);\r
+ query.setString("sourceName",sourceName);\r
+ query.setString("eventServerity",eventServerity);\r
+ query.setString("reportingEntityName",reportingEntityName);\r
+ if( null!=createTime && endTime!= null) {\r
+ query.setDate("startTime",createTime);\r
+ query.setDate("endTime",endTime);\r
+\r
+ }\r
+ List<AlarmsHeader> list =query.list();\r
+\r
+ return list;\r
+\r
+ }catch (Exception e){\r
+\r
+ logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
+ return null;\r
+ }\r
+\r
+\r
+\r
+ }\r
+\r
+ @Override\r
+ public AlarmsHeader getAlarmsHeaderDetail(Integer id) {\r
+ try(Session session = sessionFactory.openSession()) {\r
+\r
+ String string = "from AlarmsHeader a where 1=1 and a.id=:id";\r
+ Query q = session.createQuery(string);\r
+ q.setInteger("id",id);\r
+ AlarmsHeader alarmsHeader =(AlarmsHeader)q.uniqueResult();\r
+ session.flush();\r
+ return alarmsHeader;\r
+\r
+ }catch (Exception e){\r
+ logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAlarmsHeaderDetail."+e.getMessage());\r
+ return null;\r
+ }\r
+ }\r
+\r
+ @Override\r
+ public int getAllByDatetime(String status,String eventId, String eventServrity, String createTime) {\r
+ try (Session session = sessionFactory.openSession();){\r
+ StringBuffer string = new StringBuffer("select count(*) as count from AlarmsHeader a where 1=1");\r
+\r
+ if(!"0".equals(status) && status!=null){\r
+ string.append(" and a.status=:status");\r
+ }\r
+ if(!"0".equals(eventId) && eventId!=null){\r
+ string.append(" and a.eventId=:eventId");\r
+ }\r
+\r
+ if(!"0".equals(eventServrity) && eventServrity!=null){\r
+ string.append(" and a.eventServrity=:eventServrity");\r
+ }\r
+\r
+ /*if( null!=createTime && endTime!= null) {\r
+ string.append(" and a.createTime between :startTime and :endTime");\r
+ }*/\r
+ if( null!=createTime) {\r
+ string.append(" and to_days(a.createTime) = to_days('"+createTime+"')");\r
+ }\r
+\r
+ /*string.append(" group by DATE_FORMAT(a.createTime,'%y-%m-%d')");*/\r
+ Query query = session.createQuery(string.toString());\r
+ query.setString("status",status);\r
+ query.setString("eventId",eventId);\r
+ query.setString("eventServrity",eventServrity);\r
+ //query.setDate("createTime",createTime);\r
+\r
+ /*if( null!=createTime && endTime!= null) {\r
+ query.setDate("startTime",createTime);\r
+ query.setDate("endTime",endTime);\r
+\r
+ }*/\r
+ long l = (long)query.uniqueResult();\r
+ int a = (int) l;\r
+ //List<AlarmsHeader> list =query.list();\r
+ session.flush();\r
+ return a;\r
+\r
+ }catch (Exception e){\r
+\r
+ logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
+ return 0;\r
+ }\r
+\r
+ }\r
+\r
+\r
public int getAllCount(AlarmsHeader alarmsHeader,int currentPage,int pageSize) {\r
try(Session session = sessionFactory.openSession()){\r
StringBuffer count=new StringBuffer("select count(*) from AlarmsHeader a where 1=1");\r
}\r
}\r
\r
- @SuppressWarnings("unchecked")\r
+ //@SuppressWarnings("unchecked")\r
@Override\r
public Page<AlarmsHeader> queryAlarmsHeader(AlarmsHeader alarmsHeader,int currentPage,int pageSize) {\r
Page<AlarmsHeader> page = new Page<AlarmsHeader>();\r
page.setPageSize(pageSize);\r
page.setTotalRecords(allRow);\r
page.setList(list);\r
+\r
session.flush();\r
return page;\r
} catch (Exception e) {\r
}\r
\r
\r
+\r
+\r
@Override\r
public List<Map<String,String>> queryDateBetween(String sourceId, String startTime, String endTime) {\r
try(Session session = sessionFactory.openSession()) {\r
}\r
}\r
\r
+ @Override\r
+ public List<AlarmsInformation> getAllAlarmsInformationByeventId(String eventId) {\r
+ try (Session session = sessionFactory.openSession()){\r
+ String string = "from AlarmsInformation a where 1=1 and a.eventId=:eventId";\r
+ Query query = session.createQuery(string);\r
+ query.setString("eventId",eventId);\r
+ List<AlarmsInformation> list = query.list();\r
+ session.flush();\r
+ return list;\r
+ }catch (Exception e){\r
+ logger.error("exception occurred while performing PerformanceInformationServiceImpl queryDateBetween. LIST:" + e.getMessage());\r
+\r
+ return null;\r
+ }\r
+\r
+\r
+\r
+ }\r
+\r
\r
}\r
}\r
\r
\r
+\r
+\r
+\r
+ @Override\r
+ public int getAllCountByStatus(String status){\r
+ try (Session session = sessionFactory.openSession()){\r
+ StringBuffer count = new StringBuffer("select count(*) from PerformanceHeader a where 1=1");\r
+ if(!"0".equals(status)){\r
+ count.append(" and a.status=:status");\r
+ }\r
+ Query query =session.createQuery(count.toString());\r
+ query.setString("status",status);\r
+ //int q = (int)query.uniqueResult();\r
+ long q=(long)query.uniqueResult();\r
+ session.flush();\r
+ return (int)q;\r
+ }catch (Exception e){\r
+ logger.error("exception occurred while performing PerformanceHeaderServiceImpl getAllCount."+e.getMessage());\r
+ return 0;\r
+ }\r
+ }\r
+\r
+ @Override\r
+ public List<PerformanceHeader> getAllByStatus(String status,String eventName,String sourceName,String eventServerity,String reportingEntityName, Date createTime, Date endTime){\r
+ try (Session session = sessionFactory.openSession()){\r
+ StringBuffer string = new StringBuffer("from PerformanceHeader a where 1=1");\r
+ if(!"0".equals(status)){\r
+ string.append(" and a.status=:status");\r
+ }if(!"".equals(eventName) && eventName!=null){\r
+ string.append(" and a.eventName=:eventName");\r
+ }\r
+ if(!"".equals(sourceName) && sourceName!=null){\r
+ string.append(" and a.sourceName=:sourceName");\r
+ }\r
+ if(!"".equals(eventServerity) && eventServerity!=null){\r
+ string.append(" and a.eventServerity=:eventServerity");\r
+ }\r
+ if(!"".equals(reportingEntityName) && eventServerity!=null){\r
+ string.append(" and a.reportingEntityName=:reportingEntityName");\r
+ }\r
+ if( null!=createTime && endTime!= null) {\r
+ string.append(" and a.createTime between :startTime and :endTime");\r
+ }\r
+ Query query = session.createQuery(string.toString());\r
+ query.setString("status",status);\r
+ query.setString("eventName",eventName);\r
+ query.setString("sourceName",sourceName);\r
+ query.setString("eventServerity",eventServerity);\r
+ query.setString("reportingEntityName",reportingEntityName);\r
+ if( null!=createTime && endTime!= null) {\r
+ query.setDate("startTime",createTime);\r
+ query.setDate("endTime",endTime);\r
+\r
+ }\r
+\r
+ List<PerformanceHeader> list =query.list();\r
+\r
+ return list;\r
+\r
+ }catch (Exception e){\r
+\r
+ logger.error("exception occurred while performing PerformanceHeaderServiceImpl getAllCount."+e.getMessage());\r
+ return null;\r
+ }\r
+\r
+\r
+\r
+ }\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
public int getAllCount(PerformanceHeader performanceHeder, int currentPage, int pageSize) {\r
try(Session session = sessionFactory.openSession();){\r
StringBuffer hql = new StringBuffer("select count(*) from PerformanceHeader a where 1=1");\r
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
+import java.util.*;
public class DateUtils {
+ /**
+ * 获取两个日期之间的日期
+ * @param start 开始日期
+ * @param end 结束日期
+ * @return 日期集合
+ */
+ public static List<Date> getBetweenDates(Date start, Date end) {
+ List<Date> result = new ArrayList<Date>();
+ Calendar tempStart = Calendar.getInstance();
+ tempStart.setTime(start);
+ tempStart.add(Calendar.DAY_OF_YEAR, 1);
+
+ Calendar tempEnd = Calendar.getInstance();
+ tempEnd.setTime(end);
+ while (tempStart.before(tempEnd)) {
+ result.add(tempStart.getTime());
+ tempStart.add(Calendar.DAY_OF_YEAR, 1);
+ }
+ return result;
+ }
/**
return year+ "-" +mToMonth+ "-" +dToDay+ " "+hToHour+ ":" +mToMinute+ ":" +sToSecond;
}
+
+
public static void main(String[] args) {
- System.out.println(new DateUtils().getYearMonthDayHourMinuteSecond(System.currentTimeMillis()));
+ // System.out.println(new DateUtils().getYearMonthDayHourMinuteSecond(System.currentTimeMillis()));
+ String startime_s = "2017-10-31";
+ String endtime_s = "2017-12-24";
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ Date startime = null;
+ Date endtime =null;
+ try {
+ startime = formatter.parse(startime_s);
+ endtime = formatter.parse(endtime_s);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+
+ List<Date> result =getBetweenDates(startime,endtime);
+
+ System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa===="+result);
+
}
+
}
import com.fasterxml.jackson.databind.ObjectMapper;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.usecaseui.server.bean.AlarmsHeader;
-import org.onap.usecaseui.server.bean.AlarmsInformation;
-import org.onap.usecaseui.server.bean.PerformanceHeader;
-import org.onap.usecaseui.server.bean.PerformanceInformation;
+import org.onap.usecaseui.server.bean.*;
import org.onap.usecaseui.server.constant.Constant;
-import org.onap.usecaseui.server.service.AlarmsHeaderService;
-import org.onap.usecaseui.server.service.AlarmsInformationService;
-import org.onap.usecaseui.server.service.PerformanceHeaderService;
-import org.onap.usecaseui.server.service.PerformanceInformationService;
+import org.onap.usecaseui.server.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Resource(name = "AlarmsHeaderService")
private AlarmsHeaderService alarmsHeaderService;
+
@Resource(name = "AlarmsInformationService")
private AlarmsInformationService alarmsInformationService;
@Resource(name = "PerformanceInformationService")
private PerformanceInformationService performanceInformationService;
+
+
+
+
+
+
+
+
public void subscribe(String topic) {
try {
List<String> respList = getDMaaPData(topic);
ai.setUpdateTime(new Date());
});
+ // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Long l = System.currentTimeMillis();
- Timestamp date_get = new Timestamp(l);
+ Timestamp date_get = new Timestamp(l); //2013-01-14 22:45:36.484
if (alarm_header.getEventName().contains("Cleared")) {
alarm_header.setStatus("close");
logger.info("alarmCleared data header insert is starting......");
- alarmsHeaderService.updateAlarmsHeader2018("close",date_get,alarm_header.getStartEpochMicrosec(),alarm_header.getLastEpochMicroSec(),alarm_header.getEventName().replace("Cleared",""),alarm_header.getReportingEntityName(),alarm_header.getSpecificProblem());
+
+ alarmsHeaderService.updateAlarmsHeader2018("close", date_get, alarm_header.getStartEpochMicrosec(), alarm_header.getLastEpochMicroSec(), alarm_header.getEventName().replace("Cleared", ""), alarm_header.getReportingEntityName(), alarm_header.getSpecificProblem());
+
logger.info("alarmCleared data header insert has finished.");
logger.info("alarmCleared data detail insert is starting......");
alarm_informations.forEach(information ->
} else {
alarm_header.setCreateTime(new Date());
alarm_header.setStatus("active");
- logger.info("alarm data header insert is starting......");
- alarmsHeaderService.saveAlarmsHeader(alarm_header);
+
+
+ logger.info("alarm data header insert is starting......");
+
+ alarmsHeaderService.saveAlarmsHeader(alarm_header);
+
logger.info("alarm data header insert has finished.");
logger.info("alarm data detail insert is starting......");
if(alarm_informations.size() > 0) {
private void performanceProcess(Map<String, Object> eventMap) {
PerformanceHeader performance_header = new PerformanceHeader();
List<PerformanceInformation> performance_informations = new ArrayList<>();
+
+
+
eventMap.forEach((ek1, ev1) -> {
if (ek1.equals("commonEventHeader")) {
((Map<String, Object>) ev1).forEach((k2, v2) -> {
List<Map<String,String>> arrayOfFields = (List<Map<String, String>>) v;
arrayOfFields.forEach( fields -> {
if (fields.get("name").equals("StartTime")){
+
try {
- performance_informations.add(new PerformanceInformation(fields.get("name"),fields.get("value"),performance_header.getSourceId(),null,DateUtils.now()));
- performance_header.setCreateTime(DateUtils.stringToDate(fields.get("value").replaceAll(Constant.RegEX_DATE_FORMAT," ")));
- performance_header.setUpdateTime(DateUtils.now());
+ String type = performance_header.getEventType();
+ performance_informations.add(new PerformanceInformation(fields.get("name"), fields.get("value"), performance_header.getSourceId(), null, DateUtils.now()));
+ performance_header.setCreateTime(DateUtils.stringToDate(fields.get("value").replaceAll(Constant.RegEX_DATE_FORMAT, " ")));
+ performance_header.setUpdateTime(DateUtils.now());
+
} catch (ParseException e) {
e.printStackTrace();
}
}else{
- try {
- performance_informations.add(new PerformanceInformation(fields.get("name"),fields.get("value"),performance_header.getSourceId(),null,DateUtils.now()));
- } catch (ParseException e) {
- e.printStackTrace();
- }
+
}
} );
}
}
});
if (performance_header.getSourceId() !=null && performance_informations.size() > 0 ){
+
+ String version = performance_header.getVersion();
+ String eventName = performance_header.getEventName();
+ String domain = performance_header.getDomain();
+ String eventId = performance_header.getEventId();
+ String eventType = performance_header.getEventType();
+ String nfcNamingCode = performance_header.getNfcNamingCode();
+ String nfNamingCode = performance_header.getNfNamingCode();
+ String sourceId = performance_header.getSourceId();
+ String sourceName = performance_header.getSourceName();
+ String reportingEntityId = performance_header.getReportingEntityId();
+ String reportingEntityName = performance_header.getReportingEntityName();
+ String priority = performance_header.getPriority();
+ String startEpochMicrosec = performance_header.getStartEpochMicrosec();
+ String lastEpochMicroSec = performance_header.getLastEpochMicroSec();
+ String sequence = performance_header.getSequence();
+ String measurementsForVfScalingVersion = performance_header.getMeasurementsForVfScalingVersion();
+ String measurementInterval = performance_header.getMeasurementInterval();
+ Date createTime = performance_header.getCreateTime();
+ Date updateTime = performance_header.getUpdateTime();
+
+
+
+
+
+
+
+
+
+
+
+
logger.info("performance data header insert is starting......");
performanceHeaderService.savePerformanceHeader(performance_header);
logger.info("performance data header insert has finished.");
});
logger.info("performance data detail insert has finished. " + performance_informations.size() + " records have been inserted.");
+ // }//else 结束
}
+
+
+
+
+
}
}
\ No newline at end of file
public class Page<E> {
- private List<E> list;
+ public List<E> list;
- private int totalRecords;
+ public int totalRecords;
- private int pageSize;
+ public int pageSize;
- private int pageNo;
+ public int pageNo;
*/
package org.onap.usecaseui.server.controller;
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.After;
+import org.omg.PortableInterceptor.INACTIVE;
+import org.onap.usecaseui.server.bean.AlarmsHeader;
+import org.onap.usecaseui.server.service.AlarmsHeaderService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.usecaseui.server.UsecaseuiServerApplication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = UsecaseuiServerApplication.class)
-@WebAppConfiguration
+import javax.servlet.http.HttpServletRequest;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static org.mockito.Mockito.*;
+
+/**
+* AlarmController Tester.
+*
+* @author <Authors name>
+* @since <pre>���� 28, 2018</pre>
+* @version 1.0
+*/
public class AlarmControllerTest {
- @Autowired
- private WebApplicationContext context;
-
- private MockMvc mvc;
-
- @Before
- public void setup(){
- mvc = MockMvcBuilders.webAppContextSetup(context).build();
- }
-
- @Test
- public void test1() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/alarm/1/100")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test2() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/alarm/1/100/null/null/null/null/null/null")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.get("/alarm/1/100/502fe15c-aa07-ed26-3f87-4d5c1784bc5b/management-server-backup/High/null/null/1")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.get("/alarm/1/100/502fe15c-aa07-ed26-3f87-4d5c1784bc5b/management-server-backup/High/123/456/1")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test3() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/alarm/statusCount")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test4() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/alarm/sourceId")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test5() throws Exception {
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","auto")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","year")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","month")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","day")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","hour")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/alarm/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","").param("startTime","2017-10-1 16:34")
- .param("endTime","2017-12-5 0:0").param("showMode","minute")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
-}
+
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service;
+
+@Before
+public void before() throws Exception {
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+}
+
+@After
+public void after() throws Exception {
+}
+
+/**
+*
+* Method: setAlarmsHeaderService(AlarmsHeaderService alarmsHeaderService)
+*
+*/
+@Test
+public void testSetAlarmsHeaderService() throws Exception {
+//TODO: Test goes here...
+
+}
+
+/**
+*
+* Method: setAlarmsInformationService(AlarmsInformationService alarmsInformationService)
+*
+*/
+@Test
+public void testSetAlarmsInformationService() throws Exception {
+//TODO: Test goes here...
+}
+
+/**
+*
+* Method: getAllByDatetime(@PathVariable(required = false) String eventId, @PathVariable(required = false) String eventServrity, @PathVariable(required = false) String startTime, @PathVariable(required = false) String endTime)
+*
+*/
+@Test
+public void testGetAllByDatetime() throws Exception {
+//TODO: Test goes here...
+ String eventId="ab305d54-85b4-a31b-7db2-fb6b9e546015";
+ String eventServrity="CRITICAL";
+ String startTime="2017-10-29";
+ String endTime="2017-12-24";
+ String status ="0";
+ controller.getAllByDatetime(eventId,eventServrity,startTime,endTime);
+ verify(service,times(1)).getAllByDatetime(status,eventId,eventServrity,startTime);
+}
+
+/**
+*
+* Method: getAlarmsHeaderDetail(@PathVariable Integer id)
+*
+*/
+@Test
+public void testGetAlarmsHeaderDetail() throws Exception {
+//TODO: Test goes here...
+ Integer eventId =5;
+ controller.getAlarmsHeaderDetail(eventId);
+ verify(service,times(1)).getAlarmsHeaderDetail(eventId);
+}
+
+/**
+*
+* Method: getAlarmDataByStatus(@PathVariable String status, @PathVariable(required = false) String eventName, @PathVariable(required = false) String sourceName, @PathVariable(required = false) String eventServerity, @PathVariable(required = false) String reportingEntityName, @PathVariable(required = false) String createTime, @PathVariable(required = false) String endTime)
+*
+*/
+@Test
+public void testGetAlarmDataByStatus() throws Exception {
+//TODO: Test goes here...
+
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ /* String id ="id";
+ when(request.getParameter(id)).thenReturn(id);
+ String type="type";
+ when(request.getParameter(type)).thenReturn(type);*/
+
+ String status ="active";
+ String eventName ="Fault_MultiCloud_VMFailureCleared";
+ String sourceName ="shentao-test-2001";
+ String eventServerity ="CRITICAL";
+ String reportingEntityName ="Multi-Cloud";
+ String createTime_s="2018-01-24 17:00:25";
+ String endTime_s="2018-03-15 00:00:00";
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date createTime=formatter.parse(createTime_s);
+ Date endTime=formatter.parse(endTime_s);
+
+
+ controller.getAlarmDataByStatus(status,eventName,sourceName,eventServerity,reportingEntityName,createTime_s,endTime_s);
+ //verify(customerService, times(1)).listCustomer();
+ verify(service,times(1)).getAllByStatus(status,eventName,sourceName,eventServerity,reportingEntityName,createTime,endTime);
+
+
+
+
+}
+
+/**
+*
+* Method: getAlarmData(@PathVariable(required = false) String sourceId, @PathVariable(required = false) String sourceName, @PathVariable(required = false) String priority, @PathVariable(required = false) String startTime, @PathVariable(required = false) String endTime, @PathVariable(required = false) String vfStatus, @PathVariable int currentPage, @PathVariable int pageSize)
+*
+*/
+@Test
+public void testGetAlarmData() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+ AlarmsHeader header = new AlarmsHeader();
+ int currentPage=1;
+ int pageSize=12;
+ //String sourceId="shentao-test-1003";
+ //String sourceName="shentao-test-1003";
+ //String priority="High";
+ //String startTime="2017-10-31 09:51";
+ //String endTime="2018-03-15 00:00";
+ //String vfStatus="Active";
+ /*String sourceId="11694_113";
+ String sourceName="11694_113";
+ String priority="High";
+ String startTime="2017-10-31 09:52:15";
+ String endTime="2017-11-15 15:27:16";
+ String vfStatus="Medium";*/
+ String sourceId=null;
+ String sourceName=null;
+ String priority=null;
+ String startTime=null;
+ String endTime=null;
+ String vfStatus=null;
+ header.setPriority(priority);
+ header.setStatus(vfStatus);
+ header.setSourceId(sourceId);
+ header.setSourceName(sourceName);
+
+
+
+ //controller.getAlarmData(currentPage,pageSize,sourceId,sourceName,priority,startTime,endTime,vfStatus);
+ // verify(service,times(1)).queryAlarmsHeader(header,currentPage,pageSize);
+
+}
+
+/**
+*
+* Method: getStatusCount()
+*
+*/
+@Test
+public void testGetStatusCount() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+
+ controller.getStatusCount();
+ verify(service,times(1)).queryStatusCount("0");
+ verify(service,times(1)).queryStatusCount("active");
+ verify(service,times(1)).queryStatusCount("close");
+
+
+
+
+
+}
+
+/**
+*
+* Method: getTopologyData(@PathVariable String serviceName)
+*
+*/
+@Test
+public void testGetTopologyData() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+
+ String serviceName="Fault_MultiCloud_VMFailureCleared";
+ //controller.getTopologyData(serviceName);
+ //controller.getAllVNFS().get("networkServices");
+ //controller.getAllVNFS().get("VNFS");
+
+
+
+}
+
+/**
+*
+* Method: getTopologyServices()
+*
+*/
+@Test
+public void testGetTopologyServices() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+
+ AlarmsHeader header = new AlarmsHeader();
+ header.setSourceId("shentao-test-2001");
+ //controller.getAllVNFS().get("services");
+
+ //controller.getTopologyServices();
+
+ //verify(service,times(1)).queryAlarmsHeader(header,1,10).getList();
+}
+
+/**
+*
+* Method: getAllVNFS()
+*
+*/
+/*@Test
+public void testGetAllVNFS() throws Exception {
+//TODO: Test goes here...
+}*/
+
+/**
+*
+* Method: getSourceId()
+*
+*/
+@Test
+public void testGetSourceId() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+ AlarmsHeader header = new AlarmsHeader();
+ // controller.getSourceId();
+
+ //verify(service,times(1)).queryAlarmsHeader(header,1,10);
+}
+
+/**
+*
+* Method: genDiagram(@RequestParam String sourceId, @RequestParam String startTime, @RequestParam String endTime, @RequestParam String showMode)
+*
+*/
+@Test
+public void testGenDiagram() throws Exception {
+//TODO: Test goes here...
+ AlarmController controller = new AlarmController();
+ AlarmsHeaderService service = mock(AlarmsHeaderService.class);
+ controller.setAlarmsHeaderService(service);
+ String sourceId="";
+ String startTime="";
+ String endTime="";
+ String showMode="";
+ controller.genDiagram(sourceId,startTime,endTime,showMode);
+}
+
+
+/**
+*
+* Method: getTopologyData()
+*
+*/
+
+/*@Test
+public void testDateProcess() throws Exception {
+//TODO: Test goes here...
+
+} */
+
+/**
+*
+* Method: diagramDate(String sourceId, String startTime, String endTime, String format)
+*
+*/
+/*@Test
+public void testDiagramDate() throws Exception {
+//TODO: Test goes here...
+
+} */
+
+}
- /*
+/*
* Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
*/
package org.onap.usecaseui.server.controller;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.usecaseui.server.UsecaseuiServerApplication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = UsecaseuiServerApplication.class)
-@WebAppConfiguration
-public class PerformanceControllerTest {
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.After;
+import org.onap.usecaseui.server.bean.PerformanceHeader;
+import org.onap.usecaseui.server.bean.PerformanceInformation;
+import org.onap.usecaseui.server.service.PerformanceHeaderService;
+import org.onap.usecaseui.server.service.PerformanceInformationService;
+
+import javax.servlet.http.HttpServletResponse;
- @Autowired
- private WebApplicationContext context;
+import static org.mockito.Mockito.*;
- private MockMvc mvc;
+/**
+* PerformanceController Tester.
+*
+* @author <Authors name>
+* @since <pre>���� 28, 2018</pre>
+* @version 1.0
+*/
+public class PerformanceControllerTest {
+ PerformanceController controller = new PerformanceController();
+ PerformanceHeaderService service;
+ PerformanceInformationService perservece;
@Before
- public void setup(){
- mvc = MockMvcBuilders.webAppContextSetup(context).build();
- }
-
- @Test
- public void test1() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/performance/1/100")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test2() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/performance/1/100/null/null/null/null/null")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.get("/performance/1/100/1101ZTHX1MMEGJM1W1/1101ZTHX1MMEGJM1W1/Normal/null/null")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.get("/performance/1/100/1101ZTHX1MMEGJM1W1/1101ZTHX1MMEGJM1W1/Normal/123/456")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test3() throws Exception {
- mvc.perform(MockMvcRequestBuilders.get("/performance/resourceIds")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test4() throws Exception {
- mvc.perform(MockMvcRequestBuilders.post("/performance/names")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
- @Test
- public void test5() throws Exception {
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","auto")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","year")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","month")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","day")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","hour")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- mvc.perform(MockMvcRequestBuilders.post("/performance/diagram")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
- .param("sourceId","1101ZTHX1SCT3JNRXOOW2")
- .param("nameParent","SIG.SctpDataChunkReceived")
- .param("startTime","2017-10-1 17:4")
- .param("endTime","2017-12-5 17:4")
- .param("format","minute")
- .accept(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().isOk())
- .andDo(MockMvcResultHandlers.print());
- }
-
-}
\ No newline at end of file
+public void before() throws Exception {
+ service = mock(PerformanceHeaderService.class);
+ controller.setPerformanceHeaderService(service);
+ controller.setPerformanceInformationService(perservece);
+}
+
+@After
+public void after() throws Exception {
+}
+
+/**
+*
+* Method: getPerformanceData(HttpServletResponse response, @PathVariable int currentPage, @PathVariable int pageSize, @PathVariable(required = false) String sourceId, @PathVariable(required = false) String sourceName, @PathVariable(required = false) String priority, @PathVariable(required = false) String startTime, @PathVariable(required = false) String endTime)
+*
+*/
+@Test
+public void testGetPerformanceData() throws Exception {
+//TODO: Test goes here...
+ HttpServletResponse response = mock(HttpServletResponse.class);
+ int currentPage = 1;
+ int pageSize=12;
+ String sourceId="1101ZTHX1MNE1NK7E0";
+ String sourceName="1101ZTHX1MNE1NK7E0";
+ String priority="Normal";
+ String startTime="2017-11-15 06:30:00";
+ String endTime="2017-11-15 14:45:26";
+ PerformanceHeader header = new PerformanceHeader();
+
+
+ controller.getPerformanceData(response,currentPage,pageSize,sourceId,sourceName,priority,startTime,endTime);
+ verify(service,times(1)).queryPerformanceHeader(header,currentPage,pageSize);
+
+}
+
+/**
+*
+* Method: generateDiagram(@RequestParam String sourceId, @RequestParam String startTime, @RequestParam String endTime, @RequestParam String nameParent, @RequestParam String format)
+*
+*/
+@Test
+public void testGenerateDiagram() throws Exception {
+//TODO: Test goes here...
+
+ String sourceId="";
+ String startTime="";
+ String endTime="";
+ String nameParent="";
+ String format="";
+ controller.generateDiagram(sourceId,startTime,endTime,nameParent,format);
+}
+
+/**
+*
+* Method: getSourceIds()
+*
+*/
+@Test
+public void testGetSourceIds() throws Exception {
+//TODO: Test goes here...
+ controller.getSourceIds();
+ verify(service,times(1)).queryAllSourceId();
+}
+
+/**
+*
+* Method: getNames(@RequestParam Object sourceId)
+*
+*/
+@Test
+public void testGetNames() throws Exception {
+//TODO: Test goes here...
+Object sourceId="1101ZTHX1MNE1NK7E0";
+ controller.getNames(sourceId);
+ verify(perservece,times(1)).queryDateBetween(sourceId.toString(),null,null,null);
+}
+
+
+/**
+*
+* Method: dateProcess(String sourceId, String name, long startTimeL, long endTimeL, long timeIteraPlusVal, long keyVal, long keyValIteraVal, String keyUnit)
+*
+*/
+@Test
+public void testDateProcess() throws Exception {
+//TODO: Test goes here...
+/*
+try {
+ Method method = PerformanceController.getClass().getMethod("dateProcess", String.class, String.class, long.class, long.class, long.class, long.class, long.class, String.class);
+ method.setAccessible(true);
+ method.invoke(<Object>, <Parameters>);
+} catch(NoSuchMethodException e) {
+} catch(IllegalAccessException e) {
+} catch(InvocationTargetException e) {
+}
+*/
+}
+
+/**
+*
+* Method: diagramDate(String sourceId, String name, String startTime, String endTime, String format)
+*
+*/
+@Test
+public void testDiagramDate() throws Exception {
+//TODO: Test goes here...
+/*
+try {
+ Method method = PerformanceController.getClass().getMethod("diagramDate", String.class, String.class, String.class, String.class, String.class);
+ method.setAccessible(true);
+ method.invoke(<Object>, <Parameters>);
+} catch(NoSuchMethodException e) {
+} catch(IllegalAccessException e) {
+} catch(InvocationTargetException e) {
+}
+*/
+}
+
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onap.usecaseui.server.service.impl;
+package org.onap.usecaseui.server.service.impl;
import org.junit.Test;
import org.junit.Before;
import javax.annotation.Resource;
+import static org.mockito.Mockito.*;
+
/**
* AlarmsInformationServiceImpl Tester.
*
* @since <pre> 8, 2018</pre>
* @version 1.0
*/
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = UsecaseuiServerApplication.class)
-@WebAppConfiguration
+
public class AlarmsInformationServiceImplTest {
- @Resource(name = "AlarmsInformationService")
- AlarmsInformationService alarmsInformationService;
+ /*@Resource(name = "AlarmsInformationService")
+ AlarmsInformationService alarmsInformationService;*/
+ AlarmsInformationServiceImpl service;
@Before
-public void before() throws Exception {
+public void before() throws Exception {
+ service = mock(AlarmsInformationServiceImpl.class);
}
@After
a.setValue("fre");
a.setCreateTime(DateUtils.now());
a.setUpdateTime(DateUtils.now());
- System.out.println(alarmsInformationService.saveAlarmsInformation(a));
+ service.saveAlarmsInformation(a);
}
/**
a.setValue("fko");
a.setUpdateTime(DateUtils.now());
a.setCreateTime(DateUtils.now());
- System.out.println(alarmsInformationService.updateAlarmsInformation(a));
+ service.updateAlarmsInformation(a);
}
/**
larmsInformation.setName("vnf_a_3");
- alarmsInformationService.getAllCount(larmsInformation,0,12);
+ service.getAllCount(larmsInformation,0,12);
}
/**
//TODO: Test goes here...
AlarmsInformation a = new AlarmsInformation();
a.setEventId("110");
- alarmsInformationService.queryAlarmsInformation(a,1,100)
- .getList().forEach( al -> System.out.println(al.getEventId()));
+ service.queryAlarmsInformation(a,1,100);
+ // .getList().forEach( al -> System.out.println(al.getEventId()));
}
/**
@Test
public void testQueryId() throws Exception {
//TODO: Test goes here...
- alarmsInformationService.queryId(new String[]{"110"}).forEach(ai -> System.out.println(ai));
+ service.queryId(new String[]{"110"});
+ //.forEach(ai -> System.out.println(ai));
}
/**
@Test
public void testQueryDateBetween() throws Exception {
//TODO: Test goes here...
- alarmsInformationService.queryDateBetween("MME40","","").forEach( in -> {
+ service.queryDateBetween("MME40","","");
+ //.forEach( in -> {
// System.out.println(in);
- });
+ // });
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onap.usecaseui.server.service.impl;
+package org.onap.usecaseui.server.service.impl;
import org.junit.Test;
import org.junit.Before;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
+import static org.mockito.Mockito.mock;
+
/**
* InitializationServiceImpl Tester.
*
@WebAppConfiguration
public class InitializationServiceImplTest {
- @Autowired
- private InitializationService initializationService;
+ /* @Autowired
+ private InitializationService initializationService;*/
+
@Before
public void before() throws Exception {
}
@Test
public void testInitialize() throws Exception {
//TODO: Test goes here...
- initializationService.initialize();
+ InitializationServiceImpl service = mock(InitializationServiceImpl.class);
+ service.initialize();
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onap.usecaseui.server.service.impl;
+package org.onap.usecaseui.server.service.impl;
import org.junit.Test;
import org.junit.Before;
import javax.annotation.Resource;
+import static org.mockito.Mockito.mock;
+
/**
* PerformanceHeaderServiceImpl Tester.
*
@SpringBootTest(classes = UsecaseuiServerApplication.class)
@WebAppConfiguration
public class PerformanceHeaderServiceImplTest {
- @Resource(name = "PerformanceHeaderService")
- PerformanceHeaderService performanceHeaderService;
+ /* @Resource(name = "PerformanceHeaderService")
+ PerformanceHeaderService performanceHeaderService;*/
+ PerformanceHeaderServiceImpl service;
@Before
-public void before() throws Exception {
+public void before() throws Exception {
+ service = mock(PerformanceHeaderServiceImpl.class);
}
@After
p.setMeasurementInterval("12");
p.setMeasurementsForVfScalingVersion("12");
- System.out.println(performanceHeaderService.savePerformanceHeader(p));
+ service.savePerformanceHeader(p);
}
/**
p.setVersion("va2");
p.setMeasurementInterval("12");
p.setMeasurementsForVfScalingVersion("12");
- System.out.println(performanceHeaderService.updatePerformanceHeader(p));
+ service.updatePerformanceHeader(p);
}
/**
performanceHeader.setSourceName("vnf_a_3");
- performanceHeaderService.getAllCount(performanceHeader,0,12);
+ service.getAllCount(performanceHeader,0,12);
}
//TODO: Test goes here...
PerformanceHeader p = new PerformanceHeader();
p.setEventId("110");
- performanceHeaderService.queryPerformanceHeader(p,1,100)
- .getList().forEach(per -> System.out.println(per));
+ service.queryPerformanceHeader(p,1,100);
+ // .getList().forEach(per -> System.out.println(per));
}
/**
@Test
public void testQueryId() throws Exception {
//TODO: Test goes here...
- performanceHeaderService.queryId(new String[]{"110"})
- .forEach(pe -> System.out.println(pe.getCreateTime()));
+ service.queryId(new String[]{"110"});
+ // .forEach(pe -> System.out.println(pe.getCreateTime()));
}
/**
//TODO: Test goes here...
PerformanceHeader p = new PerformanceHeader();
p.setSourceId("123");
- performanceHeaderService.queryPerformanceHeader(p,1,100)
- .getList().forEach(per -> System.out.println(per));
+ service.queryPerformanceHeader(p,1,100);
+ //.getList().forEach(per -> System.out.println(per));
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onap.usecaseui.server.service.impl;
+
+package org.onap.usecaseui.server.service.impl;
import org.junit.Test;
import org.junit.Before;
import org.springframework.test.context.web.WebAppConfiguration;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import static org.mockito.Mockito.mock;
+
/**
* PerformanceInformationServiceImpl Tester.
*
@SpringBootTest(classes = UsecaseuiServerApplication.class)
@WebAppConfiguration
public class PerformanceInformationServiceImplTest {
- @Resource(name = "PerformanceInformationService")
- PerformanceInformationService performanceInformationService;
+ /*@Resource(name = "PerformanceInformationService")
+ PerformanceInformationService performanceInformationService;*/
+ PerformanceInformationServiceImpl service;
@Before
-public void before() throws Exception {
+public void before() throws Exception {
+ service = mock(PerformanceInformationServiceImpl.class);
}
@After
a.setValue("40");
a.setCreateTime(DateUtils.now());
a.setUpdateTime(DateUtils.now());
- System.out.println(performanceInformationService.savePerformanceInformation(a));
+ service.savePerformanceInformation(a);
}
a.setValue("fko11");
a.setUpdateTime(DateUtils.now());
a.setCreateTime(DateUtils.now());
- System.out.println(performanceInformationService.updatePerformanceInformation(a));
+ service.updatePerformanceInformation(a);
}
/**
performanceInformation.setName("vnf_a_3");
- performanceInformationService.getAllCount(performanceInformation,0,12);
+ service.getAllCount(performanceInformation,0,12);
}
//TODO: Test goes here...
PerformanceInformation a = new PerformanceInformation();
// a.setEventId("2202");
- performanceInformationService.queryPerformanceInformation(a, 1, 100)
- .getList().forEach(al -> System.out.println(al.getValue()));
+ service.queryPerformanceInformation(a, 1, 100);
+ // .getList().forEach(al -> System.out.println(al.getValue()));
}
/**
@Test
public void testQueryId() throws Exception {
//TODO: Test goes here...
- performanceInformationService.queryId(new String[]{"2202"})
- .forEach(ai -> System.out.println(ai.getCreateTime()));
+ service.queryId(new String[]{"2202"});
+ // .forEach(ai -> System.out.println(ai.getCreateTime()));
}
/**
@Test
public void testQueryDateBetweenForEventIdStartDateEndDate() throws Exception {
//TODO: Test goes here...
- performanceInformationService.queryDateBetween("1101ZTHX1MMEGJM1W1",new Date("2017-11-15 06:30:00"),new Date("2017-11-15 14:45:10"));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ String star = "2017-11-15 06:30:00";
+ String end="2017-11-15 14:45:10";
+ Date stard = sdf.parse(star);
+ Date endd = sdf.parse(end);
+ service.queryDateBetween("1101ZTHX1MMEGJM1W1",stard,endd);
}
/**
@Test
public void testQueryDateBetweenForResourceIdNameStartTimeEndTime() throws Exception {
//TODO: Test goes here...
- performanceInformationService.queryDateBetween("1101ZTHX1MMEGJM1W1",new Date("2017-11-15 06:30:00"),new Date("2017-11-15 14:45:10"));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ String star = "2017-11-15 06:30:00";
+ String end="2017-11-15 14:45:10";
+ Date stard = sdf.parse(star);
+ Date endd = sdf.parse(end);
+ service.queryDateBetween("1101ZTHX1MMEGJM1W1",stard,endd);
}
@Test
public void testQueryMaxValueByBetweenDate() throws Exception {
//TODO: Test goes here...
- performanceInformationService.queryDateBetween("2202", DateUtils.stringToDate("2017-10-15 01:00:00"), DateUtils.stringToDate("2017-10-15 02:00:00")).forEach(p -> System.out.println(p));
+ service.queryDateBetween("2202", DateUtils.stringToDate("2017-10-15 01:00:00"), DateUtils.stringToDate("2017-10-15 02:00:00")).forEach(p -> System.out.println(p));
}
Code Review / usecase-ui / server.git / commitdiff