提交保存一版

src/main/java/com/jkcredit/record/storage/service/impl/RecordStorageServiceImpl.java

@@ -50,10 +50,9 @@ public class RecordStorageServiceImpl implements RecordStorageService {
 
     @Override
     public CommonResponseObject recordStorage(List<MonthResult> monthResultList) {
+        log.info("待存入ES:{}", monthResultList.size());
         //设置保存的索引和id
         String indexName = "index-record-" + monthResultList.get(0).getMonth();
-        // todo
-//        String indexName = "index-record-test" + monthResultList.get(0).getMonth();
         BulkRequest bulkRequest=new BulkRequest();
 
         // 发送es失败id集合
@@ -61,26 +60,23 @@ public class RecordStorageServiceImpl implements RecordStorageService {
 
         //保存的数据 这里指定json类型
         for (MonthResult monthResult : monthResultList) {
-            // todo
             String id = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()) + UUID.randomUUID().toString();
-//            if (monthResult.getVehicleid().equals("浙K9C262_0") || monthResult.getVehicleid().equals("苏B061F3_0")) {
-//                id = "test-202107260500";
-//            } else {
-//                id = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()) + UUID.randomUUID().toString();
-//            }
             IndexRequest indexRequest = new IndexRequest(indexName).id(id);
             indexRequest.source(JSON.toJSONString(monthResult), XContentType.JSON);
             bulkRequest.add(indexRequest);
             monthResult.setId(id);
         }
 
-
         try {
 //            esRestClient.bulk()
             //执行保存 index同步 indexAsync异步
             BulkResponse response = esRestClient.bulk(bulkRequest, RequestOptions.DEFAULT);
+            log.info("推送结果:{}", !response.hasFailures());
             // 判断发送es是否存在失败
             if (response.hasFailures()) {
+                log.error("pushEsError-推送失败条数:{}", response.getItems().length);
+                log.error("pushEsError-推送失败条数:{}", response.getItems()[0].getFailureMessage());
+                log.error("pushEsError-推送失败条数:{}", response.getItems()[0].getFailure());
                 // 将发送es失败数据的id存入集合
                 while (response.iterator().hasNext()) {
                     BulkItemResponse bulkItemResponse = response.iterator().next();
@@ -90,13 +86,12 @@ public class RecordStorageServiceImpl implements RecordStorageService {
 
                 }
             }
-            System.out.println(response.toString());
+
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("pushEsException:", e);
         }
 
         // 存在发送失败数据，将发送失败数据找出并返回
-        // todo 返回失败数据集合 待测试
         if (errorIds.size() != 0) {
             Map<String, MonthResult> tempMonthMap = new HashMap<>();
             List<MonthResult> errorList = new ArrayList<>();

src/main/resources/application-dev.yml

@@ -0,0 +1,5 @@
+ElasticSearch:
+  host: es-cn-2r427cps10022b0yt.elasticsearch.aliyuncs.com
+  port: 9200
+  username: kibana
+  password: Kibana@2021

src/main/resources/application-prod.yml

@@ -0,0 +1,5 @@
+ElasticSearch:
+  host: es-cn-2r427cps10022b0yt.elasticsearch.aliyuncs.com
+  port: 9200
+  username: kibana
+  password: Kibana@2021

src/main/resources/application.yml

@@ -1,3 +1,8 @@
 server:
   port: 8086
+spring:
+  application:
+    name: record-storage
+  profiles:
+    active: dev
 

src/main/resources/logback-spring.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="logs"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="errorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="sourceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录WARN级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>${log.path}/source/source.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/source/source-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="sourceLog"/>
+        <appender-ref ref="errorLog"/>
+    </root>
+</configuration>