Skip to content

张雷 / fmboot

转到一个项目
切换导航栏
切换导航栏固定状态
ac29262e 由 张雷
选项

奥体项目数据接口修改

1 个父辈 a7e38004
内嵌 并排
正在显示 1 个修改的文件 包含 18 行增加 和 14 行删除
fm-product/src/main/java/com/skua/modules/business/service/impl/OlympicCenterServiceImpl.java
......@@ -1397,8 +1397,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
end = endDate + " 23:59:59";
}else if("custom".equals(timeType)){
timeStep = "day";
start = inputQueryParams.getStart();
end = inputQueryParams.getEnd();
start = inputQueryParams.getStart()+ " 00:00:00";
end = inputQueryParams.getEnd() + " 23:59:59";
}else {
timeStep = "day";
}
......@@ -1430,11 +1430,13 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
for (Map.Entry<String, Object> entry : bmap.entrySet()) {
if(!"time".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
pumpList.add(echartResult);
if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
pumpList.add(echartResult);
}
}
}
}
......@@ -1448,11 +1450,13 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
for (Map.Entry<String, Object> entry : bmap.entrySet()) {
if(!"time".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
flowList.add(echartResult);
if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
echartResult.setSeries(monitorMap.get(entry.getKey()).toString());
flowList.add(echartResult);
}
}
}
}
......@@ -1500,8 +1504,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
end = endDate + " 23:59:59";
}else if("custom".equals(timeType)){
timeStep = "day";
start = inputQueryParams.getStart();
end = inputQueryParams.getEnd();
start = inputQueryParams.getStart()+ " 00:00:00";
end = inputQueryParams.getEnd() + " 23:59:59";
}else {
timeStep = "day";
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!