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/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index 498f28a728..3d87107f55 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22
+ image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.23
ports:
- "8109:8109"
network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 2e9a82b4bd..b585d39d7a 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- 0.3.22
+ 0.3.23
data-report-server
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 5f78474374..108f2add31 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -9,11 +9,11 @@
agency_id AS "agencyId",
project_total AS "projectTotal",
DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName",
- pending_total AS "pendingTotal",
+ IFNULL(pending_total,0) AS "pendingTotal",
/*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/
- pending_ratio AS "pendingRatioInt",
- closed_total AS "closedTotal",
- closed_ratio AS "closedRatioInt"
+ IFNULL(pending_ratio,0) AS "pendingRatioInt",
+ IFNULL(closed_total,0) AS "closedTotal",
+ IFNULL(closed_ratio,0) AS "closedRatioInt"
FROM
fact_agency_project_daily
WHERE
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);
}
}