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 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 @@ - + @@ -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} + 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 @@ - - - + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + - - + + + + + + + + + - - + + + + + + + + + \ No newline at end of file