From 1a85ce3098644c85f647ca86e688c40b69e22a9b Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 27 Dec 2019 10:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/dao/GridPlatformHandleLogDao.java    |  12 ++
 .../service/GridPlatformHandleLogService.java |  11 ++
 .../GridPlatformHandleLogServiceImpl.java     |   5 +
 .../item/service/impl/ItemServiceImpl.java    |   8 +
 .../mapper/comment/EventCommentDao.xml        |   4 +-
 .../mapper/item/GridPlatformHandleLogDao.xml  |  12 ++
 .../src/main/resources/logback-spring.xml     | 152 +++++++++++++++++-
 7 files changed, 195 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java
index 1c6c2e19f..aad309997 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO;
 import com.elink.esua.epdc.modules.item.entity.GridPlatformHandleLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -54,4 +55,15 @@ public interface GridPlatformHandleLogDao extends BaseDao<GridPlatformHandleLogE
      */
     void deleteHandleProcessByItemGridPlatFormId(String itemGridPlatformId);
 
+    /**
+     *
+     * 获取网格化平台最新处理情况
+     *
+     * @params [itemGridPlatformId]
+     * @return com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO
+     * @author liuchuang
+     * @since 2019/12/27 10:18
+     */
+    GridPlatformHandleLogDTO selectOneOfLastProcessLog(String itemGridPlatformId);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java
index 95a0e7183..c84629211 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java
@@ -114,4 +114,15 @@ public interface GridPlatformHandleLogService extends BaseService<GridPlatformHa
      * @since 2019/12/25 18:56
      */
     void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId);
+
+    /**
+     *
+     * 获取网格化平台最新处理情况
+     *
+     * @params [itemGridPlatformId]
+     * @return com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO
+     * @author liuchuang
+     * @since 2019/12/27 10:16
+     */
+    GridPlatformHandleLogDTO getLastHandleProcess(String itemGridPlatformId);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java
index feaf41d9a..23cf8b022 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java
@@ -112,4 +112,9 @@ public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl<GridPlatfo
         baseDao.deleteHandleProcessByItemGridPlatFormId(itemGridPlatformId);
     }
 
+    @Override
+    public GridPlatformHandleLogDTO getLastHandleProcess(String itemGridPlatformId) {
+        return baseDao.selectOneOfLastProcessLog(itemGridPlatformId);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index ee8ddd4d3..408c52231 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -1042,7 +1042,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     this.removeOldHandleProcess(dto.getId());
                     // 保存新的处理记录
                     this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId());
+                    // 查询最新处理情况
+                    GridPlatformHandleLogDTO lastHandleLog = gridPlatformHandleLogService.getLastHandleProcess(dto.getId());
                     // 更新网格化平台当前处理状态
+                    if (null != lastHandleLog && null != lastHandleLog.getStatus()) {
+                        ItemGridPlatformEntity platformEntity = new ItemGridPlatformEntity();
+                        platformEntity.setId(dto.getId());
+                        platformEntity.setStatus(lastHandleLog.getStatus());
+                        itemGridPlatformService.updateById(platformEntity);
+                    }
                 }
             }
             // 保存接口调用日志
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
index 6c93f9fd2..5b1403ed0 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
@@ -220,7 +220,7 @@
             <result property="replyUserName" column="replyUserName"/>
             <result property="replyUserFace" column="replyUserFace"/>
             <result property="createdTime" column="createdTime"/>
-            <result property="content" column="content"/>
+            <result property="content" column="replyContent"/>
         </collection>
     </resultMap>
 
@@ -235,7 +235,7 @@
         rep.USER_NAME AS replyUserName,
         rep.USER_FACE AS replyUserFace,
         rep.CREATED_TIME AS createdTime,
-        rep.CONTENT AS content
+        rep.CONTENT AS replyContent
         FROM
         epdc_event_comment com
         LEFT JOIN epdc_event_comment rep ON com.ID = rep.COMMENT_ID
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml
index 5963e7ccd..0a2b0f67d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml
@@ -28,5 +28,17 @@
         DELETE FROM epdc_grid_platform_handle_log WHERE ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId}
     </delete>
 
+    <select id="selectOneOfLastProcessLog" resultType="com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO">
+        SELECT
+            *
+        FROM
+            epdc_grid_platform_handle_log
+        WHERE
+            DEL_FLAG = '0'
+            AND ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId}
+        ORDER BY
+            STATUS DESC
+            LIMIT 1
+    </select>
 
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml
index 5deef2105..fd3a1fbfa 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/logback-spring.xml
@@ -1,21 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <logger name="org.springframework.web" level="INFO"/>
-    <logger name="org.springboot.sample" level="TRACE" />
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/job"/>
+
+    <!-- 彩色日志格式 -->
+    <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}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 
     <!-- 开发、测试环境 -->
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO" />
-        <logger name="io.renren" level="DEBUG" />
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <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="ERROR"/>
-        <logger name="org.springboot.sample" level="ERROR" />
-        <logger name="io.renren" level="ERROR" />
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <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>
 
 </configuration>
\ No newline at end of file