From b98a61c0c707c9fc3a51e68fe67909cb06aaafcd Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Jun 2021 11:45:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
index f99c16c..d81b12f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -205,9 +205,9 @@
}
@Override
- public VersionDTO queryVersionById(VersionQueryByIdForm form) {
+ public VersionQueryDTO queryVersionById(VersionQueryByIdForm form) {
//������������������
- VersionDTO dto = new VersionDTO();
+ VersionQueryDTO dto = new VersionQueryDTO();
//������
Integer id = form.getId();
Integer size = form.getSize();
@@ -235,7 +235,20 @@
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- dto.setVersion(version);
+ if (ObjectUtils.isEmpty(querySensors)) {
+ dto.setTotal(0);
+ dto.setPages(0);
+ }else{
+ dto.setTotal(querySensors.size());
+ double querySize = (double)querySensors.size();
+ double dSize = (double)size;
+ dto.setPages((int)Math.ceil(querySize/dSize));
+ }
+ dto.setSize(size);
+ dto.setCurrent(page);
+ VersionDTO versionDTO = new VersionDTO();
+ versionDTO.setVersion(version);
+ dto.setVersionDTOS(Arrays.asList(versionDTO));
return dto;
}
--
Gitblit v1.8.0