|
@@ -34,7 +34,7 @@ public class WindTurbineStatusDataService {
|
|
|
this.windTurbineStatusDataRepository = windTurbineStatusDataRepository;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ private final String equipmentNo = "equipmentNo";
|
|
|
/**
|
|
|
* 根据时间和编号 分页查询 逆变器数据 yh
|
|
|
*
|
|
@@ -61,9 +61,9 @@ public class WindTurbineStatusDataService {
|
|
|
}
|
|
|
|
|
|
if (noSortOrder.contains("asc")) {
|
|
|
- orders.add(new Sort.Order(Sort.Direction.ASC, "equipmentNo"));
|
|
|
+ orders.add(new Sort.Order(Sort.Direction.ASC, equipmentNo));
|
|
|
} else {
|
|
|
- orders.add(new Sort.Order(Sort.Direction.DESC, "equipmentNo"));
|
|
|
+ orders.add(new Sort.Order(Sort.Direction.DESC, equipmentNo));
|
|
|
}
|
|
|
|
|
|
Sort sort = Sort.by(orders);
|
|
@@ -98,7 +98,7 @@ public class WindTurbineStatusDataService {
|
|
|
predicates.add(cb.lessThan(root.get("time").as(Date.class), endTime));
|
|
|
}
|
|
|
if (no != null) {
|
|
|
- CriteriaBuilder.In<Integer> in = cb.in(root.get("equipmentNo"));
|
|
|
+ CriteriaBuilder.In<Integer> in = cb.in(root.get(equipmentNo));
|
|
|
for (Integer integer : no) {
|
|
|
in.value(integer);
|
|
|
}
|