修复bug

epmet-module/gov-project/gov-project-server/pom.xml

@@ -191,8 +191,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt_yfz@@</spring.datasource.druid.password>
+                <spring.datasource.druid.password>root</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -243,8 +243,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt_yfz@@</spring.datasource.druid.password>
+                <spring.datasource.druid.password>root</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1994,7 +1994,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType) {
         String orgPath = getOrgPath(orgId, orgType);
-        try {
+//        try {
             EventAnalysisResultDTO dto = baseDao.getEventBySourceTypeCount(orgPath);//根据事件来源获取事件数量
             Integer total;
             if (StringUtils.isEmpty(eventType)) {
@@ -2050,10 +2050,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             }
             return dto;
 //            return biuldData(dto, orgPath, eventType, total);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.getMessage();
+//            e.getMessage();
-            return null;
+//            return null;
-        }
+//        }
     }
 
     private EventAnalysisResultDTO biuldData(EventAnalysisResultDTO dto, String orgPath, String eventType, Integer total) {

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -570,9 +570,9 @@
 
     <select id="getEventBySourceTypeCount" resultType="com.epmet.dto.result.EventAnalysisResultDTO">
         SELECT
-            SUM(CASE WHEN e.SOURCE_TYPE = 0 THEN 1 ELSE 0 END) as jiSuJiBan,
+            COUNT( e.SOURCE_TYPE = 0 OR NULL ) as jiSuJiBan,
-            SUM(CASE WHEN e.SOURCE_TYPE = 1 THEN 1 ELSE 0 END) as zhiTongLianBan,
+            COUNT( e.SOURCE_TYPE = 1 OR NULL ) as zhiTongLianBan,
-            SUM(CASE WHEN e.SOURCE_TYPE = 2 THEN 1 ELSE 0 END) as wangGeHua
+            COUNT( e.SOURCE_TYPE = 2 OR NULL ) as wangGeHua
         FROM ic_event e
         <where>
             e.DEL_FLAG = 0