回退3个月接口调用区分代码

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -157,12 +157,8 @@ public class DataController {
             }
         }
         String apolloKey = qo.getApolloKey();
-        String useApolloKey = CrossDateUtils.getUseApolloKey(jsonObject == null ? null : jsonObject.getString("startDate"), apolloKey);
-        //如果不一样，说明是3个月前的接口，需要
-        boolean needTransferField = !apolloKey.equals(useApolloKey);
 
-        Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), useApolloKey);
-        boolean isPageQuery = jsonObject != null && jsonObject.containsKey("pageNum");
+        Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), apolloKey);
 
         boolean isNeedFill = (apolloKey.contains("data_mbr_scale_stat_new_custm_overview")
                 || apolloKey.contains("data_sales_perf_anal_cont_custm_overview")
@@ -178,9 +174,6 @@ public class DataController {
             if (CollectionUtils.isEmpty(resultList)) {
                 resultList = new ArrayList<>();
             }
-            if (needTransferField) {
-                resultList = CrossDateUtils.dealStdJson(resultList);
-            }
             List<String> dateTypeList = null;
             if (apolloKey.contains("day")) {
                 dateTypeList = DateFillUtils.getDay(jsonObject.getString("bizDate"));
@@ -209,23 +202,7 @@ public class DataController {
 
         }
 
-        Object dataObj = res.get("data");
-        if (dataObj instanceof JSONObject) {
-            JSONObject data = (JSONObject) res.get("data");
-            List<JSONObject> list = DataApiUtils.getPageList(res);
-            if (needTransferField) {
-                list = CrossDateUtils.dealStdJson(list);
-                data.put("rows", list);
-            }
-            return RestResponse.successResult(data);
-        } else {
-            List<JSONObject> resultList = DataApiUtils.getDataList(res);
-            if (needTransferField) {
-                resultList = CrossDateUtils.dealStdJson(resultList);
-            }
-
-            return RestResponse.successResult(resultList);
-        }
+        return RestResponse.successResult(res.get("data"));
     }
 
     /**