Skip to content

张雷 / fmboot

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

奥体项目数据接口修改

1 个父辈 a7e38004
内嵌 并排
正在显示 1 个修改的文件 包含 8 行增加 和 4 行删除
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,6 +1430,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
for (Map.Entry<String, Object> entry : bmap.entrySet()) {
if(!"time".equals(entry.getKey())){
if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
......@@ -1438,6 +1439,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
}
}
}
List<Map<String, Object>> fDataList = factoryInfoService.queryReportData(AT_ID, fPgField, start, end, timeStep);
for (Map<String, Object> bmap : fDataList) {
String time = "";
......@@ -1448,6 +1450,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
for (Map.Entry<String, Object> entry : bmap.entrySet()) {
if(!"time".equals(entry.getKey())){
if(!"null".equals(entry.getKey())&&!"".equals(entry.getKey())){
EchartResult echartResult = new EchartResult();
echartResult.setName(time);
echartResult.setValue(entry.getValue().toString());
......@@ -1456,6 +1459,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
}
}
}
}
map.put("pump", pumpList);
map.put("flow", flowList);
return map;
......@@ -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!