|
@@ -1141,10 +1141,33 @@ public class WtInfoPushService {
|
|
return vos;
|
|
return vos;
|
|
}
|
|
}
|
|
|
|
|
|
- public List<Object> findInverterDI(String id) throws Exception {
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ public Object findInverterDI(String id) throws Exception {
|
|
|
|
+ List<WindTurbineTestingPointDi2> pointList = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id);
|
|
|
|
+ Map<String, String> idName = Maps.newHashMap();
|
|
|
|
+ List<String> pointids = Lists.newArrayList();
|
|
|
|
+ for (WindTurbineTestingPointDi2 point : pointList) {
|
|
|
|
+ idName.put(point.getId(), point.getName());
|
|
|
|
+ pointids.add(point.getId());
|
|
|
|
+ }
|
|
|
|
+ List<PointData> realData = realApiUtil.getRealData(pointids);
|
|
|
|
+ List<Object> onList = Lists.newArrayList();
|
|
|
|
+ List<Object> allList = Lists.newArrayList();
|
|
|
|
+ for (PointData p : realData) {
|
|
|
|
+ Map<String, Object> row = Maps.newHashMap();
|
|
|
|
+ row.put("id", p.getEdnaId());
|
|
|
|
+ row.put("name", idName.get(p.getEdnaId()));
|
|
|
|
+ row.put("value", p.getPointValueInDouble());
|
|
|
|
+ allList.add(row);
|
|
|
|
+ if (1 == p.getPointValueInDouble()) {
|
|
|
|
+ onList.add(row);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ Map<String, Object> map = Maps.newHashMap();
|
|
|
|
+ map.put("allList", allList);
|
|
|
|
+ map.put("onList", onList);
|
|
|
|
+ return map;
|
|
|
|
+ }
|
|
|
|
+
|
|
public List<Object> findInverterPowerCurve(String id) throws Exception {
|
|
public List<Object> findInverterPowerCurve(String id) throws Exception {
|
|
List<Object> list = Lists.newArrayList();
|
|
List<Object> list = Lists.newArrayList();
|
|
Date now = new Date();
|
|
Date now = new Date();
|