|
@@ -35,17 +35,21 @@ public class AdmResponse {
|
|
|
private Integer pageSize;
|
|
|
/** 查询到的数据列表 */
|
|
|
private List<?> content;
|
|
|
+ /**楼层id*/
|
|
|
+ private String floorId;
|
|
|
+ /**空间功能类型*/
|
|
|
+ private String zoneType;
|
|
|
|
|
|
public static AdmResponse success() {
|
|
|
- return new AdmResponse(SUCCESS, "", 0L,null, 1, 500, new ArrayList<>(1));
|
|
|
+ return new AdmResponse(SUCCESS, "", 0L,null, 1, 500, new ArrayList<>(1),null,null);
|
|
|
}
|
|
|
|
|
|
public static AdmResponse failure(String message) {
|
|
|
- return new AdmResponse(FAILURE, message, null, null, null, null, new ArrayList<>(1));
|
|
|
+ return new AdmResponse(FAILURE, message, null, null, null, null, new ArrayList<>(1),null,null);
|
|
|
}
|
|
|
|
|
|
public static AdmResponse success(List<?> content) {
|
|
|
- return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,null, 1, 500, CollUtil.isEmpty(content) ? new ArrayList<>(1): content);
|
|
|
+ return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,null, 1, 500, CollUtil.isEmpty(content) ? new ArrayList<>(1): content,null,null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -66,9 +70,9 @@ public class AdmResponse {
|
|
|
Integer pageNo = admRequest == null ? null : admRequest.getPageNumber();
|
|
|
Integer pageSize = admRequest == null ? null : admRequest.getPageSize();
|
|
|
if(admRequest.isOnlyCount()){
|
|
|
- return new AdmResponse(SUCCESS, null, null,total, pageNo, pageSize, CollUtil.isEmpty(admVOs) ? new ArrayList<>(1) : admVOs);
|
|
|
+ return new AdmResponse(SUCCESS, null, null,total, pageNo, pageSize, CollUtil.isEmpty(admVOs) ? new ArrayList<>(1) : admVOs,null,null);
|
|
|
}else {
|
|
|
- return new AdmResponse(SUCCESS, null, total,null, pageNo, pageSize, CollUtil.isEmpty(admVOs) ? new ArrayList<>(1) : admVOs);
|
|
|
+ return new AdmResponse(SUCCESS, null, total,null, pageNo, pageSize, CollUtil.isEmpty(admVOs) ? new ArrayList<>(1) : admVOs,null,null);
|
|
|
}
|
|
|
}
|
|
|
}
|