diff --git a/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java b/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java index f3507e9..3dbdbb8 100644 --- a/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java +++ b/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java @@ -136,6 +136,9 @@ public class DataProcessServiceImpl implements IDataProcessService { @Value("${category.id.accumulate}") private List categoryIdAccumulate; + @Value("${category.id.trendLog}") + private List categoryIdTrendLog; + @Value("${category.id.status}") private List categoryIdStatus; @@ -152,6 +155,7 @@ public class DataProcessServiceImpl implements IDataProcessService { ALL_CATEGORY_ID.addAll(categoryIdMeasure); ALL_CATEGORY_ID.addAll(categoryIdAccumulate); ALL_CATEGORY_ID.addAll(categoryIdStatus); + ALL_CATEGORY_ID.addAll(categoryIdTrendLog); } private static final String REDIS_DASHBOARD_DEVICE_STATUS_KEY = "dashboard_device_status"; @@ -735,6 +739,10 @@ public class DataProcessServiceImpl implements IDataProcessService { if (categoryIdMeasure.contains(baseTransDataEntity.getCategoryId())) { storageMeasure(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); } + //20260401 类型1006暂时先用计测 + if (categoryIdTrendLog.contains(baseTransDataEntity.getCategoryId())) { + storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); + } } } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 2e57279..697faaf 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -106,9 +106,11 @@ category.id.alarm=1001 # 计测类设备类型ID category.id.measure=1003 # 累积类设备类型ID -category.id.accumulate=1002,1006 +category.id.accumulate=1002 # 状态类设备类型ID category.id.status=1004 +# trendLog设备类型ID +category.id.trendLog=1006 data.operation.batch-size=${dataOperationBatchSize:100} diff --git a/src/main/resources/application-prd.properties b/src/main/resources/application-prd.properties index f2548b0..2d31ab0 100644 --- a/src/main/resources/application-prd.properties +++ b/src/main/resources/application-prd.properties @@ -100,9 +100,11 @@ category.id.alarm=1001 # 计测类设备类型ID category.id.measure=1003 # 累积类设备类型ID -category.id.accumulate=1002,1006 +category.id.accumulate=1002 # 状态类设备类型ID category.id.status=1004 +# trendLog设备类型ID +category.id.trendLog=1006 data.operation.batch-size=${dataOperationBatchSize:100}