From 6a8e248a786e4a3f5ec76d46e21057f8fd84300a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 18 一月 2025 13:41:45 +0800
Subject: [PATCH] singleCompute 修改

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java          |   12 ++++++------
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java |    4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
index a9b3215..0ab1552 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
@@ -77,7 +77,7 @@
 
     public static final String PV = "point_value:";
 
-    public static final long offset = 60 * 3L;
+    public static final long offset = 60 * 2L;
 
     /**
      * 采集
@@ -94,19 +94,19 @@
             List<String> listBad = new ArrayList<>();
             log.info("读取常量点");
             List<DaPointDTO> pointConstantList = daPointService.getConstantPoint(minfreq);
-            pointValues.addAll(constantHandle.handle(collectTime, pointConstantList, dataMap,listGood,listBad));
+            pointValues.addAll(constantHandle.handle(collectTime, pointConstantList, dataMap, listGood, listBad));
 
             log.info("读取测量点");
             List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(minfreq);
-            pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap,listGood,listBad));
+            pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap, listGood, listBad));
 
             log.info("读取计算点");
             List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq);
-            pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap,listGood,listBad));
+            pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBad));
 
             log.info("读取累计点");
             List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
-            pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList,listGood,listBad));
+            pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBad));
 
             log.info("存入时序库");
             influxDBService.asyncWritePointValues(pointValues);
@@ -125,7 +125,7 @@
                 }
             }
             log.info("更新采集状态");
-            daPointCollectStatusService.recordStatusList(listGood,listBad, collectTime);
+            daPointCollectStatusService.recordStatusList(listGood, listBad, collectTime);
             log.info("采集完成");
         } catch (Exception ex) {
             log.info("采集异常!");
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
index 66dc01f..c5ac688 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
@@ -1,5 +1,6 @@
 package com.iailab.module.data.point.collection.handler;
 
+import com.alibaba.fastjson.JSON;
 import com.iailab.framework.common.util.string.StrUtils;
 import com.iailab.module.data.common.enums.CommonConstant;
 import com.iailab.module.data.common.enums.DataTypeEnum;
@@ -57,6 +58,7 @@
             if (CollectionUtils.isEmpty(dtos)) {
                 return result;
             }
+            log.info(JSON.toJSONString(listBad));
             dtos.forEach(dto -> {
                 try {
                     Object value = singleCompute(dto, dataMap, listGood, listBad);
@@ -79,9 +81,11 @@
 
     private Object singleCompute(DaPointDTO dto, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
         String expression = dto.getExpression();
+        log.info("PointNo=" + dto.getPointNo() + ";SourceExpression=" + expression);
         String[] arr = expression.split(regex);
         // 判断arr都在dataMap中包含
         if (!Arrays.stream(arr).allMatch(dataMap::containsKey)) {
+            log.info("dataMap not contains key");
             listBad.add(dto.getPointNo());
             return CommonConstant.BAD_VALUE;
         }

--
Gitblit v1.9.3