Browse Source

TrendLog类型数据

master
review512jwy@163.com 2 weeks ago
parent
commit
6625055c27
  1. 8
      src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java
  2. 4
      src/main/resources/application-dev.properties
  3. 4
      src/main/resources/application-prd.properties

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

@ -136,6 +136,9 @@ public class DataProcessServiceImpl implements IDataProcessService {
@Value("${category.id.accumulate}") @Value("${category.id.accumulate}")
private List<Long> categoryIdAccumulate; private List<Long> categoryIdAccumulate;
@Value("${category.id.trendLog}")
private List<Long> categoryIdTrendLog;
@Value("${category.id.status}") @Value("${category.id.status}")
private List<Long> categoryIdStatus; private List<Long> categoryIdStatus;
@ -152,6 +155,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
ALL_CATEGORY_ID.addAll(categoryIdMeasure); ALL_CATEGORY_ID.addAll(categoryIdMeasure);
ALL_CATEGORY_ID.addAll(categoryIdAccumulate); ALL_CATEGORY_ID.addAll(categoryIdAccumulate);
ALL_CATEGORY_ID.addAll(categoryIdStatus); ALL_CATEGORY_ID.addAll(categoryIdStatus);
ALL_CATEGORY_ID.addAll(categoryIdTrendLog);
} }
private static final String REDIS_DASHBOARD_DEVICE_STATUS_KEY = "dashboard_device_status"; 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())) { if (categoryIdMeasure.contains(baseTransDataEntity.getCategoryId())) {
storageMeasure(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); storageMeasure(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity);
} }
//20260401 类型1006暂时先用计测
if (categoryIdTrendLog.contains(baseTransDataEntity.getCategoryId())) {
storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity);
}
} }
} }
} }

4
src/main/resources/application-dev.properties

@ -106,9 +106,11 @@ category.id.alarm=1001
# 计测类设备类型ID # 计测类设备类型ID
category.id.measure=1003 category.id.measure=1003
# 累积类设备类型ID # 累积类设备类型ID
category.id.accumulate=1002,1006 category.id.accumulate=1002
# 状态类设备类型ID # 状态类设备类型ID
category.id.status=1004 category.id.status=1004
# trendLog设备类型ID
category.id.trendLog=1006
data.operation.batch-size=${dataOperationBatchSize:100} data.operation.batch-size=${dataOperationBatchSize:100}

4
src/main/resources/application-prd.properties

@ -100,9 +100,11 @@ category.id.alarm=1001
# 计测类设备类型ID # 计测类设备类型ID
category.id.measure=1003 category.id.measure=1003
# 累积类设备类型ID # 累积类设备类型ID
category.id.accumulate=1002,1006 category.id.accumulate=1002
# 状态类设备类型ID # 状态类设备类型ID
category.id.status=1004 category.id.status=1004
# trendLog设备类型ID
category.id.trendLog=1006
data.operation.batch-size=${dataOperationBatchSize:100} data.operation.batch-size=${dataOperationBatchSize:100}

Loading…
Cancel
Save