Merge branch 'master' into zhczh_c

src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

@@ -924,7 +924,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
         }
 
         //告警历史处理
-//        if (categoryIdAlarm.contains(baseTransDataEntity.getCategoryId())) {
+        if (categoryIdAlarm.contains(baseTransDataEntity.getCategoryId())) {
             String status = baseTransDataEntity.getStatus();
             if (null == redisOldStatusObj) {
                 if ("alert".equals(status)) {
@@ -940,7 +940,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
                     }
                 }
             }
-//        }
+        }
     }
 
     /**