diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 4bdce1f3e0..f3c70840d6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -39,7 +39,10 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("告警级别:" + event.getLevel()); stringBuilder.append("\n"); - stringBuilder.append("IP地址:" + IpUtils.getServerIp()); + String serverIp = IpUtils.getServerIp(); + if (StringUtils.isNotBlank(serverIp)) { + stringBuilder.append("IP地址:" + serverIp); + } stringBuilder.append("\n"); stringBuilder.append("故障时间:" + formatLongTime2Str(event.getTimeStamp())); stringBuilder.append("\n"); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index eab8e78871..563c5cac04 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; public class StatsProjectServiceImpl implements StatsProjectService { @Autowired - private DataStatisticalOpenFeignClient statsPublicityFeignClient; + private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; /** * @Description 数据统计-项目-机关日月统计 @@ -25,7 +25,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { public Result agencyProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); formDTO.setDate(params); - return statsPublicityFeignClient.agencyProjectStats(formDTO); + return dataStatisticalOpenFeignClient.agencyProjectStats(formDTO); } /** @@ -36,6 +36,6 @@ public class StatsProjectServiceImpl implements StatsProjectService { public Result gridProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); formDTO.setDate(params); - return statsPublicityFeignClient.gridProjectStats(formDTO); + return dataStatisticalOpenFeignClient.gridProjectStats(formDTO); } }