diff --git a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java b/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java index 3e14b06..e39a575 100644 --- a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java +++ b/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java @@ -53,7 +53,27 @@ public abstract class BaseApiResultConvertAdapter implements ApiDataConvertAdapt */ @Override public String getTotal(JSONObject jsonObject) { - return "10"; + Object data = jsonObject.get("data"); + + if (data == null) { + // 没有数据返回 + return "0"; + } + + if (data instanceof JSONObject) { + // data是个对象,还要解析里层的 + JSONObject dataJO = (JSONObject) data; + if (!dataJO.containsKey("list")) { + // 就是单个对象,详情查询等 + return null; + } else { + // 返回的是pageData对象,取出pages来返回 + return dataJO.getString("pages"); + } + } else { + // todo data就是个列表,不知道返回什么,需要测试 + return null; + } } /** diff --git a/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java b/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java index d1381b2..f0562e6 100644 --- a/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java +++ b/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java @@ -14,7 +14,7 @@ public class ListApiResultConverter extends BaseApiResultConvertAdapter { public String getData(JSONObject jsonObject) { JSONArray list = jsonObject.getJSONArray("data"); if (list == null) { - return "0"; + return null; } return list.toJSONString(); } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 6d53291..e2ccf15 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ - + @@ -134,65 +134,13 @@ - - - - ${log.path}/rocketmqclient.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - + + + - --> - - - - - - - + + + +