Commit c4fc2e03 authored by 高建强's avatar 高建强

item:稳压泵启停状态图接口修改

parent b6a13f28
......@@ -219,7 +219,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public Map<String, Object> getPressurePumpStatusChart(String equipmentCode, String startTime, String endTime, String bizOrgCode, String appKey, String product, String token) {
Map<String, Object> map = new HashMap<>();
Map<String, Object> map = new LinkedHashMap<>();
// 获取稳压泵
List<Map<String, Object>> list = equipmentSpecificSerivce.getListByEquipmentCode(equipmentCode, bizOrgCode);
// 获取各稳压泵数据,及时间戳
......@@ -378,7 +378,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
}
}
ResponseModel intervalResponseModel = iotFeign.topSingleField(appKey, product, token, "10", prefix, null, null, pressurePumpStart);
ResponseModel intervalResponseModel = iotFeign.topSingleField(appKey, product, token, "100", prefix, null, null, pressurePumpStart);
String intervalTime1 = nowStrLong;
String intervalTime2 = nowStrLong;
String durationTime = nowStrLong;
......@@ -423,8 +423,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
}
}
intervalMap.put("value", Math.abs(DateUtils.getDurationMinutes(intervalTime1, intervalTime2, "yyyy-MM-dd HH:mm:ss")));
durationlMap.put("value", Math.abs(DateUtils.getDurationMinutes(durationTime, nowStrLong, "yyyy-MM-dd HH:mm:ss")));
intervalMap.put("value", Math.ceil((double) Math.abs(DateUtils.getDurationSecconds(intervalTime1, intervalTime2, "yyyy-MM-dd HH:mm:ss")) / 60));
durationlMap.put("value", Math.ceil((double) Math.abs(DateUtils.getDurationSecconds(durationTime, nowStrLong, "yyyy-MM-dd HH:mm:ss")) / 60));
} else {
intervalMap.put("value", 0);
durationlMap.put("value", 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment