|
|
|
@ -31,14 +31,19 @@ public class IedDlRecordServiceImpl implements IedDlRecordService {
|
|
|
|
|
SpectrogramHandler spectrogramHandler;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Page<IedDlRecord> list(Integer configId, int pageNum, int pageSize) throws Exception {
|
|
|
|
|
public Page<IedDlRecord> list(Integer configId, Integer devId, int pageNum, int pageSize) throws Exception {
|
|
|
|
|
PageRequest request = PageRequest.of(pageNum - 1, pageSize);
|
|
|
|
|
Specification<IedDlRecord> specification = (root, query, builder) -> {
|
|
|
|
|
Predicate predicate = builder.conjunction();
|
|
|
|
|
if (configId != null) {
|
|
|
|
|
predicate.getExpressions().add(builder.equal(root.get("configId"), configId));
|
|
|
|
|
query.orderBy(builder.desc(root.get("createTime")));
|
|
|
|
|
} else if (devId != null) {
|
|
|
|
|
predicate.getExpressions().add(builder.equal(root.get("devId"), devId));
|
|
|
|
|
query.orderBy(builder.desc(root.get("createTime")));
|
|
|
|
|
} else {
|
|
|
|
|
query.orderBy(builder.desc(root.get("id")));
|
|
|
|
|
}
|
|
|
|
|
query.orderBy(builder.desc(root.get("id")));
|
|
|
|
|
return predicate;
|
|
|
|
|
};
|
|
|
|
|
Page<IedDlRecord> result = repository.findAll(specification, request);
|
|
|
|
|