From: guochuyicmri Date: Fri, 26 Oct 2018 08:33:40 +0000 (+0800) Subject: modify alarm/performance code X-Git-Tag: 1.2.1~27 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2823b1f35f5b67396fa2175bbc0dc146e76d1589;p=usecase-ui%2Fserver.git modify alarm/performance code Change-Id: I770d0332f1bf5136de82ad0f77da857c647360ed Issue-ID: USECASEUI-165 Signed-off-by: guochuyicmri --- diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java index e8b86504..1a032c48 100755 --- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java @@ -97,6 +97,7 @@ public class AlarmController /** * test commit + * @throws ParseException */ @RequestMapping(value = {"/alarm/{currentPage}/{pageSize}", "/alarm/{currentPage}/{pageSize}/{sourceName}/{priority}/{startTime}/{endTime}/{vfStatus}"}, @@ -104,16 +105,12 @@ public class AlarmController public String getAlarmData(@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) throws JsonProcessingException { + @PathVariable int currentPage, @PathVariable int pageSize) throws JsonProcessingException, ParseException { AlarmsHeader alarm = new AlarmsHeader(); - alarm.setSourceName(!"null".equals(sourceName)?sourceName:null); - alarm.setStatus(!"null".equals(vfStatus)?vfStatus:null); - try { - alarm.setStartEpochMicrosec(!"null".equals(startTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(startTime).getTime()+"":null); - alarm.setLastEpochMicroSec(!"null".equals(endTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime).getTime()+"":null); - } catch (ParseException e) { - logger.error("Parse date error :"+e.getMessage()); - } + alarm.setSourceName(sourceName); + alarm.setStatus(vfStatus); + alarm.setStartEpochMicrosec(UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+""); + alarm.setLastEpochMicroSec(UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+""); Page pa = alarmsHeaderService.queryAlarmsHeader(alarm,currentPage,pageSize); try { Map map = new HashMap<>(); @@ -156,7 +153,7 @@ public class AlarmController Set sourceNames = new HashSet<>(); Page page = alarmsHeaderService.queryAlarmsHeader(new AlarmsHeader(), 1, Integer.MAX_VALUE); AlarmsHeader alarmsHeader; - if(UuiCommonUtil.isNotNullOrEmpty(page)){ + if(!UuiCommonUtil.isNotNullOrEmpty(page)){ page = new Page<>(); List list = new ArrayList<>(); alarmsHeader = new AlarmsHeader(); @@ -166,7 +163,7 @@ public class AlarmController } for(int a=0;a list = new ArrayList<>(); + @RequestMapping(value = {"/performance/{currentPage}/{pageSize}","/performance/{currentPage}/{pageSize}/{sourceName}/{startTime}/{endTime}"},method = RequestMethod.GET, produces = "application/json") + public String getPerformanceData(@PathVariable int currentPage, + @PathVariable int pageSize, + @PathVariable(required = false) String sourceName, + @PathVariable(required = false) String startTime,@PathVariable(required = false) String endTime) throws JsonProcessingException, ParseException { Page pa = new Page(); - if (null != sourceId || null != sourceName || null != priority || null != startTime || null != endTime){ PerformanceHeader performanceHeader = new PerformanceHeader(); - performanceHeader.setSourceId(!"null".equals(sourceId)?sourceId:null); - performanceHeader.setSourceName(!"null".equals(sourceName)?sourceName:null); - try { - performanceHeader.setStartEpochMicrosec(!"null".equals(startTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(startTime).getTime()+"":null); - performanceHeader.setLastEpochMicroSec(!"null".equals(endTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime).getTime()+"":null); - } catch (ParseException e) { - if (null != response) - response.setStatus(400); - logger.error("ParseException["+startTime+"]:"+e.getMessage()); - return "{'result':'error'}"; - } + performanceHeader.setSourceName(sourceName); + performanceHeader.setStartEpochMicrosec(UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+""); + performanceHeader.setLastEpochMicroSec(UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+""); pa = performanceHeaderService.queryPerformanceHeader(performanceHeader,currentPage,pageSize); - List performanceHeaders = pa.getList(); - performanceHeaders.forEach( per ->{ - PerformanceBo pbo = new PerformanceBo(); - PerformanceInformation pe = new PerformanceInformation(); - pe.setSourceId(per.getSourceId()); - List performanceInformations = performanceInformationService.queryPerformanceInformation(pe,1,100).getList(); - pbo.setPerformanceHeader(per); - performanceInformations.forEach( pi ->{ - if (pi.getValue().equals("")){ - StringBuffer value1 = new StringBuffer(); - performanceInformationService.queryPerformanceInformation(new PerformanceInformation(pi.getName()),1,100).getList() - .forEach( val -> value1.append(val.getValue())); - pi.setValue(value1.toString()); - } - } ); - pbo.setPerformanceInformation(performanceInformations); - list.add(pbo); - }); - }else{ - pa = performanceHeaderService.queryPerformanceHeader(null,currentPage,pageSize); - List p = pa!=null?pa.getList():null; - if (null != p && p.size() > 0) - p.forEach( per ->{ - PerformanceBo pbo = new PerformanceBo(); - pbo.setPerformanceHeader(per); - pbo.setPerformanceInformation(performanceInformationService.queryPerformanceInformation(new PerformanceInformation(per.getEventId()),1,100).getList()); - list.add(pbo); - }); - } try { Map map = new HashMap<>(); - map.put("performances",list); + map.put("performances",pa.getList()); map.put("totalRecords",pa.getTotalRecords()); omPerformance.setDateFormat(new SimpleDateFormat(Constant.DATE_FORMAT)); return omPerformance.writeValueAsString(map); @@ -148,86 +94,16 @@ public class PerformanceController { return omPerformance.writeValueAsString("failed"); } } - - @RequestMapping(value = {"/performance/diagram"}, method = RequestMethod.POST, produces = "application/json") - public String generateDiagram(@RequestParam String sourceId,@RequestParam String startTime,@RequestParam String endTime,@RequestParam String nameParent,@RequestParam String format) { - long timeInterval = 0; - try { - if("minute".equals(format)){//performance hour day month - formatDate="yyyy-MM-dd HH:mm"; - timeInterval =5*60000; - }else if("hour".equals(format)){ - formatDate="yyyy-MM-dd HH"; - timeInterval = 3600000; - }else{ - formatDate="yyyy-MM-dd"; - timeInterval =86400000; - } - sdf = new SimpleDateFormat(formatDate); - long startTimel = sdf.parse(startTime).getTime(); - long endTimel = sdf.parse(endTime).getTime(); - return getDiagram(sourceId, startTimel, endTimel+timeInterval, timeInterval,format,nameParent); - } catch (Exception e) { - logger.error(e.getMessage()); - e.printStackTrace(); - } - return null; - } - - private String getDiagram(String sourceId, long startTimeL, long endTimeL, long timeIteraPlusVal,String format,String nameParent) throws JsonProcessingException{ - Map result = new HashMap(); - - Map allMaps = dateProcess(sourceId, startTimeL, endTimeL, timeIteraPlusVal,format,nameParent); - result.put("dateList", allMaps.get("dateTime")); - result.put("valueList", allMaps.get("dataList")); - return omPerformance.writeValueAsString(result); - } - private Map dateProcess(String sourceId, long startTimeL, long endTimeL, long timeIteraPlusVal,String format,String nameParent) { - Map result = new HashMap(); - List dateList = new ArrayList(); - List numList = new ArrayList(); - long tmpEndTimeL = startTimeL + timeIteraPlusVal; - while (endTimeL >= tmpEndTimeL) { - String num = performanceInformationService.queryMaxValueByBetweenDate(sourceId, nameParent, startTimeL+"", tmpEndTimeL+""); - dateList.add(DateUtils.getResultDate(startTimeL, format)); - numList.add(num); - startTimeL += timeIteraPlusVal; - tmpEndTimeL += timeIteraPlusVal; - } - result.put("dateTime", dateList); - result.put("dataList", numList); - return result; - } - @RequestMapping(value = {"/performance/resourceIds"},method = RequestMethod.GET) + @RequestMapping(value = {"/performance/queryAllSourceNames"},method = RequestMethod.GET) public String getSourceIds(){ try { - return omPerformance.writeValueAsString(performanceHeaderService.queryAllSourceId()); + return omPerformance.writeValueAsString(performanceHeaderService.queryAllSourceNames()); } catch (JsonProcessingException e) { logger.error(e.getMessage()); return ""; } } - - @RequestMapping(value = {"/performance/names"},method = RequestMethod.POST) - public String getNames(@RequestParam Object sourceId){ - try { - Set names = new HashSet<>(); - List list =performanceInformationService.queryDateBetween(sourceId.toString(), null, null, null); - PerformanceInformation per; - for(int a=0;a 0) - names.add(per.getName()); - - } - return omPerformance.writeValueAsString(names); - } catch (Exception e) { - logger.error(e.getMessage()); - return ""; - } - } @RequestMapping("/performance/getPerformanceHeaderDetail/{id}") public String getPerformanceHeaderDetail(@PathVariable String id) throws JsonProcessingException { @@ -245,6 +121,31 @@ public class PerformanceController { String string =omPerformance.writeValueAsString(map); return string; } + + @RequestMapping(value = {"/performanceSsourceNames/{currentPage}/{pageSize}/{sourceName}"},method = RequestMethod.GET, produces = "application/json") + public String getPerformanceSourceNames(@PathVariable int currentPage,@PathVariable int pageSize, + @PathVariable(required = false) String sourceName) throws JsonProcessingException{ + PerformanceHeader performanceHeader = new PerformanceHeader(); + Page page = new Page(); + Set names = new HashSet(); + performanceHeader.setSourceName(sourceName); + page = performanceHeaderService.queryPerformanceHeader(performanceHeader,1,Integer.MAX_VALUE); + if(!UuiCommonUtil.isNotNullOrEmpty(page)){ + page = new Page<>(); + List list = new ArrayList<>(); + performanceHeader = new PerformanceHeader(); + list.add(performanceHeader); + page.setList(list); - + } + for(int a=0;a map = new HashMap<>(); + map.put("names",names); + map.put("totalRecords",UuiCommonUtil.getPageList(new ArrayList(names), currentPage, pageSize)); + return omPerformance.writeValueAsString(names); + } } diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java index 350978be..ac1085b4 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java @@ -15,6 +15,11 @@ */ package org.onap.usecaseui.server.controller.lcm; +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + import org.onap.usecaseui.server.bean.lcm.VfNsPackageInfo; import org.onap.usecaseui.server.service.lcm.PackageDistributionService; import org.onap.usecaseui.server.service.lcm.domain.sdc.bean.SDCServiceTemplate; @@ -26,13 +31,13 @@ import org.onap.usecaseui.server.service.lcm.domain.vfc.beans.JobStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; @RestController @org.springframework.context.annotation.Configuration @@ -187,12 +192,12 @@ public class PackageDistributionController { return packageDistributionService.getNetworkServiceInfo(); } - @RequestMapping(value = {"/uui-lcm/getNetworkServiceInfo}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/createNetworkServiceInstance}"}, method = RequestMethod.POST , produces = "application/json") public String createNetworkServiceInstance(HttpServletRequest request){ return packageDistributionService.createNetworkServiceInstance(request); } - @RequestMapping(value = {"/uui-lcm/getNetworkServiceInfo}"}, method = RequestMethod.DELETE , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/deleteNetworkServiceInstance}"}, method = RequestMethod.DELETE , produces = "application/json") public String deleteNetworkServiceInstance(@RequestParam String ns_instance_id){ return packageDistributionService.deleteNetworkServiceInstance(ns_instance_id); } diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java index 6a7b7fa2..18d57d01 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java @@ -52,8 +52,9 @@ public class ServiceTemplateController { @ResponseBody @RequestMapping(value = {"/uui-lcm/service-templates/{uuid}"}, method = RequestMethod.GET , produces = "application/json") public ServiceTemplateInput getServiceTemplateInput(@PathVariable("uuid") String uuid, @RequestParam("toscaModelPath") String toscaModelPath){ - logger.info("returned template content :"+serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath)); - return serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath); + ServiceTemplateInput serviceTemplateInput = serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath); + logger.info("returned template content :"+serviceTemplateInput); + return serviceTemplateInput; } @ResponseBody diff --git a/server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java b/server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java index 6e86ac33..e06a190a 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/PerformanceHeaderService.java @@ -33,7 +33,7 @@ public interface PerformanceHeaderService { List queryId(String[] id); - List queryAllSourceId(); + List queryAllSourceNames(); PerformanceHeader getPerformanceHeaderById(String id); } 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 0daf2c9c..cf5d4f6d 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 @@ -17,9 +17,7 @@ package org.onap.usecaseui.server.service.impl; import java.sql.Timestamp; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import javax.transaction.Transactional; @@ -30,7 +28,6 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.onap.usecaseui.server.bean.AlarmsHeader; import org.onap.usecaseui.server.service.AlarmsHeaderService; -import org.onap.usecaseui.server.util.DateUtils; import org.onap.usecaseui.server.util.Page; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -225,98 +222,14 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { logger.error("AlarmsHeaderServiceImpl queryAlarmsHeader alarmsHeader is null!"); return null; }else { - if(null!=alarmsHeader.getVersion()) { - String ver=alarmsHeader.getVersion(); - hql.append(" and a.version like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getEventName()) { - String ver=alarmsHeader.getEventName(); - hql.append(" and a.eventName = '"+ver+"'"); - } - if(null!=alarmsHeader.getAlarmCondition()) { - String ver=alarmsHeader.getAlarmCondition(); - hql.append(" and a.alarmCondition like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getDomain()) { - String ver=alarmsHeader.getDomain(); - hql.append(" and a.domain like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getEventId()) { - String ver=alarmsHeader.getEventId(); - hql.append(" and a.eventId = '"+ver+"'"); - } - if(null!=alarmsHeader.getNfcNamingCode()) { - String ver=alarmsHeader.getNfcNamingCode(); - hql.append(" and a.nfcNamingCode like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getNfNamingCode()) { - String ver=alarmsHeader.getNfNamingCode(); - hql.append(" and a.nfNamingCode like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getSourceId()) { - String ver =alarmsHeader.getSourceId(); - hql.append(" and a.sourceId like '%"+ver+"%'"); - } if(null!=alarmsHeader.getSourceName()) { String ver =alarmsHeader.getSourceName(); hql.append(" and a.sourceName like '%"+ver+"%'"); } - if(null!=alarmsHeader.getReportingEntityId()) { - String ver =alarmsHeader.getReportingEntityId(); - hql.append(" and a.reportingEntityId like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getReportingEntityName()) { - String ver =alarmsHeader.getReportingEntityName(); - hql.append(" and a.reportingEntityName like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getPriority()) { - String ver =alarmsHeader.getPriority(); - hql.append(" and a.priority like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getStartEpochMicrosec()) { - String ver =alarmsHeader.getStartEpochMicrosec(); - hql.append(" and a.startEpochMicrosec like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getLastEpochMicroSec()) { - String ver =alarmsHeader.getLastEpochMicroSec(); - hql.append(" and a.lastEpochMicroSec like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getSequence()) { - String ver =alarmsHeader.getSequence(); - hql.append(" and a.sequence like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getFaultFieldsVersion()) { - String ver =alarmsHeader.getFaultFieldsVersion(); - hql.append(" and a.faultFieldsVersion like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getEventServrity()) { - String ver =alarmsHeader.getEventServrity(); - hql.append(" and a.eventServrity like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getEventType()) { - String ver =alarmsHeader.getEventType(); - hql.append(" and a.eventSourceType like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getEventCategory()) { - String ver =alarmsHeader.getEventCategory(); - hql.append(" and a.eventCategory like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getAlarmCondition()) { - String ver =alarmsHeader.getAlarmCondition(); - hql.append(" and a.alarmCondition like '%"+ver+"%'"); - } - if(null!=alarmsHeader.getSpecificProblem()) { - String ver =alarmsHeader.getSpecificProblem(); - hql.append(" and a.specificProblem like '%"+ver+"%'"); - } if(null!=alarmsHeader.getVfStatus()) { String ver =alarmsHeader.getVfStatus(); hql.append(" and a.vfStatus = '"+ver+"'"); } - if(null!=alarmsHeader.getAlarmInterfaceA()) { - String ver =alarmsHeader.getAlarmInterfaceA(); - hql.append(" and a.alarmInterfaceA like '%"+ver+"%'"); - } if(null!=alarmsHeader.getStatus()) { String ver =alarmsHeader.getStatus(); hql.append(" and a.status = '"+ver+"'"); diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java index 618fdedb..effd2fae 100755 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java @@ -28,6 +28,7 @@ import org.hibernate.Transaction; import org.onap.usecaseui.server.bean.PerformanceHeader; import org.onap.usecaseui.server.service.PerformanceHeaderService; import org.onap.usecaseui.server.util.Page; +import org.onap.usecaseui.server.util.UuiCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -186,81 +187,13 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService { try(Session session = getSession()){ StringBuffer hql =new StringBuffer("from PerformanceHeader a where 1=1"); - if (null == performanceHeder) { - return page; - }else { - if(null!=performanceHeder.getVersion()) { - String ver=performanceHeder.getVersion(); - hql.append(" and a.version like '%"+ver+"%'"); - } - if(null!=performanceHeder.getEventName()) { - String ver=performanceHeder.getEventName(); - hql.append(" and a.eventName like '%"+ver+"%'"); - } - if(null!=performanceHeder.getDomain()) { - String ver=performanceHeder.getDomain(); - hql.append(" and a.domain like '%"+ver+"%'"); - } - if(null!=performanceHeder.getEventId()) { - String ver=performanceHeder.getEventId(); - hql.append(" and a.eventId = '"+ver+"'"); - } - if(null!=performanceHeder.getNfcNamingCode()) { - String ver=performanceHeder.getNfcNamingCode(); - hql.append(" and a.nfcNamingCode like '%"+ver+"%'"); - } - if(null!=performanceHeder.getNfNamingCode()) { - String ver=performanceHeder.getNfNamingCode(); - hql.append(" and a.nfNamingCode like '%"+ver+"%'"); - } - if(null!=performanceHeder.getSourceId()) { - String ver =performanceHeder.getSourceId(); - hql.append(" and a.sourceId = '"+ver+"'"); - } if(null!=performanceHeder.getSourceName()) { String ver =performanceHeder.getSourceName(); hql.append(" and a.sourceName like '%"+ver+"%'"); } - if(null!=performanceHeder.getReportingEntityId()) { - String ver =performanceHeder.getReportingEntityId(); - hql.append(" and a.reportingEntityId like '%"+ver+"%'"); - } - if(null!=performanceHeder.getReportingEntityName()) { - String ver =performanceHeder.getReportingEntityName(); - hql.append(" and a.reportingEntityName like '%"+ver+"%'"); - } - if(null!=performanceHeder.getPriority()) { - String ver =performanceHeder.getPriority(); - hql.append(" and a.priority like '%"+ver+"%'"); - } - if(null!=performanceHeder.getStartEpochMicrosec()) { - String ver =performanceHeder.getStartEpochMicrosec(); - hql.append(" and a.startEpochMicrosec like '%"+ver+"%'"); - } - if(null!=performanceHeder.getLastEpochMicroSec()) { - String ver =performanceHeder.getLastEpochMicroSec(); - hql.append(" and a.lastEpochMicroSec like '%"+ver+"%'"); - } - if(null!=performanceHeder.getSequence()) { - String ver =performanceHeder.getSequence(); - hql.append(" and a.sequence like '%"+ver+"%'"); - } - if(null!=performanceHeder.getMeasurementsForVfScalingVersion()) { - String ver =performanceHeder.getMeasurementsForVfScalingVersion(); - hql.append(" and a.measurementsForVfScalingVersion like '%"+ver+"%'"); - } - if(null!=performanceHeder.getMeasurementInterval()) { - String ver =performanceHeder.getMeasurementInterval(); - hql.append(" and a.measurementInterval like '%"+ver+"%'"); - } - if(null!=performanceHeder.getEventType()) { - String ver =performanceHeder.getEventType(); - hql.append(" and a.eventType like '%"+ver+"%'"); - } if(null!=performanceHeder.getStartEpochMicrosec() && null!=performanceHeder.getLastEpochMicroSec()) { hql.append(" and a.startEpochMicrosec between :startTime and :endTime "); } - } Query query = session.createQuery(hql.toString()); if(null!=performanceHeder.getStartEpochMicrosec() && null!=performanceHeder.getLastEpochMicroSec()) { query.setString("startTime",performanceHeder.getStartEpochMicrosec()).setString("endTime",performanceHeder.getLastEpochMicroSec()); @@ -298,9 +231,9 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService { } @Override - public List queryAllSourceId() { + public List queryAllSourceNames() { try(Session session = getSession()) { - Query query = session.createQuery("select distinct a.sourceId from PerformanceHeader a"); + Query query = session.createQuery("select distinct a.sourceName from PerformanceHeader a"); return query.list(); } catch (Exception e) { logger.error("exception occurred while performing PerformanceHeaderServiceImpl queryAllSourceId. Details:" + e.getMessage()); diff --git a/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java b/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java index c18ae944..3034ed37 100755 --- a/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java @@ -19,6 +19,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import java.text.ParseException; + import javax.servlet.http.HttpServletResponse; import org.junit.After; @@ -49,27 +51,7 @@ public class PerformanceControllerTest { } @Test - public void testGenerateDiagram() { - try { - controller.generateDiagram("sourceId", "2018-5-24 14:58:29", "2018-5-25 14:58:29", "nameParent", "day"); - controller.generateDiagram("sourceId", "2018-5-24 14:58:29", "2018-5-25 14:58:29", "nameParent", "hour"); - controller.generateDiagram("sourceId", "2018-5-24 14:58:29", "2018-5-25 14:58:29", "nameParent", "minute"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Test - public void testGetSourceIds() { - try { - controller.getSourceIds(); - verify(phs,times(1)).queryAllSourceId(); - } catch (Exception e) { - e.printStackTrace(); - } - } - @Test - public void testGetPerformanceData() throws JsonProcessingException { + public void testGetPerformanceData() throws JsonProcessingException, ParseException { HttpServletResponse response = mock(HttpServletResponse.class); int currentPage = 1; int pageSize=12; @@ -81,21 +63,12 @@ public class PerformanceControllerTest { PerformanceHeader header = new PerformanceHeader(); - controller.getPerformanceData(response,currentPage,pageSize,sourceId,sourceName,priority,startTime,endTime); - controller.getPerformanceData(response,currentPage,pageSize,null,null,null,null,null); + controller.getPerformanceData(currentPage,pageSize,sourceName,startTime,endTime); + controller.getPerformanceData(currentPage,pageSize,null,null,null); verify(phs,times(1)).queryPerformanceHeader(header,currentPage,pageSize); } - @Test - public void testGetNames() { - try { - controller.getNames("vnf_test_3"); - verify(pihs,times(1)).queryDateBetween("vnf_test_3",null,null,null); - } catch (Exception e) { - e.printStackTrace(); - } - } @Test public void testGetPerformanceHeaderDetail() { try { diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java index 7b980221..8c630625 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java @@ -242,9 +242,9 @@ public class PerformanceHeaderServiceImplTest { } @Test - public void testQueryAllSourceId() throws Exception { + public void queryAllSourceNames() throws Exception { try { - performanceHeaderServiceImpl.queryAllSourceId(); + performanceHeaderServiceImpl.queryAllSourceNames(); } catch (Exception e) { e.printStackTrace(); }