\r
/**\r
* test commit\r
+ * @throws ParseException \r
*/\r
@RequestMapping(value = {"/alarm/{currentPage}/{pageSize}",\r
"/alarm/{currentPage}/{pageSize}/{sourceName}/{priority}/{startTime}/{endTime}/{vfStatus}"},\r
public String getAlarmData(@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 int currentPage, @PathVariable int pageSize) throws JsonProcessingException, ParseException {\r
AlarmsHeader alarm = new AlarmsHeader();\r
- alarm.setSourceName(!"null".equals(sourceName)?sourceName:null);\r
- alarm.setStatus(!"null".equals(vfStatus)?vfStatus:null);\r
- try {\r
- alarm.setStartEpochMicrosec(!"null".equals(startTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(startTime).getTime()+"":null);\r
- alarm.setLastEpochMicroSec(!"null".equals(endTime)?new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime).getTime()+"":null);\r
- } catch (ParseException e) {\r
- logger.error("Parse date error :"+e.getMessage());\r
- }\r
+ alarm.setSourceName(sourceName);\r
+ alarm.setStatus(vfStatus);\r
+ alarm.setStartEpochMicrosec(UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+"");\r
+ alarm.setLastEpochMicroSec(UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+"");\r
Page pa = alarmsHeaderService.queryAlarmsHeader(alarm,currentPage,pageSize);\r
try {\r
Map<String,Object> map = new HashMap<>();\r
Set<String> sourceNames = new HashSet<>();\r
Page<AlarmsHeader> page = alarmsHeaderService.queryAlarmsHeader(new AlarmsHeader(), 1, Integer.MAX_VALUE);\r
AlarmsHeader alarmsHeader;\r
- if(UuiCommonUtil.isNotNullOrEmpty(page)){\r
+ if(!UuiCommonUtil.isNotNullOrEmpty(page)){\r
page = new Page<>();\r
List<AlarmsHeader> list = new ArrayList<>();\r
alarmsHeader = new AlarmsHeader();\r
}\r
for(int a=0;a<page.getList().size();a++){\r
alarmsHeader = (AlarmsHeader)page.getList().get(a);\r
- String sourceName = alarmsHeader.getSourceId();\r
+ String sourceName = alarmsHeader.getSourceName();\r
sourceNames.add(sourceName);\r
}\r
return omAlarm.writeValueAsString(sourceNames);\r
formatDate="yyyy-MM";\r
int maxDay= DateUtils.MonthOfDay(startTime, formatDate);\r
timeInterval =86400000L*maxDay;\r
- }else if("hour".equals(format)){\r
- formatDate="yyyy-MM-dd HH";\r
- timeInterval = 3600000;\r
}else{\r
formatDate="yyyy-MM-dd";\r
timeInterval =86400000;\r
import java.util.Set;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import org.onap.usecaseui.server.bean.PerformanceHeader;
import org.onap.usecaseui.server.bean.PerformanceInformation;
-import org.onap.usecaseui.server.bo.PerformanceBo;
import org.onap.usecaseui.server.constant.Constant;
import org.onap.usecaseui.server.service.PerformanceHeaderService;
import org.onap.usecaseui.server.service.PerformanceInformationService;
import org.springframework.web.bind.annotation.PathVariable;
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.RestController;
import com.fasterxml.jackson.core.JsonProcessingException;
public void setPerformanceInformationService(PerformanceInformationService performanceInformationService) {
this.performanceInformationService = performanceInformationService;
}
-
- private final String[] PerformanceCSVHeaders = {"version",
- "eventName","domain","eventId","eventType","nfcNamingCode",
- "nfNamingCode","sourceId","sourceName","reportingEntityId",
- "reportingEntityName","priority","startEpochMicrosec","lastEpochMicroSec",
- "sequence","measurementsForVfScalingVersion","measurementInterval",
- "createTime","updateTime","value","name"};
private ObjectMapper omPerformance = new ObjectMapper();
- private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
- private String formatDate = "yyyy-MM-dd";
-
- @RequestMapping(value = {"/performance/{currentPage}/{pageSize}","/performance/{currentPage}/{pageSize}/{sourceId}/{sourceName}/{priority}/{startTime}/{endTime}"},method = RequestMethod.GET, produces = "application/json")
- public String 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) throws JsonProcessingException {
- logger.info("API Parameter: [currentPage:{}, pageSize:{}, sourceId:{}, sourceName:{}, priority:{}, startTime:{}, endTime:{}]" ,currentPage, pageSize, sourceId, sourceName, priority, startTime, endTime);
- List<Object> 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<PerformanceHeader> pa = new Page<PerformanceHeader>();
- 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<PerformanceHeader> performanceHeaders = pa.getList();
- performanceHeaders.forEach( per ->{
- PerformanceBo pbo = new PerformanceBo();
- PerformanceInformation pe = new PerformanceInformation();
- pe.setSourceId(per.getSourceId());
- List<PerformanceInformation> 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<PerformanceHeader> 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<String,Object> 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);
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<String,List> result = new HashMap<String,List>();
-
- Map<String,List> 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<String,List> dateProcess(String sourceId, long startTimeL, long endTimeL, long timeIteraPlusVal,String format,String nameParent) {
- Map<String,List> result = new HashMap<String,List>();
- List<String> dateList = new ArrayList<String>();
- List<String> numList = new ArrayList<String>();
- 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<String> names = new HashSet<>();
- List<PerformanceInformation> list =performanceInformationService.queryDateBetween(sourceId.toString(), null, null, null);
- PerformanceInformation per;
- for(int a=0;a<list.size();a++) {
- per = (PerformanceInformation)list.get(a);
- if (UuiCommonUtil.checkNumber(per.getValue(),"^(-?\\d+)(\\.\\d+)?$"))
- if (Double.parseDouble(per.getValue()) > 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 {
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<PerformanceHeader> page = new Page<PerformanceHeader>();
+ Set<String> names = new HashSet<String>();
+ performanceHeader.setSourceName(sourceName);
+ page = performanceHeaderService.queryPerformanceHeader(performanceHeader,1,Integer.MAX_VALUE);
+ if(!UuiCommonUtil.isNotNullOrEmpty(page)){
+ page = new Page<>();
+ List<PerformanceHeader> list = new ArrayList<>();
+ performanceHeader = new PerformanceHeader();
+ list.add(performanceHeader);
+ page.setList(list);
-
+ }
+ for(int a=0;a<page.getList().size();a++){
+ performanceHeader = (PerformanceHeader)page.getList().get(a);
+ String name = performanceHeader.getSourceName();
+ names.add(name);
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("names",names);
+ map.put("totalRecords",UuiCommonUtil.getPageList(new ArrayList(names), currentPage, pageSize));
+ return omPerformance.writeValueAsString(names);
+ }
}
*/
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;
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
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);
}
@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
List<PerformanceHeader> queryId(String[] id);
- List<String> queryAllSourceId();
+ List<String> queryAllSourceNames();
PerformanceHeader getPerformanceHeaderById(String id);
}
\r
\r
import java.sql.Timestamp;\r
-import java.text.SimpleDateFormat;\r
import java.util.ArrayList;\r
-import java.util.Date;\r
import java.util.List;\r
\r
import javax.transaction.Transactional;\r
import org.hibernate.Transaction;\r
import org.onap.usecaseui.server.bean.AlarmsHeader;\r
import org.onap.usecaseui.server.service.AlarmsHeaderService;\r
-import org.onap.usecaseui.server.util.DateUtils;\r
import org.onap.usecaseui.server.util.Page;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
logger.error("AlarmsHeaderServiceImpl queryAlarmsHeader alarmsHeader is null!");\r
return null;\r
}else {\r
- if(null!=alarmsHeader.getVersion()) {\r
- String ver=alarmsHeader.getVersion();\r
- hql.append(" and a.version like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getEventName()) {\r
- String ver=alarmsHeader.getEventName();\r
- hql.append(" and a.eventName = '"+ver+"'");\r
- }\r
- if(null!=alarmsHeader.getAlarmCondition()) {\r
- String ver=alarmsHeader.getAlarmCondition();\r
- hql.append(" and a.alarmCondition like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getDomain()) {\r
- String ver=alarmsHeader.getDomain();\r
- hql.append(" and a.domain like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getEventId()) {\r
- String ver=alarmsHeader.getEventId();\r
- hql.append(" and a.eventId = '"+ver+"'");\r
- }\r
- if(null!=alarmsHeader.getNfcNamingCode()) {\r
- String ver=alarmsHeader.getNfcNamingCode();\r
- hql.append(" and a.nfcNamingCode like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getNfNamingCode()) {\r
- String ver=alarmsHeader.getNfNamingCode();\r
- hql.append(" and a.nfNamingCode like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getSourceId()) {\r
- String ver =alarmsHeader.getSourceId();\r
- hql.append(" and a.sourceId like '%"+ver+"%'");\r
- }\r
if(null!=alarmsHeader.getSourceName()) {\r
String ver =alarmsHeader.getSourceName();\r
hql.append(" and a.sourceName like '%"+ver+"%'");\r
}\r
- if(null!=alarmsHeader.getReportingEntityId()) {\r
- String ver =alarmsHeader.getReportingEntityId();\r
- hql.append(" and a.reportingEntityId like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getReportingEntityName()) {\r
- String ver =alarmsHeader.getReportingEntityName();\r
- hql.append(" and a.reportingEntityName like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getPriority()) {\r
- String ver =alarmsHeader.getPriority();\r
- hql.append(" and a.priority like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getStartEpochMicrosec()) {\r
- String ver =alarmsHeader.getStartEpochMicrosec();\r
- hql.append(" and a.startEpochMicrosec like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getLastEpochMicroSec()) {\r
- String ver =alarmsHeader.getLastEpochMicroSec();\r
- hql.append(" and a.lastEpochMicroSec like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getSequence()) {\r
- String ver =alarmsHeader.getSequence();\r
- hql.append(" and a.sequence like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getFaultFieldsVersion()) {\r
- String ver =alarmsHeader.getFaultFieldsVersion();\r
- hql.append(" and a.faultFieldsVersion like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getEventServrity()) {\r
- String ver =alarmsHeader.getEventServrity();\r
- hql.append(" and a.eventServrity like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getEventType()) {\r
- String ver =alarmsHeader.getEventType();\r
- hql.append(" and a.eventSourceType like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getEventCategory()) {\r
- String ver =alarmsHeader.getEventCategory();\r
- hql.append(" and a.eventCategory like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getAlarmCondition()) {\r
- String ver =alarmsHeader.getAlarmCondition();\r
- hql.append(" and a.alarmCondition like '%"+ver+"%'");\r
- }\r
- if(null!=alarmsHeader.getSpecificProblem()) {\r
- String ver =alarmsHeader.getSpecificProblem();\r
- hql.append(" and a.specificProblem like '%"+ver+"%'");\r
- }\r
if(null!=alarmsHeader.getVfStatus()) {\r
String ver =alarmsHeader.getVfStatus();\r
hql.append(" and a.vfStatus = '"+ver+"'");\r
}\r
- if(null!=alarmsHeader.getAlarmInterfaceA()) {\r
- String ver =alarmsHeader.getAlarmInterfaceA();\r
- hql.append(" and a.alarmInterfaceA like '%"+ver+"%'");\r
- }\r
if(null!=alarmsHeader.getStatus()) {\r
String ver =alarmsHeader.getStatus();\r
hql.append(" and a.status = '"+ver+"'");\r
import org.onap.usecaseui.server.bean.PerformanceHeader;\r
import org.onap.usecaseui.server.service.PerformanceHeaderService;\r
import org.onap.usecaseui.server.util.Page;\r
+import org.onap.usecaseui.server.util.UuiCommonUtil;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
import org.springframework.beans.factory.annotation.Autowired;\r
\r
try(Session session = getSession()){\r
StringBuffer hql =new StringBuffer("from PerformanceHeader a where 1=1");\r
- if (null == performanceHeder) {\r
- return page;\r
- }else {\r
- if(null!=performanceHeder.getVersion()) {\r
- String ver=performanceHeder.getVersion();\r
- hql.append(" and a.version like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getEventName()) {\r
- String ver=performanceHeder.getEventName();\r
- hql.append(" and a.eventName like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getDomain()) {\r
- String ver=performanceHeder.getDomain();\r
- hql.append(" and a.domain like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getEventId()) {\r
- String ver=performanceHeder.getEventId();\r
- hql.append(" and a.eventId = '"+ver+"'");\r
- }\r
- if(null!=performanceHeder.getNfcNamingCode()) {\r
- String ver=performanceHeder.getNfcNamingCode();\r
- hql.append(" and a.nfcNamingCode like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getNfNamingCode()) {\r
- String ver=performanceHeder.getNfNamingCode();\r
- hql.append(" and a.nfNamingCode like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getSourceId()) {\r
- String ver =performanceHeder.getSourceId();\r
- hql.append(" and a.sourceId = '"+ver+"'");\r
- }\r
if(null!=performanceHeder.getSourceName()) {\r
String ver =performanceHeder.getSourceName();\r
hql.append(" and a.sourceName like '%"+ver+"%'");\r
}\r
- if(null!=performanceHeder.getReportingEntityId()) {\r
- String ver =performanceHeder.getReportingEntityId();\r
- hql.append(" and a.reportingEntityId like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getReportingEntityName()) {\r
- String ver =performanceHeder.getReportingEntityName();\r
- hql.append(" and a.reportingEntityName like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getPriority()) {\r
- String ver =performanceHeder.getPriority();\r
- hql.append(" and a.priority like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getStartEpochMicrosec()) {\r
- String ver =performanceHeder.getStartEpochMicrosec();\r
- hql.append(" and a.startEpochMicrosec like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getLastEpochMicroSec()) {\r
- String ver =performanceHeder.getLastEpochMicroSec();\r
- hql.append(" and a.lastEpochMicroSec like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getSequence()) {\r
- String ver =performanceHeder.getSequence();\r
- hql.append(" and a.sequence like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getMeasurementsForVfScalingVersion()) {\r
- String ver =performanceHeder.getMeasurementsForVfScalingVersion();\r
- hql.append(" and a.measurementsForVfScalingVersion like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getMeasurementInterval()) {\r
- String ver =performanceHeder.getMeasurementInterval();\r
- hql.append(" and a.measurementInterval like '%"+ver+"%'");\r
- }\r
- if(null!=performanceHeder.getEventType()) {\r
- String ver =performanceHeder.getEventType();\r
- hql.append(" and a.eventType like '%"+ver+"%'");\r
- }\r
if(null!=performanceHeder.getStartEpochMicrosec() && null!=performanceHeder.getLastEpochMicroSec()) {\r
hql.append(" and a.startEpochMicrosec between :startTime and :endTime ");\r
}\r
- }\r
Query query = session.createQuery(hql.toString());\r
if(null!=performanceHeder.getStartEpochMicrosec() && null!=performanceHeder.getLastEpochMicroSec()) {\r
query.setString("startTime",performanceHeder.getStartEpochMicrosec()).setString("endTime",performanceHeder.getLastEpochMicroSec());\r
}\r
\r
@Override\r
- public List<String> queryAllSourceId() {\r
+ public List<String> queryAllSourceNames() {\r
try(Session session = getSession()) {\r
- Query query = session.createQuery("select distinct a.sourceId from PerformanceHeader a");\r
+ Query query = session.createQuery("select distinct a.sourceName from PerformanceHeader a");\r
return query.list();\r
} catch (Exception e) {\r
logger.error("exception occurred while performing PerformanceHeaderServiceImpl queryAllSourceId. Details:" + e.getMessage());\r
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;
}
@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;
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 {
}
@Test
- public void testQueryAllSourceId() throws Exception {
+ public void queryAllSourceNames() throws Exception {
try {
- performanceHeaderServiceImpl.queryAllSourceId();
+ performanceHeaderServiceImpl.queryAllSourceNames();
} catch (Exception e) {
e.printStackTrace();
}
Code Review / usecase-ui / server.git / commitdiff