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 {
                     }
                 }
             }
-        }
+//        }
     }
 
     /**

src/main/resources/application-dev.properties

@@ -106,7 +106,7 @@ category.id.alarm=1001
 # 计测类设备类型ID
 category.id.measure=1003
 # 累积类设备类型ID
-category.id.accumulate=1002
+category.id.accumulate=1002,1006
 # 状态类设备类型ID
 category.id.status=1004