From 23a18de6955ca08d969bb09bb78f105e101e500b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 10:16:38 +0800
Subject: [PATCH] 测点当前值增加上下限制
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 19 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
index 5dbff70..ccb5ede 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
@@ -1,5 +1,6 @@
package com.iailab.module.data.point.collection.handler;
+import com.alibaba.fastjson.JSONObject;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
@@ -7,16 +8,22 @@
import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.enums.DataPointFreqEnum;
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
+import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.collection.utils.GenInfluxPointValueUtils;
+import com.iailab.module.data.point.common.PointCumulateUnitEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
+import com.iailab.module.data.point.service.DaPointService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 累计点处理
@@ -29,11 +36,17 @@
@Component
public class CumulateHandle {
+ @Resource
+ private DaPointService daPointService;
+
@Autowired
@Lazy
private DataPointApi dataPointApi;
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos) {
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
try {
log.info("累计点处理开始");
@@ -42,9 +55,12 @@
}
dtos.forEach(dto -> {
try {
- Object value = singleCompute(dto, collectTime);
- InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
- pojo.setTimestamp(collectTime.toInstant());
+ Object rawValue = singleCompute(dto, collectTime, listGood, listBad);
+ BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor();
+ BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient);
+ InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue);
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
+ dataMap.put(dto.getPointNo(), calValue);
result.add(pojo);
} catch (Exception ex) {
ex.printStackTrace();
@@ -59,35 +75,100 @@
return result;
}
-
- private Object singleCompute(DaPointDTO dto, Date collectTime) {
- ApiPointDTO pointDTO = dataPointApi.getInfoByNo(dto.getMomentPoint());
- if (pointDTO == null) {
- return CommonConstant.BAD_VALUE;
+ public Map<String, Object> getCurrent(List<String> pointNos) {
+ Map<String, Object> data = new HashMap<>();
+ List<DaPointDTO> pointMathList = daPointService.getCumulatePoint(pointNos);
+ if (CollectionUtils.isEmpty(pointMathList)) {
+ return data;
}
Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ pointMathList.forEach(item -> {
+ Object value = CommonConstant.BAD_VALUE;
+ if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
+ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
+ } else {
+ Object rawValue = singleCompute(item, calendar.getTime());
+ BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
+ value = new BigDecimal(rawValue.toString()).multiply(coefficient);
+ // 写入缓存
+ redisTemplate.opsForValue().set(PointCollector.PV + item.getPointNo(),
+ new BigDecimal(value.toString()).doubleValue(), PointCollector.offset, TimeUnit.SECONDS);
+ }
+ data.put(item.getPointNo(), value);
+ });
+ return data;
+ }
+
+ private Object singleCompute(DaPointDTO dto, Date collectTime) {
+ return singleCompute(dto, collectTime, null, null);
+ }
+
+ private Object singleCompute(DaPointDTO dto, Date collectTime, List<String> listGood, List<String> listBad) {
+ ApiPointDTO pointDTO = dataPointApi.getInfoByNo(dto.getMomentPoint());
+ if (pointDTO == null) {
+ if (listBad != null) {
+ listBad.add(dto.getPointNo());
+ }
+ return CommonConstant.BAD_VALUE;
+ }
+ log.info("累计值:" + dto.getPointNo());
+
+ // 动态长度
+ ApiPointDTO momentPoint = dataPointApi.getInfoByNo(dto.getMomentPoint());
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(collectTime);
- calendar.add(Calendar.MINUTE, -1);
+ calendar.add(Calendar.SECOND, -1 * DataPointFreqEnum.getEumByCode(momentPoint.getMinfreqid()).getValue());
Date endTime = calendar.getTime();
- calendar.add(Calendar.MINUTE, dto.getLength() * -1);
- Date startTime = calendar.getTime();
+ Date startTime = PointCumulateUnitEnum.getStartTime(calendar, dto.getLength(), dto.getCumulateUnit());
+
ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
queryDto.setStart(startTime);
queryDto.setEnd(endTime);
queryDto.setPointNo(dto.getMomentPoint());
+ log.info("queryDto=" + JSONObject.toJSONString(queryDto));
+ List<ApiPointValueDTO> dataList = new ArrayList<>();
+ List<ApiPointValueDTO> dataListTemp = dataPointApi.queryPointHistoryValue(queryDto);
+ if (dto.getIsCumuNeg() != null) {
+ if (dto.getIsCumuNeg().equals(0)) {
+ // 不累计负值
+ for (ApiPointValueDTO item : dataListTemp) {
+ if (item.getV() > 0) {
+ dataList.add(item);
+ }
+ }
+ }else if (dto.getIsCumuNeg().equals(2)) {
+ // 绝对值累计
+ for (ApiPointValueDTO item : dataListTemp) {
+ item.setV(Math.abs(item.getV()));
+ dataList.add(item);
+ }
+ }else {
+ dataList = dataListTemp;
+ }
+ } else {
+ dataList = dataListTemp;
+ }
- List<ApiPointValueDTO> dataList = dataPointApi.queryPointHistoryValue(queryDto);
if (CollectionUtils.isEmpty(dataList)) {
+ log.info("dataList is empty");
+ if (listGood != null) {
+ listGood.add(dto.getPointNo());
+ }
return BigDecimal.ZERO;
} else if (dataList.size() < dto.getLength()) {
- // 补全数据
- dataList = completionData(dto.getLength(), dataList, startTime, endTime, pointDTO);
+ log.info("补全数据，dataList.size()=" + dataList.size());
+ dataList = completionData(dto.getLength(), dataList, startTime, endTime, momentPoint.getMinfreqid());
}
double total = dataList.stream().mapToDouble(ApiPointValueDTO::getV).sum();
+ if (listGood != null) {
+ listGood.add(dto.getPointNo());
+ }
return new BigDecimal(total).divide(new BigDecimal(dto.getDivisor()), 2, BigDecimal.ROUND_HALF_UP);
}
- private List<ApiPointValueDTO> completionData(int length, List<ApiPointValueDTO> dataList, Date startTime, Date endTime, ApiPointDTO pointDTO) {
+ private List<ApiPointValueDTO> completionData(int length, List<ApiPointValueDTO> dataList, Date startTime, Date endTime, String minfreqid) {
if (CollectionUtils.isEmpty(dataList) || length == dataList.size()) {
return dataList;
} else if (length < dataList.size()) {
@@ -97,11 +178,15 @@
List<ApiPointValueDTO> result = new ArrayList<>();
long start = startTime.getTime();
long end = endTime.getTime();
- long oneMin = 1000L * DataPointFreqEnum.getEumByCode(pointDTO.getMinfreqid()).getValue();
- long mins = (end - start) / oneMin;
+ long oneMin = 1000L * DataPointFreqEnum.getEumByCode(minfreqid).getValue();
+ long mins = ((end - start) / oneMin) + 1;
//找出缺少项
Map<Long, Double> sourceDataMap = new HashMap<>(dataList.size());
+ for (ApiPointValueDTO pv : dataList) {
+ sourceDataMap.put(pv.getT().getTime(), pv.getV());
+ }
+
Map<Long, Double> dataMap = new LinkedHashMap<>();
for (int i = 0; i < mins; i++) {
Long key = start + oneMin * i;
@@ -135,6 +220,6 @@
return item.getValue();
}
}
- return null;
+ return 0.0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3