|
|
@ -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); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|