feat:zlb场地排序

src/main/java/com/xiang/common/utils/HttpService.java

@@ -73,7 +73,7 @@ public class HttpService {
         CloseableHttpResponse response = null;
         String result = "";
         try {
-            log.info("HTTP请求，请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
+            log.debug("HTTP请求，请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
             HttpPost httpPost = new HttpPost(url);
             httpPost.addHeader("Content-Type", "application/json");
             // 创建请求内容
@@ -88,7 +88,7 @@ public class HttpService {
             }
             response = httpClient.execute(httpPost);
             result = EntityUtils.toString(response.getEntity(), "utf-8");
-            log.info("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
+            log.debug("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
         } catch (Exception e) {
             log.error("doPost异常", e);
         } finally {
@@ -117,10 +117,10 @@ public class HttpService {
                     httpGet.setHeader(entry.getKey(), entry.getValue());
                 }
             }
-            log.info("doGet请求：请求头:{},请求地址：{}", header, url + request);
+            log.debug("doGet请求：请求头:{},请求地址：{}", header, url + request);
             response = httpClient.execute(httpGet);
             result = EntityUtils.toString(response.getEntity(), "utf-8");
-            log.info("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
+            log.debug("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
         } catch (Exception e) {
             log.error("doGet异常：", e);
         } finally {

src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java

@@ -56,6 +56,25 @@ public class VenueInfoUtils {
         return 5;
     }
 
+    public static int sortVenueInfo4Zlb(String placeName) {
+        if (placeName.contains("10号")) {
+            return 0;
+        }
+        if (placeName.contains("9号")) {
+            return 1;
+        }
+        if (placeName.contains("2号")) {
+            return 2;
+        }
+        if (placeName.contains("8号")) {
+            return 3;
+        }
+        if (placeName.contains("7号")) {
+            return 4;
+        }
+        return 5;
+    }
+
     public static List<VenueInfoDO> filterVenueList(String siteTimeName, List<VenueInfoDO> venueInfoDOS) {
         if (StringUtils.equals(siteTimeName, "18:00")) {
             return venueInfoDOS.stream().filter(VenueInfoUtils::get628VenueInfo).collect(Collectors.toList());

src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java

@@ -145,6 +145,6 @@ public class ZlbUserConfigTask extends BaseScheduleTaskTemplate {
         if (CollectionUtils.isEmpty(siteInfoList)) {
             return Lists.newArrayList();
         }
-        return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName()))).collect(Collectors.toList());
+        return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo4Zlb(item.getPlaceName()))).collect(Collectors.toList());
     }
 }

src/main/resources/logback-spring.xml

@@ -2,7 +2,7 @@
 <configuration scan="true">
 
     <!-- 应用名称：和统一配置中的项目代码保持一致（小写） -->
-    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="X_APP" />
+    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="APP" />
     <contextName>${APP_NAME}</contextName>
 
     <!--日志文件保留天数 -->
@@ -65,6 +65,23 @@
         </filter>
     </appender>
 
+    <appender name="APP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
     <!-- 按照每天生成日志文件：主项目日志 -->
     <appender name="APP_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -90,12 +107,12 @@
     <root level="INFO">
         <appender-ref ref="APP_DEBUG"/>
         <appender-ref ref="APP_INFO"/>
+        <appender-ref ref="APP_WARN"/>
         <appender-ref ref="APP_ERROR"/>
         <appender-ref ref="CONSOLE"/>
     </root>
 
-    <!-- mybatis 日志级别 -->
-    <logger name="com.xiang" level="INFO"/>
+    <logger name="com.xiang" level="DEBUG"/>
     <!-- Spring 框架 -->
     <logger name="org.springframework" level="INFO"/>