312f82a8 康伟

kangwei:修改bug,优化代码

1 个父辈 7d4de48e
......@@ -127,7 +127,7 @@ public class TestMetricInfoController {
dataMap.put( metricInfoVO.getEquipmentCode()+"_GZ" , JSUtils.divide(paramMap.get(metricInfoVO.getGzExpress()),60));//故障
//时数据
expression = "(60 - "+paramMap.get(metricInfoVO.getYxExpress())+"- "+paramMap.get(metricInfoVO.getGzExpress()) +")/60";
dataMap.put( metricInfoVO.getEquipmentCode()+"_ZT" , JSUtils.executeExpression(expression) );//暂停
dataMap.put( metricInfoVO.getEquipmentCode()+"_ZT" , JSUtils.executeExpression(expression,"0.0") );//暂停
}
dataList.add( dataMap );
}
......
......@@ -67,10 +67,10 @@ public class EquipmentInfoDurationServiceImpl extends ServiceImpl<EquipmentInfoD
List<Map<String, Object>> metricMapList = commonSqlService.queryForList(metric_sql);
if(startTime.length() < 11 ){
if(startTime.length() < 12 ){
startTime = startTime +" 00:00:00";
}
if(endTime.length() < 11 ){
if(endTime.length() < 12 ){
endTime = endTime +" 23:59:59";
}
String tsStartTime = String.valueOf(DateUtils.getMillis(DateUtils.parseDate(startTime, "yyyy-MM-dd HH:mm:ss")) / 1000L);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!