From 58804b8bb7ae2306357cf5a4f6fe3994f54c2b27 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 9 Aug 2022 23:32:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=822.=E4=BF=AE=E6=94=B9=E4=BA=86API?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E8=BD=AC=E6=8D=A2=E5=99=A8?=
 =?UTF-8?q?#getTotal()=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseApiResultConvertAdapter.java          | 22 +++++-
 .../converter/ListApiResultConverter.java     |  2 +-
 src/main/resources/logback-spring.xml         | 70 +++----------------
 3 files changed, 31 insertions(+), 63 deletions(-)

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 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/admin"/>
+    <property name="log.path" value="logs/jmreport"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
@@ -134,65 +134,13 @@
         </filter>
     </appender>
 
-    <!--  rocketmq client 的日志appender  -->
-    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/rocketmqclient.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <!--<root>
-        <level value="DEBUG"/>
+    <!--日志从INFO级别开始打-->
+    <root>
+        <level value="INFO"/>
+        <!--console控制台日志已经在logback-base.xml中配置了，此处不需要重复配置-->
         <appender-ref ref="DEBUG_FILE"/>
-    </root>-->
-
-    <!-- 开发、测试环境 -->
-    <!--<springProfile name="dev,test,local">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
-        <logger name="com.epmet.dao" level="DEBUG"/>
-        &lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
-        <logger name="RocketmqClient" level="INFO" additivity="false">
-            <appender-ref ref="RocketmqClientAppender"/>
-        </logger>
-        <root level="INFO">
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>-->
-
-    <!-- 生产环境 -->
-    <!--<springProfile name="prod">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
-        &lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
-        <logger name="RocketmqClient" level="INFO" additivity="false">
-            <appender-ref ref="RocketmqClientAppender"/>
-        </logger>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>-->
-
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </root>
 </configuration>