Merge branch 'dev_data_stats' into dev

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");

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",
+            IFNULL(pending_ratio,0) AS "pendingRatioInt",
-            closed_total AS "closedTotal",
+            IFNULL(closed_total,0) AS "closedTotal",
-            closed_ratio AS "closedRatioInt"
+            IFNULL(closed_ratio,0) AS "closedRatioInt"
         FROM
             fact_agency_project_daily
         WHERE

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);
     }
 }