|
@@ -62,22 +62,24 @@ public class FdkkSceneService {
|
|
|
FdkkResponse fdkkResponse;
|
|
|
JSONObject jsonObject;
|
|
|
param.setSearchKey( StringUtils.isBlank(param.getSceneName())? param.getSnCode() :param.getSceneName() );
|
|
|
+ Long total = 0L;
|
|
|
if(StringUtils.isBlank(param.getSceneName()) && StringUtils.isBlank(param.getSnCode())){
|
|
|
fdkkResponse = fdkkClient.sceneList(param, getFdkkToken(token));
|
|
|
if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
|
|
|
throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
|
|
|
}
|
|
|
jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData())).getJSONObject("pageInfo");
|
|
|
+ total = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData())).getLong("sceneNum");
|
|
|
}else {
|
|
|
fdkkResponse = fdkkClient.getOnlySceneList(param, getFdkkToken(token));
|
|
|
if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
|
|
|
throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
|
|
|
}
|
|
|
jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()));
|
|
|
+ total= jsonObject.getLong("total");
|
|
|
}
|
|
|
Long pageNum = jsonObject.getLong("pageNum");
|
|
|
Long pageSize = jsonObject.getLong("pageSize");
|
|
|
- Long total = jsonObject.getLong("total");
|
|
|
JSONArray list = jsonObject.getJSONArray("list");
|
|
|
PageInfo pageInfo = PageInfo.PageInfo(pageNum, pageSize,total ,list);
|
|
|
return pageInfo;
|