|
@@ -1,5 +1,6 @@
|
|
package com.cdf.service.impl;
|
|
package com.cdf.service.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.cdf.common.PageInfo;
|
|
import com.cdf.common.PageInfo;
|
|
import com.cdf.common.ResultCode;
|
|
import com.cdf.common.ResultCode;
|
|
@@ -59,16 +60,26 @@ public class FdkkSceneService {
|
|
|
|
|
|
public PageInfo list(FdkkSceneListRequest param, String token){
|
|
public PageInfo list(FdkkSceneListRequest param, String token){
|
|
FdkkResponse fdkkResponse;
|
|
FdkkResponse fdkkResponse;
|
|
|
|
+ JSONObject jsonObject;
|
|
if(StringUtils.isBlank(param.getSearchKey())){
|
|
if(StringUtils.isBlank(param.getSearchKey())){
|
|
- fdkkResponse = fdkkClient.sceneList(param, getFdkkToken(token));
|
|
|
|
|
|
+ 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");
|
|
}else {
|
|
}else {
|
|
- fdkkResponse = fdkkClient.getOnlySceneList(param, getFdkkToken(token));
|
|
|
|
|
|
+ param.setSceneName(param.getSearchKey());
|
|
|
|
+ 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()));
|
|
}
|
|
}
|
|
- if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
|
|
|
|
- throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
|
|
|
|
- }
|
|
|
|
- JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData())).getJSONObject("pageInfo");
|
|
|
|
- PageInfo pageInfo = PageInfo.PageInfo(jsonObject.getLong("pageNum"), jsonObject.getLong("pageSize"), jsonObject.getLong("total"), jsonObject.getJSONArray("list"));
|
|
|
|
|
|
+ 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;
|
|
return pageInfo;
|
|
}
|
|
}
|
|
|
|
|