ソースを参照

http://192.168.0.21/index.php?m=bug&f=view&bugID=28066

lyhzzz 3 年 前
コミット
efedfe6d28

+ 1 - 0
src/main/java/com/cdf/httpClient/request/FdkkSceneListRequest.java

@@ -17,4 +17,5 @@ public class FdkkSceneListRequest {
     private String searchKey;
     private String startTime;
     private String endTime;
+    private String sceneName;
 }

+ 18 - 7
src/main/java/com/cdf/service/impl/FdkkSceneService.java

@@ -1,5 +1,6 @@
 package com.cdf.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultCode;
@@ -59,16 +60,26 @@ public class FdkkSceneService {
 
     public PageInfo list(FdkkSceneListRequest param, String token){
         FdkkResponse fdkkResponse;
+        JSONObject jsonObject;
         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 {
-             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;
     }