From f91cc62c72b00df351b505a4b118bac265c20d58 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 16:56:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?dingding=20=E6=B6=88=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96ip=E5=9C=B0=E5=9D=80=E4=B8=BAnull=E6=97=B6=20=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/filter/LogMsgSendFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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"); From 05b2cbfe25d3703ff5f2d5a94e5ffee8fd1b6995 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 17:50:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsProjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); } } From 940a0b8e4dc52f19ab9c4911219113e8e079b94d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 18:30:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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