From ea438fbb1c8b2df9bbe3bdff99fe6831fdd64853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 09:32:57 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E9=87=8F=E6=B5=8B=EF=BC=9Amodbus?=
 =?UTF-8?q?=E5=92=8Cads=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/node/utils.ts | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts
index 00b10f9f..9b43f74d 100644
--- a/ui/dasadmin/src/views/backend/node/utils.ts
+++ b/ui/dasadmin/src/views/backend/node/utils.ts
@@ -119,6 +119,10 @@ export const excelDefaultConfig: any = {
                 {
                     label: '限值2下限',
                     code: 'limit2Low'
+                },
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
                 }
             ],
             R0C4: ['03', '04'],
@@ -233,6 +237,10 @@ export const excelDefaultConfig: any = {
                     label: '寄存器地址',
                     code: 'col3',
                 },
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
+                }
             ],
             R0C4: ['03', '04'],
             R0C5: [
@@ -262,6 +270,10 @@ export const excelDefaultConfig: any = {
                     label: '寄存器',
                     code: 'col3',
                 },
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
+                }
             ],
             R0C4: ['01', '02', '03', '04'],
         },
@@ -335,6 +347,10 @@ export const excelDefaultConfig: any = {
                 {
                     label: '限值2下限',
                     code: 'limit2Low'
+                },
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
                 }
             ],
             R0C4: [
@@ -394,6 +410,10 @@ export const excelDefaultConfig: any = {
         139: {
             name: '累计量',
             head: [
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
+                }
             ],
         },
         //遥信140 DISCRETE
@@ -412,6 +432,10 @@ export const excelDefaultConfig: any = {
                     label: '寄存器地址',
                     code: 'registerAddr',
                 },
+                {
+                    label:'强制归档',
+                    code:'forceArchive',
+                }
             ],
             R0C4: [
                 "8位归一化值",

From 4dad3683f9b4a7d4c09b1a3bbbbc00fd1e2ca45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 09:43:40 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E4=BC=98=E5=8C=96import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/cache/domain/IotModelInfoCache.java | 2 --
 .../das/modules/cache/service/impl/IotModelCacheImpl.java    | 1 -
 .../java/com/das/modules/calc/controller/CalcController.java | 4 ----
 .../java/com/das/modules/calc/domain/entity/CalcModule.java  | 1 -
 .../com/das/modules/calc/functions/FunctionAvgValue.java     | 2 --
 .../com/das/modules/calc/functions/FunctionCacheValue.java   | 1 -
 .../com/das/modules/calc/functions/FunctionRealData.java     | 3 ++-
 .../com/das/modules/calc/functions/FunctionSaveCalcData.java | 5 ++++-
 .../com/das/modules/calc/functions/FunctionSumValue.java     | 3 ---
 .../com/das/modules/calc/functions/FunctionTopValue.java     | 4 ----
 .../das/modules/calc/functions/FunctionWindSpeedFactor.java  | 1 -
 das/src/main/java/com/das/modules/calc/service/CalcJob.java  | 1 -
 .../java/com/das/modules/node/command/HeartbeatCommand.java  | 2 +-
 13 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/das/src/main/java/com/das/modules/cache/domain/IotModelInfoCache.java b/das/src/main/java/com/das/modules/cache/domain/IotModelInfoCache.java
index 00e20474..574d550f 100644
--- a/das/src/main/java/com/das/modules/cache/domain/IotModelInfoCache.java
+++ b/das/src/main/java/com/das/modules/cache/domain/IotModelInfoCache.java
@@ -2,8 +2,6 @@ package com.das.modules.cache.domain;
 
 import lombok.Data;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 @Data
 public class IotModelInfoCache {
     private Long iotModelId;
diff --git a/das/src/main/java/com/das/modules/cache/service/impl/IotModelCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/IotModelCacheImpl.java
index be670f65..d548237e 100644
--- a/das/src/main/java/com/das/modules/cache/service/impl/IotModelCacheImpl.java
+++ b/das/src/main/java/com/das/modules/cache/service/impl/IotModelCacheImpl.java
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 @Service
 public class IotModelCacheImpl implements IotModelCache {
diff --git a/das/src/main/java/com/das/modules/calc/controller/CalcController.java b/das/src/main/java/com/das/modules/calc/controller/CalcController.java
index 15b74bb6..a9463bf0 100644
--- a/das/src/main/java/com/das/modules/calc/controller/CalcController.java
+++ b/das/src/main/java/com/das/modules/calc/controller/CalcController.java
@@ -1,11 +1,9 @@
 package com.das.modules.calc.controller;
 
-import cn.hutool.core.io.FileUtil;
 import com.das.common.result.R;
 import com.das.modules.calc.domain.vo.CalcModuleVo;
 import com.das.modules.calc.service.CalcService;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,9 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
diff --git a/das/src/main/java/com/das/modules/calc/domain/entity/CalcModule.java b/das/src/main/java/com/das/modules/calc/domain/entity/CalcModule.java
index c5d5149a..fa4e9bdd 100644
--- a/das/src/main/java/com/das/modules/calc/domain/entity/CalcModule.java
+++ b/das/src/main/java/com/das/modules/calc/domain/entity/CalcModule.java
@@ -10,7 +10,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Date;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @TableName("sys_calc_module")
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
index 68742ee6..94b2359f 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
@@ -1,7 +1,5 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.service.DataService;
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionCacheValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionCacheValue.java
index 178c6af7..e89662d9 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionCacheValue.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionCacheValue.java
@@ -9,7 +9,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Aviator扩展函数  - 获取设备实时数据
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java
index 8615b8e3..918f6393 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java
@@ -5,7 +5,8 @@ import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.domain.SnapshotValueQueryParam;
 import com.das.modules.data.service.DataService;
 import com.googlecode.aviator.runtime.function.AbstractFunction;
-import com.googlecode.aviator.runtime.type.*;
+import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
index cd88c7ee..2117dd10 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java
@@ -12,7 +12,10 @@ import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Aviator扩展函数  - 获取设备实时数据
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSumValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSumValue.java
index a2d518b9..45d9bfb1 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionSumValue.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSumValue.java
@@ -1,6 +1,5 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.service.DataService;
@@ -8,12 +7,10 @@ import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.type.AviatorNil;
 import com.googlecode.aviator.runtime.type.AviatorObject;
 import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Aviator扩展函数  - 获取时间维度内最早的一条数据
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionTopValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionTopValue.java
index eedd5860..b505f15b 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionTopValue.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionTopValue.java
@@ -1,10 +1,8 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
-import com.das.modules.data.domain.SnapshotValueQueryParam;
 import com.das.modules.data.service.DataService;
 import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.type.AviatorNil;
@@ -14,8 +12,6 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java b/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java
index 2765024b..ed108544 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java
@@ -11,7 +11,6 @@ import com.googlecode.aviator.runtime.type.AviatorObject;
 import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/das/src/main/java/com/das/modules/calc/service/CalcJob.java b/das/src/main/java/com/das/modules/calc/service/CalcJob.java
index 310e7717..1f307a5c 100644
--- a/das/src/main/java/com/das/modules/calc/service/CalcJob.java
+++ b/das/src/main/java/com/das/modules/calc/service/CalcJob.java
@@ -6,7 +6,6 @@ import com.das.modules.cache.service.CacheService;
 import com.das.modules.calc.domain.entity.CalcModule;
 import com.googlecode.aviator.AviatorEvaluatorInstance;
 import com.googlecode.aviator.Expression;
-import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
diff --git a/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java b/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
index e29915c9..22be0b41 100644
--- a/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
+++ b/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
@@ -56,7 +56,7 @@ public class HeartbeatCommand implements BaseCommand{
                     }
                     //判断是不是风机
                     String keyPLCDeviceStatus = String.format("RT:%d:iturbineoperationmode", deviceId);
-                    String keyCommFaultState = String.format("RT:%d:commfaultstate");
+                    String keyCommFaultState = String.format("RT:%d:commfaultstate",deviceId);
                     Integer plcDeviceStatus = adminRedisTemplate.get(keyPLCDeviceStatus);
                     if (plcDeviceStatus == null){
                         adminRedisTemplate.set(keyCommFaultState, online ? 0 : 1);

From ea7be8e943c9b64cf4bca0ee49f9a82182f64802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 09:49:45 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A3=8E=E9=80=9F?=
 =?UTF-8?q?=E7=B3=BB=E6=95=B0=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/das/modules/calc/service/CalcService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/das/src/main/java/com/das/modules/calc/service/CalcService.java b/das/src/main/java/com/das/modules/calc/service/CalcService.java
index 0e291a3b..6872e1c4 100644
--- a/das/src/main/java/com/das/modules/calc/service/CalcService.java
+++ b/das/src/main/java/com/das/modules/calc/service/CalcService.java
@@ -134,6 +134,9 @@ public class CalcService {
 
         FunctionOffsetDate offsetDate = new FunctionOffsetDate();
         aviator.addFunction(offsetDate);
+
+        FunctionWindSpeedFactor windSpeedFactor = new FunctionWindSpeedFactor(dataService,cacheService);
+        aviator.addFunction(windSpeedFactor);
     }
 
     /**

From 0d16618250d10fbdc1c125c03bdc3c7e7ef48b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 10:32:52 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=8C=89=E5=90=8D=E7=A7=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/das/modules/calc/service/CalcService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/calc/service/CalcService.java b/das/src/main/java/com/das/modules/calc/service/CalcService.java
index 6872e1c4..c9669f0e 100644
--- a/das/src/main/java/com/das/modules/calc/service/CalcService.java
+++ b/das/src/main/java/com/das/modules/calc/service/CalcService.java
@@ -2,6 +2,7 @@ package com.das.modules.calc.service;
 
 import cn.hutool.core.codec.Base64Encoder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.das.common.utils.AdminRedisTemplate;
 import com.das.modules.cache.service.CacheService;
 import com.das.modules.calc.domain.entity.CalcModule;
@@ -179,7 +180,9 @@ public class CalcService {
      * @return
      */
     public List<CalcModuleVo> queryCalcModules() {
-        List<CalcModule> scriptModules = calcModuleMapper.selectList(null);
+        LambdaQueryWrapper<CalcModule> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByAsc(CalcModule::getLocalName);
+        List<CalcModule> scriptModules = calcModuleMapper.selectList(queryWrapper);
 
         return scriptModules.stream().map(CalcModuleVo::of).toList();
     }

From 2b01ac09a2f4e9aa58d0f5ea3480ffd88ce411fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 10:45:25 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/datacollect/README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/datacollect/README.md b/docs/datacollect/README.md
index 591cb3b0..5b440a43 100644
--- a/docs/datacollect/README.md
+++ b/docs/datacollect/README.md
@@ -376,13 +376,16 @@ PS: 同一节点只允许建立一条连接。
     "dataTime": 123123123123,
     //设备ID
     "deviceId": "1123451235464",
-    //是否存储历史数据
-    "isStore": true,
     "values": {
         //key为属性名
         "Ia": 123.1,
         "Ib": 122.1,
         "Ic": 123.1
+    },
+    //需要归档的数据
+    "archiveValues":{
+        "P": 1234.12,
+        "Q": 12
     }
 }
 ```
@@ -402,11 +405,13 @@ PS: 同一节点只允许建立一条连接。
     "dataTime": 123123123123,
     //设备ID
     "deviceId": "1123451235464",
-    //是否存储历史数据
-    "isStore": true,
     "values": {
         //key为属性名
         "Switch01": 1
+    },
+    //需要归档的数据
+    "archiveValues":{
+        "Fault001": 0
     }
 }
 ```

From 1eb1e39c81c1c95d7b543dbaec93d5c1a4f6e6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 10:54:10 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9offsetDate=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/calc/functions/FunctionOffsetDate.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java b/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java
index 67582de4..100ef18d 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java
@@ -30,27 +30,27 @@ public class FunctionOffsetDate extends AbstractFunction {
     public AviatorObject call(Map<String, Object> env, AviatorObject dateData, AviatorObject dimData, AviatorObject offsetData) {
         Date date = (Date) dateData.getValue(env);
         String dim = (String) dimData.getValue(env);
-        Integer offset = (Integer) offsetData.getValue(env);
+        Long offset = (Long) offsetData.getValue(env);
 
         Date result = null;
         switch (dim) {
             case "day":
-                result = DateUtil.offset(date, DateField.DAY_OF_MONTH, offset);
+                result = DateUtil.offset(date, DateField.DAY_OF_MONTH, offset.intValue());
                 break;
             case "month":
-                result = DateUtil.offset(date, DateField.MONTH, offset);
+                result = DateUtil.offset(date, DateField.MONTH, offset.intValue());
                 break;
             case "year":
-                result = DateUtil.offset(date, DateField.YEAR, offset);
+                result = DateUtil.offset(date, DateField.YEAR, offset.intValue());
                 break;
             case "hour":
-                result = DateUtil.offset(date, DateField.HOUR, offset);
+                result = DateUtil.offset(date, DateField.HOUR, offset.intValue());
                 break;
             case "minute":
-                result = DateUtil.offset(date, DateField.MINUTE, offset);
+                result = DateUtil.offset(date, DateField.MINUTE, offset.intValue());
                 break;
             case "second":
-                result = DateUtil.offset(date, DateField.SECOND, offset);
+                result = DateUtil.offset(date, DateField.SECOND, offset.intValue());
                 break;
             default:
                 log.error("不支持的维度: {}", dim);

From 8d2a8f1c9d83ed194125862633bcce389e6aede7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 10:56:13 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=A2=84=E8=A7=88=E9=A1=B5=E7=A0=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4=20=E8=AE=BE=E5=A4=87=EF=BC=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=B5=8B=E5=BD=93=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E5=8F=96=E6=B6=88=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/WindBlower/overview.vue |  2 +-
 .../equipmentManagement/measurement.vue       | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
index 3d457c46..b1c15fa9 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
@@ -21,7 +21,7 @@
                 :total="pageSetting.total"
                 :page-sizes="pageSetting.pageSizes"
                 background
-                :pager-count="7"
+                :pager-count="4"
                 layout="prev, pager, next, jumper,sizes,total"
                 @size-change="sizeChangePage"
             ></el-pagination>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index 0f31f27b..df8e6e37 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -85,25 +85,31 @@ import { reactive, ref, watch, onMounted } from 'vue'
 import { ElMessage, FormInstance, dayjs } from 'element-plus'
 import type { ModelAttributeFieldsEnums, GetModelAttributeType } from '/@/views/backend/auth/model/type'
 import { ModelAttributeType } from '/@/views/backend/auth/model/type'
-import { getModelAttributeListReq, getRealValueListReq } from '/@/api/backend/deviceModel/request'
+import { getModelAttributeListReq, getRealValueListReq, getRealValueRangeReq, queryfaultCodeDict } from '/@/api/backend/deviceModel/request'
 import * as echarts from 'echarts'
-import { getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
 import { useEnumStore } from '/@/stores/enums'
-import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request'
-import { malFunctionKeys} from '/@/views/backend/equipment/airBlower/utils'
+import { malFunctionKeys } from '/@/views/backend/equipment/airBlower/utils'
 
 const enumStore = useEnumStore()
 
 const props = withDefaults(
-    defineProps<{ iotModelId: string; deviceId: string; show: boolean; autoUpdate: boolean; attributeType: ModelAttributeType;model:string;madeinFactory:string }>(),
+    defineProps<{
+        iotModelId: string
+        deviceId: string
+        show: boolean
+        autoUpdate: boolean
+        attributeType: ModelAttributeType
+        model: string
+        madeinFactory: string
+    }>(),
     {
         iotModelId: '',
         deviceId: '',
         show: false,
         autoUpdate: false,
         attributeType: 138,
-        model:'',
-        madeinFactory:''
+        model: '',
+        madeinFactory: '',
     }
 )
 
@@ -214,7 +220,7 @@ const getMalfunctionEnums = () => {
     queryfaultCodeDict({ madeinfactory: props.madeinFactory, model: props.model }).then((res) => {
         if (res.code == 200) {
             const data: any = {}
-            res.data.forEach((item: any) => {                
+            res.data.forEach((item: any) => {
                 data[item.code] = item.description
             })
             malFunctionEnums = data
@@ -222,7 +228,6 @@ const getMalfunctionEnums = () => {
     })
 }
 
-
 const getCompleteData = () => {
     getAttributeList()
         .then(({ data, codeList }: any) => {
@@ -236,7 +241,7 @@ const getCompleteData = () => {
                 if (enumStore.keys.includes(item.attributeCode)) {
                     realValItem = enumStore.data[item.attributeCode][realValItem]
                 }
-                if(malFunctionKeys.includes(item.attributeCode)){
+                if (malFunctionKeys.includes(item.attributeCode)) {
                     realValItem = malFunctionEnums?.[realValItem] ?? realValItem
                 }
                 return {

From 72d467736fdb6fd1a5e96a89123c34ce4beb4cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 11:03:24 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9avgv=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/calc/functions/FunctionAvgValue.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
index 94b2359f..508c5f4a 100644
--- a/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
@@ -63,7 +63,7 @@ public class FunctionAvgValue extends AbstractFunction {
         if (deviceInfoCache == null) {
             return AviatorNil.NIL;
         }
-        Double value = dataService.getTimeSumValue(deviceInfoCache.getDeviceId(), attrName, startTime.getTime(), endTime.getTime());
+        Double value = dataService.getTimeAvgValue(deviceInfoCache.getDeviceId(), attrName, startTime.getTime(), endTime.getTime());
         if (value == null){
             return AviatorNil.NIL;
         }

From 41d3be9e1a2928a79da02358ff083cad4183f430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 6 Dec 2024 11:50:07 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9avgv=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/service/impl/DataServiceImpl.java    | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
index 2b9995d6..43fc2235 100644
--- a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
+++ b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
@@ -274,12 +274,13 @@ public class DataServiceImpl implements DataService {
             return null;
         }
         String tableName = "";
-        if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr)){
-            tableName = String.format("h_%s", deviceInfoCache.getDeviceId());
+        if (cacheService.getIotModelCache().isCalculate(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("c_%d_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            return tdEngineService.getTimeSumCalcValue(tableName, attr.toLowerCase(), startTime, endTime);
+        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("h%d", deviceInfoCache.getDeviceId());
         } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr)){
-            tableName = String.format("l_%s", deviceInfoCache.getDeviceId());
-        } else if (cacheService.getIotModelCache().isCalculate(deviceInfoCache.getIotModelId(), attr)){
-            tableName = String.format("c_%s", deviceInfoCache.getDeviceId());
+            tableName = String.format("l%d", deviceInfoCache.getDeviceId());
         }
         return tdEngineService.getTimeTopValue(tableName, attr, startTime, endTime);
     }
@@ -292,14 +293,14 @@ public class DataServiceImpl implements DataService {
         }
         String tableName = "";
         if (cacheService.getIotModelCache().isCalculate(deviceInfoCache.getIotModelId(), attr)){
-            tableName = String.format("c_%s_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
-            return tdEngineService.getTimeSumCalcValue(tableName, attr, startTime, endTime);
-        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
-            tableName = String.format("h_%s", deviceInfoCache.getDeviceId());
-        } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
-            tableName = String.format("l_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            tableName = String.format("c_%d_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            return tdEngineService.getTimeSumCalcValue(tableName, attr.toLowerCase(), startTime, endTime);
+        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("h%d", deviceInfoCache.getDeviceId());
+        } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("l%d", deviceInfoCache.getDeviceId());
         }
-        return tdEngineService.getTimeSumValue(tableName, attr, startTime, endTime);
+        return tdEngineService.getTimeSumValue(tableName, attr.toLowerCase(), startTime, endTime);
     }
 
     @Override
@@ -310,13 +311,13 @@ public class DataServiceImpl implements DataService {
         }
         String tableName = "";
         if (cacheService.getIotModelCache().isCalculate(deviceInfoCache.getIotModelId(), attr)){
-            tableName = String.format("c_%s_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
-            return tdEngineService.getTimeAvgCalcValue(tableName, attr, startTime, endTime);
-        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
-            tableName = String.format("h_%s", deviceInfoCache.getDeviceId());
-        } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
-            tableName = String.format("l_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            tableName = String.format("c_%d_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            return tdEngineService.getTimeAvgCalcValue(tableName, attr.toLowerCase(), startTime, endTime);
+        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("h%d", deviceInfoCache.getDeviceId());
+        } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("l%d", deviceInfoCache.getDeviceId());
         }
-        return tdEngineService.getTimeAvgValue(tableName, attr, startTime, endTime);
+        return tdEngineService.getTimeAvgValue(tableName, attr.toLowerCase(), startTime, endTime);
     }
 }

From 4dce76070f57af17b4573210cd74eb783080c706 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 6 Dec 2024 14:02:38 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/service/impl/NodeMessageServiceImpl.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index 1ad634f1..01dcd83c 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -240,6 +240,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
         JsonNode jsonNode = data.getData();
         String deviceId = jsonNode.get("deviceId").asText();
         JsonNode values = jsonNode.get("values");
+        JsonNode archiveValues = jsonNode.get("archiveValues");
         Long dataTime = jsonNode.get("dataTime").asLong();
         Map<String, Object> keyValueMap = new HashMap<>();
         String modelCode = dataService.deviceModelMap.get(deviceId);
@@ -254,18 +255,19 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
             String fieldName = keysHigh.next();
             String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
             keyValueMap.put(key, values.get(fieldName));
-            if(fieldName.toLowerCase().equals("iwindspeed")){
-                log.info("风速更新redis数据key：{}，value：{}",key,values.get(fieldName));
-            }
+        }
+        adminRedisTemplate.mSet(keyValueMap);
+        Iterator<String> archiveKeys = archiveValues.fieldNames();
+        while (archiveKeys.hasNext()) {
+            String fieldName = keysHigh.next();
+            String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
+            keyValueMap.put(key, values.get(fieldName));
             if (highKey.contains(fieldName)){
                 highSpeedValueMap.put(fieldName,values.get(fieldName));
             }
             if (lowKey.contains(fieldName)){
                 lowSpeedValueMap.put(fieldName,values.get(fieldName));
             }
-        }
-        adminRedisTemplate.mSet(keyValueMap);
-        if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) {
             //更新td
             if (!highSpeedValueMap.isEmpty()){
                 List<RTData> highSpeedData = new ArrayList<>();

From d8de6271991f6ded89c54b358cf1a96e442e98cc Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 6 Dec 2024 16:11:38 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/node/service/impl/NodeMessageServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index 01dcd83c..290e977e 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -256,7 +256,9 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
             String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
             keyValueMap.put(key, values.get(fieldName));
         }
-        adminRedisTemplate.mSet(keyValueMap);
+        if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) {
+            archiveValues = values;
+        }
         Iterator<String> archiveKeys = archiveValues.fieldNames();
         while (archiveKeys.hasNext()) {
             String fieldName = keysHigh.next();
@@ -283,6 +285,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
                 tdEngineService.updateYCLowValues(lowSpeedData,modelCode);
             }
         }
+        adminRedisTemplate.mSet(keyValueMap);
     }
 
     @Override

From 6bfe1d92825116fe85db305ef58883b7c782aeae Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 6 Dec 2024 16:42:29 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/modules/node/service/impl/NodeMessageServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index 290e977e..a7cb163f 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -261,7 +261,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
         }
         Iterator<String> archiveKeys = archiveValues.fieldNames();
         while (archiveKeys.hasNext()) {
-            String fieldName = keysHigh.next();
+            String fieldName = archiveKeys.next();
             String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
             keyValueMap.put(key, values.get(fieldName));
             if (highKey.contains(fieldName)){

From edc2e6f69b3c28cccbc88495f18870fc5ddef707 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 6 Dec 2024 16:47:17 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/service/impl/NodeMessageServiceImpl.java  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index a7cb163f..1c458a88 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -240,7 +240,6 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
         JsonNode jsonNode = data.getData();
         String deviceId = jsonNode.get("deviceId").asText();
         JsonNode values = jsonNode.get("values");
-        JsonNode archiveValues = jsonNode.get("archiveValues");
         Long dataTime = jsonNode.get("dataTime").asLong();
         Map<String, Object> keyValueMap = new HashMap<>();
         String modelCode = dataService.deviceModelMap.get(deviceId);
@@ -255,21 +254,15 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
             String fieldName = keysHigh.next();
             String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
             keyValueMap.put(key, values.get(fieldName));
-        }
-        if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) {
-            archiveValues = values;
-        }
-        Iterator<String> archiveKeys = archiveValues.fieldNames();
-        while (archiveKeys.hasNext()) {
-            String fieldName = archiveKeys.next();
-            String key = String.format("RT:%s:%s", deviceId, fieldName.toLowerCase());
-            keyValueMap.put(key, values.get(fieldName));
             if (highKey.contains(fieldName)){
                 highSpeedValueMap.put(fieldName,values.get(fieldName));
             }
             if (lowKey.contains(fieldName)){
                 lowSpeedValueMap.put(fieldName,values.get(fieldName));
             }
+        }
+        adminRedisTemplate.mSet(keyValueMap);
+        if (jsonNode.get("isStore") != null && jsonNode.get("isStore").asBoolean()) {
             //更新td
             if (!highSpeedValueMap.isEmpty()){
                 List<RTData> highSpeedData = new ArrayList<>();
@@ -285,7 +278,6 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
                 tdEngineService.updateYCLowValues(lowSpeedData,modelCode);
             }
         }
-        adminRedisTemplate.mSet(keyValueMap);
     }
 
     @Override

From 0eb1ebe35a01f002b985c5fbdc8f5ddf0a2e8d3b Mon Sep 17 00:00:00 2001
From: geting <13585118195@163.com>
Date: Fri, 6 Dec 2024 17:07:42 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=8A=9F=E7=8E=87=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statAnalysis/powerCurveAnalysis.vue       | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
index 79da17a2..5bb94d49 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
@@ -22,17 +22,22 @@
                         <el-date-picker
                             class="datetime-picker"
                             v-model="statAnalysisTime"
-                            :type="statAnalysisInterval == '1d' ? 'daterange' : 'datetimerange'"
-                            :value-format="statAnalysisInterval == '1d' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'"
+                            type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss"
                             :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
                             :teleported="false"
                             :shortcuts="shortcuts"
                         />
                     </div>
                     <div class="selectPart">
-                        <span>{{ t('statAnalysis.interval') }}</span>
-                        <el-select v-model="statAnalysisInterval" :placeholder="'请选择' + t('statAnalysis.interval')" class="statAnalysisSelect">
-                            <el-option v-for="v in statAnalysisSelectOptions.interval" :key="v.value" :label="v.label" :value="v.value"></el-option>
+                        <span>风速来源</span>
+                        <el-select v-model="statAnalysisSpeedSource" placeholder="请选择风速来源" class="statAnalysisSelect">
+                            <el-option
+                                v-for="v in statAnalysisSelectOptions.speedSource"
+                                :key="v.value"
+                                :label="v.label"
+                                :value="v.value"
+                            ></el-option>
                         </el-select>
                     </div>
                     <div class="selectPart">
@@ -73,17 +78,12 @@ const { t } = useI18n()
 
 const statAnalysisFatory = ref('')
 const statAnalysisFatoryList: any = ref([])
-const statAnalysisInterval = ref('1h')
+const statAnalysisSpeedSource = ref('AvgWindSpeed_10min')
 const statAnalysisDeviceId = ref('')
 const statAnalysisSelectOptions: any = reactive({
-    interval: [
-        { label: '一分钟', value: '1m' },
-        { label: '五分钟', value: '5m' },
-        { label: '十分钟', value: '10m' },
-        { label: '十五分钟', value: '15m' },
-        { label: '一小时', value: '1h' },
-        { label: '一天', value: '1d' },
-        { label: '原始', value: 'NONE' },
+    speedSource: [
+        { label: '原始风速', value: 'AvgWindSpeed_10min' },
+        { label: '处理后风速', value: 'AvgWindSpeedCal_10min' },
     ],
     deviceId: [],
 })
@@ -278,10 +278,9 @@ const statAnalysisOperate = () => {
         devices: [
             {
                 deviceId: deviceId,
-                attributes: ['iGenPower', 'iWindSpeed'],
+                attributes: [statAnalysisSpeedSource.value, 'AvgActivePower_10min'],
             },
         ],
-        interval: statAnalysisInterval.value || '5m',
         startTime: new Date(statAnalysisTime.value[0]).getTime(),
         endTime: new Date(statAnalysisTime.value[1]).getTime(),
     }
@@ -323,8 +322,8 @@ const statAnalysisOperate = () => {
             const resData0 = results[1][statAnalysisDeviceId.value.split(':')[2]]
             const resData1 = results[0]
             if (resData0) {
-                const iGenPower = resData0['iGenPower']['values']
-                const iWindSpeed = resData0['iWindSpeed']['values']
+                const iGenPower = resData0['AvgActivePower_10min']['values']
+                const iWindSpeed = resData0[statAnalysisSpeedSource.value]['values']
                 if (!iWindSpeed.length) {
                     ElMessage.info(`实时值数据为空`)
                 } else {
@@ -336,7 +335,7 @@ const statAnalysisOperate = () => {
                     })
 
                     const series = {
-                        type: 'line',
+                        type: 'scatter',
                         data: seriesData,
                         name: '实际值',
                         smooth: true,
@@ -356,6 +355,8 @@ const statAnalysisOperate = () => {
                     name: '理论值',
                     smooth: true,
                     animation: false,
+                    symbolSize: 0.1,
+                    symbol: 'circle',
                 }
                 option.series.push(series)
                 option.legend.data.push('理论值')
@@ -374,16 +375,14 @@ const statAnalysisExport = () => {
         devices: [
             {
                 deviceId: statAnalysisDeviceId.value.split(':')[2],
-                attributes: ['iGenPower', 'iWindSpeed'],
+                attributes: [statAnalysisSpeedSource.value, 'AvgActivePower_10min'],
             },
         ],
-        interval: statAnalysisInterval.value || '5m',
         startTime: new Date(statAnalysisTime.value[0]).getTime(),
         endTime: new Date(statAnalysisTime.value[1]).getTime(),
         madeinfactory: params.split(':')[0],
         model: params.split(':')[1],
     }
-    console.log(requestData)
     powerCurveExport(requestData).then((res: any) => {
         const downloadUrl = window.URL.createObjectURL(res)
         const a = document.createElement('a')

From 17c50ddba229ec98c0cf6d977f1389eef01a685d Mon Sep 17 00:00:00 2001
From: geting <13585118195@163.com>
Date: Fri, 6 Dec 2024 17:17:50 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=8A=9F=E7=8E=87=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
index 10b31131..cdb626da 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
@@ -399,9 +399,6 @@ const getTimeIntervals = (startTimestamp: number, endTimestamp: number) => {
         case '15m':
             count = Math.floor((endDate - startDate) / (15 * 60 * 1000))
             break
-        case '15m':
-            count = Math.floor((endDate - startDate) / (15 * 60 * 1000))
-            break
         case '1h':
             count = Math.floor((endDate - startDate) / (1 * 60 * 60 * 1000))
             break

From bd87a86addb08d389d9f14153311d215c626b126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 17:19:36 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=9A=E9=87=8F?=
 =?UTF-8?q?=E6=B5=8B=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/api/backend/deviceModel/request.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ui/dasadmin/src/api/backend/deviceModel/request.ts b/ui/dasadmin/src/api/backend/deviceModel/request.ts
index 2f8b7bb8..207c1993 100644
--- a/ui/dasadmin/src/api/backend/deviceModel/request.ts
+++ b/ui/dasadmin/src/api/backend/deviceModel/request.ts
@@ -168,3 +168,14 @@ export const getRealValueRangeReq = (data: { startTime: number, endTime: number,
         timeout: 60 * 1000
     })
 }
+
+export function queryfaultCodeDict(params: object = {}) {
+    return createAxios({
+        url: '/api/fdr/faultCodeDict/query',
+        method: 'POST',
+        data: params,
+    },
+        {
+            showErrorMessage: false
+        })
+}
\ No newline at end of file

From dcc1dbac782177427da92765a1498d0e3dc58b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 17:32:11 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=83=BD?=
 =?UTF-8?q?=E9=87=8F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/assets/energyManage/AGC.png   |  Bin 0 -> 2239 bytes
 ui/dasadmin/src/assets/energyManage/AVC.png   |  Bin 0 -> 2239 bytes
 .../src/assets/energyManage/defaultSave.png   |  Bin 0 -> 480 bytes
 .../src/assets/energyManage/noPower.png       |  Bin 0 -> 2072 bytes
 ui/dasadmin/src/assets/energyManage/power.png |  Bin 0 -> 2072 bytes
 .../src/views/backend/energyManage/index.vue  | 1072 +++++++++++++++++
 6 files changed, 1072 insertions(+)
 create mode 100644 ui/dasadmin/src/assets/energyManage/AGC.png
 create mode 100644 ui/dasadmin/src/assets/energyManage/AVC.png
 create mode 100644 ui/dasadmin/src/assets/energyManage/defaultSave.png
 create mode 100644 ui/dasadmin/src/assets/energyManage/noPower.png
 create mode 100644 ui/dasadmin/src/assets/energyManage/power.png
 create mode 100644 ui/dasadmin/src/views/backend/energyManage/index.vue

diff --git a/ui/dasadmin/src/assets/energyManage/AGC.png b/ui/dasadmin/src/assets/energyManage/AGC.png
new file mode 100644
index 0000000000000000000000000000000000000000..15ee6852dba4862aa0a3acd0ef2ce1d269efdb5c
GIT binary patch
literal 2239
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
N002ovPDHLkV1j(z6IuWO

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/assets/energyManage/AVC.png b/ui/dasadmin/src/assets/energyManage/AVC.png
new file mode 100644
index 0000000000000000000000000000000000000000..15ee6852dba4862aa0a3acd0ef2ce1d269efdb5c
GIT binary patch
literal 2239
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
N002ovPDHLkV1j(z6IuWO

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/assets/energyManage/defaultSave.png b/ui/dasadmin/src/assets/energyManage/defaultSave.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e4f5630b033d26a6ee0487dc7a47e2fd448b0cc
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#j=H=<)7-AuK
zG-#t2v!lS=&UDSNrg#Bv<s(j)Z%R0I>|Kx`Ds6xK*r^aP#@}-kG@VX~%u*6$dCQu+
zMQG3Nk7svoj!gEMom=+)?4IrK)8sEM68D!D5X?J%Sk2hHbxF%EgO3swuU7=-F;1WG
z+55pR;|TwZpItLnB~G^IE>-?zWodJx)^JS%``${unLmUNMc-Py_t<Bqtl#%%ci!u`
z+{JNqtNQy=t~iF);NZEp9M655?DXY~&-19uKO@e&G-O<EOn%d8U0pOK&2WS5QNx(m
zO9LF1|E{}pLoe|{>7OT)@5)RHRft)5fSGIc+aLcPCF{Pn=Q|~xRV@}d|Eh}`lhbsr
zL&t8OdL6WWM{#)fq%Uj%dAB(#`Hd3q|Feu~$a}u$2tRwI!-6a^jrR_Wyqr2EzJJfZ
zYf4F3Tg`s$&72IiFOi=!AJ2C`knVP~qWkuK#*2B)y&1Dlii1Me)78&qol`;+0N=;C
AEC2ui

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/assets/energyManage/noPower.png b/ui/dasadmin/src/assets/energyManage/noPower.png
new file mode 100644
index 0000000000000000000000000000000000000000..29078a064e848ba0cd0c506427b1b9932db4c008
GIT binary patch
literal 2072
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
C1lJP)

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/assets/energyManage/power.png b/ui/dasadmin/src/assets/energyManage/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..29078a064e848ba0cd0c506427b1b9932db4c008
GIT binary patch
literal 2072
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
C1lJP)

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/views/backend/energyManage/index.vue b/ui/dasadmin/src/views/backend/energyManage/index.vue
new file mode 100644
index 00000000..b5d36d1e
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/energyManage/index.vue
@@ -0,0 +1,1072 @@
+<template>
+    <div class="energyManage">
+        <el-row :gutter="20">
+            <el-col :md="24" :lg="{ span: 14, push: 5 }">
+                <div class="centerContainer">
+                    <div class="airBlowerList">
+                        <div class="title">风机列表</div>
+                        <el-table class="table" :data="tableData">
+                            <el-table-column v-for="item in tableColumn" :key="item.prop" :prop="item.prop" :label="item.label" align="center">
+                                <template #default="scope">
+                                    <div v-if="item.prop === 'iturbineoperationmode'">
+                                        <el-tag v-if="scope.row.locked === 1" color="rgba(254,55,49,0.20)" style="color: #fe3731">已锁定</el-tag>
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 20" color="rgba(0,100,170,0.20)" style="color: #0064aa"
+                                            >并网</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 10" color="rgba(0,160,150,0.20)" style="color: #00a096"
+                                            >维护</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 8" color="rgba(255,126,0,0.20)" style="color: #ff7e00"
+                                            >限功率运行</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 0" color="rgba(153,153,153,0.20)" style="color: #666666"
+                                            >离线</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 16" color="rgba(6,180,41,0.20)" style="color: #06b429"
+                                            >启动</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 6" color="rgba(254,55,49,0.20)" style="color: #fe3731"
+                                            >正常停机</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 1" color="rgba(254,55,49,0.20)" style="color: #fe3731"
+                                            >外部因素导致停机</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 2" color="rgba(254,55,49,0.20)" style="color: #fe3731"
+                                            >停机</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 11" color="rgba(255,182,0,0.20)" style="color: #ffb600"
+                                            >待机</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 1110" color="rgba(153,153,153,0.20)" style="color: #666666"
+                                            >解缆状态</el-tag
+                                        >
+                                        <el-tag v-if="scope.row.iturbineoperationmode === 1111" color="rgba(254,55,49,0.20)" style="color: #fe3731"
+                                            >电网故障停机</el-tag
+                                        >
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="chartPart">
+                        <div class="title">
+                            <span> 自动更新 </span>
+                            <el-switch v-model="autoUpdateChartSwitch" @change="changeUpdateChart"></el-switch>
+                        </div>
+                        <div class="lineChart">
+                            <div class="chart" ref="chartRef"></div>
+                        </div>
+                        <div class="info">
+                            <div class="infoItem" v-for="item in infoList" :key="item.label">
+                                <div class="label">{{ item.label }}</div>
+                                <div class="val">{{ item.value }}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :md="12" :lg="{ span: 5, pull: 14 }">
+                <div class="leftContainer">
+                    <div class="overview">
+                        <div class="title">AGC总览</div>
+                        <div class="content">
+                            <div class="rect">
+                                <div class="left">
+                                    <div class="img img1"></div>
+                                    <div class="imgName">全场有功</div>
+                                </div>
+                                <div class="right">
+                                    <div class="num">33</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="rect">
+                                <div class="left">
+                                    <div class="img img2"></div>
+                                    <div class="imgName">AGC目标值</div>
+                                </div>
+                                <div class="right">
+                                    <div class="num">6</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">
+                                    <div class="name">AGC投入/退出</div>
+                                    <div class="status">
+                                        <div class="smallDot" :class="agcOnOff ? 'successColor' : 'defaultColor'"></div>
+                                        <div class="smallDot" :class="agcOnOff ? 'defaultColor' : 'errorColor'"></div>
+                                    </div>
+                                </div>
+                                <div class="right">
+                                    <el-switch v-model="agcOnoffSwitch"></el-switch>
+                                </div>
+                            </div>
+                            <div class="checkInput">
+                                <div class="top">
+                                    <div class="left">AGC远程/就地</div>
+                                    <div class="right">
+                                        <el-switch v-model="agcLocalRemoteSwitch"></el-switch>
+                                    </div>
+                                </div>
+                                <div class="bottom">
+                                    <el-input placeholder="本地目标值设置MW        请输入">
+                                        <template #suffix>
+                                            <div class="saveBtn"></div>
+                                        </template>
+                                    </el-input>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AGC增闭锁</div>
+                                <div class="right">
+                                    <div class="dot" :class="agcAdd ? 'successColor' : 'errorColor'"></div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AGC减闭锁</div>
+                                <div class="right">
+                                    <div class="dot" :class="agcSub ? 'successColor' : 'errorColor'"></div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AGC可增有功</div>
+                                <div class="right">
+                                    <div class="num">5</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AGC可减有功</div>
+                                <div class="right">
+                                    <div class="num">5</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="record">
+                        <div class="title">AGC记录</div>
+                        <div class="recordList">
+                            <el-scrollbar>
+                                <div class="recordItem" v-for="item in agcRecordList" :key="item">{{ item }}</div>
+                            </el-scrollbar>
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :md="12" :lg="5">
+                <div class="rightContainer">
+                    <div class="overview">
+                        <div class="title">AVC总览</div>
+                        <div class="content">
+                            <div class="rect">
+                                <div class="left">
+                                    <div class="img img1"></div>
+                                    <div class="imgName">全场无功</div>
+                                </div>
+                                <div class="right">
+                                    <div class="num">33</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="rect">
+                                <div class="left">
+                                    <div class="img img2"></div>
+                                    <div class="imgName">AVC目标值</div>
+                                </div>
+                                <div class="right">
+                                    <div class="num">6</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">
+                                    <div class="name">AVC投入/退出</div>
+                                    <div class="status">
+                                        <div class="smallDot" :class="avcOnOff ? 'successColor' : 'defaultColor'"></div>
+                                        <div class="smallDot" :class="avcOnOff ? 'defaultColor' : 'errorColor'"></div>
+                                    </div>
+                                </div>
+                                <div class="right">
+                                    <el-switch v-model="avcOnoffSwitch"></el-switch>
+                                </div>
+                            </div>
+                            <div class="checkInput">
+                                <div class="top">
+                                    <div class="left">AVC远程/就地</div>
+                                    <div class="right">
+                                        <el-switch v-model="avcLocalRemoteSwitch"></el-switch>
+                                    </div>
+                                </div>
+                                <div class="bottom">
+                                    <el-input placeholder="本地目标值设置MW        请输入">
+                                        <template #suffix>
+                                            <div class="saveBtn"></div>
+                                        </template>
+                                    </el-input>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AVC增闭锁</div>
+                                <div class="right">
+                                    <div class="dot" :class="avcAdd ? 'successColor' : 'errorColor'"></div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AVC减闭锁</div>
+                                <div class="right">
+                                    <div class="dot" :class="avcSub ? 'successColor' : 'errorColor'"></div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AVC可增有功</div>
+                                <div class="right">
+                                    <div class="num">5</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                            <div class="check">
+                                <div class="left">AVC可减有功</div>
+                                <div class="right">
+                                    <div class="num">5</div>
+                                    <div class="unit">MW</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="record">
+                        <div class="title">AVC记录</div>
+                        <div class="recordList">
+                            <el-scrollbar>
+                                <div class="recordItem" v-for="item in avcRecordList" :key="item">{{ item }}</div>
+                            </el-scrollbar>
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, nextTick } from 'vue'
+import { getAirBlowerListReq } from '/@/api/backend/airBlower/request'
+import { getRealValueListReq, getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
+import { getRealTimeState, getCutDecimalsValue, getEnumToValue } from '/@/views/backend/equipment/airBlower/utils'
+import { ElMessage, dayjs } from 'element-plus'
+import * as echarts from 'echarts'
+
+const agcOnoffSwitch = ref(true)
+const agcOnOff = ref(true)
+const agcLocalRemoteSwitch = ref(false)
+const agcAdd = ref(true)
+const agcSub = ref(false)
+const agcRecordList = ref([
+    '2023-12-26 22:07:25一次调频指令变更为：156212kW',
+    '2023-12-25 22:07:25进入一次调频模式',
+    '2023-12-24 22:07:25进入一次调频模式',
+    '2023-12-23 22:07:25进入一次调频模式',
+    '2023-12-22 22:07:25一次调频指令变更为：156212kW',
+])
+
+const avcOnoffSwitch = ref(true)
+const avcOnOff = ref(false)
+const avcLocalRemoteSwitch = ref(false)
+const avcAdd = ref(true)
+const avcSub = ref(false)
+const avcRecordList = ref([
+    '2023-12-26 22:07:25一次调频指令变更为：156212kW',
+    '2023-12-25 22:07:25进入一次调频模式',
+    '2023-12-24 22:07:25进入一次调频模式',
+    '2023-12-23 22:07:25进入一次调频模式',
+    '2023-12-22 22:07:25一次调频指令变更为：156212kW',
+])
+
+const tableColumn = [
+    {
+        label: '编号',
+        prop: 'name',
+    },
+    {
+        label: '风速m/s',
+        prop: 'iwindspeed',
+    },
+    {
+        label: '转速rmp',
+        prop: 'igenspeed',
+    },
+    {
+        label: '有功kW',
+        prop: 'igenpower',
+    },
+    {
+        label: '有功给定kW',
+        prop: 'iactivepowersetpointvalue',
+    },
+    {
+        label: '无功kVar',
+        prop: 'ireactivepower',
+    },
+    {
+        label: '无功给定kVar',
+        prop: 'ireactivepowersetpointvalue',
+    },
+    {
+        label: '状态',
+        prop: 'iturbineoperationmode',
+    },
+]
+
+const curDevice = ref('1846101273013739522')
+const tableData = ref<any[]>([])
+
+const createTableReqParams = (airblowerList: { irn: string; name: string }[]) => {
+    const curTableKey = tableColumn.map((item) => item.prop)
+    const airBlowerIds: any = []
+    const airBlowerInfo: any = {}
+    const params = airblowerList.map((item: any) => {
+        airBlowerInfo[item.irn] = {
+            name: item.name,
+            model: item.model,
+            belongLine: item.belongLine,
+            modelId: item.modelId,
+            deviceCode: item.deviceCode,
+        }
+        airBlowerIds.push(item.irn)
+        return {
+            deviceId: item.irn,
+            attributes: [...curTableKey, 'iturbineoperationmode', 'iyplevel', 'gridlostdetected', 'ibplevel'],
+        }
+    })
+    return { params, airBlowerInfo, airBlowerIds }
+}
+
+const getAirBlowerList = () => {
+    let airBlowerInfoObj: any = {}
+    let airBlowerIdList: any[] = []
+    getAirBlowerListReq()
+        .then((res) => {
+            if (res.success) {
+                return createTableReqParams(res.data)
+            } else {
+                throw '获取风机列表失败'
+            }
+        })
+        .then((data) => {
+            airBlowerInfoObj = data.airBlowerInfo
+            airBlowerIdList = data.airBlowerIds
+            return getRealValueListReq(data!.params)
+        })
+        .then((res) => {
+            if (res.success) {
+                const data = airBlowerIdList.map((id) => {
+                    const realData: any = {}
+                    Object.keys(res.data[id]).forEach((key) => {
+                        const cutVal = getCutDecimalsValue(res.data[id][key])
+                        realData[key] = getEnumToValue(key, cutVal)
+                    })
+                    const state = getRealTimeState(res.data[id])
+                    return {
+                        irn: id,
+                        name: airBlowerInfoObj[id].name,
+                        model: airBlowerInfoObj[id].model,
+                        iotModelId: airBlowerInfoObj[id].modelId,
+                        belongLine: airBlowerInfoObj[id].belongLine,
+                        deviceCode: airBlowerInfoObj[id].deviceCode,
+                        ...realData,
+                        iturbineoperationmode: state,
+                    }
+                })
+                tableData.value = data
+            } else {
+                throw '获取风机列表失败'
+            }
+        })
+        .catch((err) => {
+            ElMessage.error(err)
+        })
+}
+let timer: any = null
+const autoUpdateAirBlower = () => {
+    if (!timer) {
+        timer = setInterval(() => {
+            getAirBlowerList()
+        }, 2000)
+    }
+}
+
+const autoUpdateChartSwitch = ref(false)
+const changeUpdateChart = (val: boolean) => {
+    if (val) {
+        autoUpdateChart()
+    } else {
+        clearInterval(autoUpdateChartTimer)
+        autoUpdateChartTimer = null
+    }
+}
+
+const chartRef = ref()
+let chartInstance: any = null
+
+let realDataXAxis: any[] = [
+    '2024-12-06 16:53:37',
+    '2024-12-06 16:53:38',
+    '2024-12-06 16:53:39',
+    '2024-12-06 16:53:40',
+    '2024-12-06 16:53:41',
+    '2024-12-06 16:53:42',
+    '2024-12-06 16:53:43',
+    '2024-12-06 16:53:44',
+    '2024-12-06 16:53:45',
+    '2024-12-06 16:53:46',
+    '2024-12-06 16:53:47',
+    '2024-12-06 16:53:48',
+]
+let realDataSeries: any[] = [
+    {
+        id: 'iwindspeed',
+        name: '风速',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#096676',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [24.68, 24.68, 25.3, 24.09, 24.51, 24.51, 24.46, 23.87, 23.97, 23.87, 23.87, 24.61],
+    },
+    {
+        id: 'ireactivepowersetpointvalue',
+        name: '给定无功功率',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#8236aa',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    },
+    {
+        id: 'ireactivepower',
+        name: '无功功率',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#687068',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6, 50.6],
+    },
+    {
+        id: 'iactivepowersetpointvalue',
+        name: '给定有功功率',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#164342',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    },
+    {
+        id: 'igenpower',
+        name: '有功功率',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#532457',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [1518.9, 1518.9, 1518.8, 1518.7, 1518.7, 1518.7, 1518.7, 1518.8, 1518.59, 1518.59, 1518.59, 1518.59],
+    },
+    {
+        id: 'igenspeed',
+        name: '转速',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#945810',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [1808.3, 1808.3, 1808.3, 1808.3, 1808.3, 1808.3, 1808.2, 1808.2, 1808.2, 1808, 1808, 1807.8],
+    },
+    {
+        id: 'iwinddirection',
+        name: '风向',
+        type: 'line',
+        barWidth: 20,
+        itemStyle: {
+            color: '#195658',
+            barBorderRadius: 2,
+        },
+        smooth: true,
+        symbol: 'none',
+        data: [0.8, 0.8, 6.9, -6.1, 0.6, 0.6, -0.5, -6.6, -5.41, -4.21, -4.21, 2.5],
+    },
+]
+const getRandomDarkColor = () => {
+    let r = Math.floor(Math.random() * 200) // 限制在0到127之间，以生成较深的颜色
+    let g = Math.floor(Math.random() * 200)
+    let b = Math.floor(Math.random() * 200)
+
+    let color = `#${r.toString(16).padStart(2, '0')}${g.toString(16).padStart(2, '0')}${b.toString(16).padStart(2, '0')}`
+    return color
+}
+
+const createChartData = (data: { [k: string]: number }, time: string) => {
+    if (realDataXAxis.length > 300) {
+        realDataXAxis.shift()
+        realDataSeries.forEach((item: any) => {
+            item.data.shift()
+        })
+    }
+    const attrCode = Object.keys(data)
+    realDataXAxis.push(time)
+
+    const seriesData = attrCode.map((item) => {
+        const curVal = getCutDecimalsValue(data[item], 2)
+
+        if (realDataSeries.length) {
+            const seriesItem = realDataSeries.find((series) => series.id === item)
+            console.log(seriesItem, '------------------')
+            seriesItem.data.push(curVal)
+            return seriesItem
+        } else {
+            const color = getRandomDarkColor()
+            return {
+                id: item,
+                name: chartProps[item],
+                type: 'line',
+                barWidth: 20,
+                itemStyle: {
+                    color: color,
+                    barBorderRadius: 2,
+                },
+                smooth: true,
+                symbol: 'none',
+                data: [curVal],
+            }
+        }
+    })
+    realDataSeries = seriesData
+    createChart()
+}
+const createChart = () => {
+    const chart = chartInstance ?? echarts.init(chartRef.value)
+    let option = null
+    if (chartInstance && realDataXAxis.length > 1) {
+        option = {
+            xAxis: {
+                data: realDataXAxis,
+            },
+            series: realDataSeries,
+        }
+    } else {
+        const legendData = Object.values(chartProps).map((item) => {
+            return {
+                name: item,
+            }
+        })
+        option = {
+            grid: {
+                top: 50,
+                right: 23,
+                bottom: 50,
+                left: 18,
+                containLabel: true,
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow',
+                },
+            },
+            xAxis: {
+                type: 'category',
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: '#dadada',
+                        width: 1,
+                        type: 'solid',
+                    },
+                },
+                axisLabel: {
+                    //x轴文字的配置
+                    show: true,
+                    color: '#4E5969',
+                    interval: 'auto',
+                    formatter: function (value: any) {
+                        return value.slice(11)
+                    },
+                    //rotate: 45
+                },
+                splitLine: {
+                    //分割线配置
+                    show: false,
+                    lineStyle: {
+                        color: '#999999',
+                    },
+                },
+                data: realDataXAxis,
+            },
+            yAxis: [
+                {
+                    type: 'value',
+                    name: '',
+                    nameTextStyle: {
+                        color: '#4E5969',
+                    },
+                    axisLine: {
+                        show: false,
+                        lineStyle: {
+                            color: '#dadada',
+                            width: 0,
+                            type: 'solid',
+                        },
+                    },
+                    axisLabel: {
+                        //x轴文字的配置
+                        show: true,
+                        color: '#4E5969',
+                    },
+                    axisTick: { show: false },
+                    splitLine: {
+                        interval: 50,
+                        lineStyle: {
+                            type: 'dashed',
+                            color: '#dadada',
+                        },
+                    },
+                },
+            ],
+            dataZoom: [
+                {
+                    type: 'inside',
+                    start: 0,
+                    end: 100,
+                },
+                {
+                    start: 0,
+                    end: 100,
+                },
+            ],
+            legend: {
+                data: legendData,
+                textStyle: {
+                    color: '#73767a',
+                },
+                icon: 'roundRect',
+            },
+            series: realDataSeries,
+        }
+    }
+    chart.setOption(option, { replaceMerge: 'series' })
+    chartInstance = chart
+}
+
+const chartProps: any = {
+    iwindspeed: '风速',
+    iwinddirection: '风向',
+    igenspeed: '转速',
+    igenpower: '有功功率',
+    iactivepowersetpointvalue: '给定有功功率',
+    ireactivepower: '无功功率',
+    ireactivepowersetpointvalue: '给定无功功率',
+}
+const getRangeValueList = () => {
+    const params = {
+        startTime: dayjs().startOf('day').valueOf(),
+        endTime: dayjs().valueOf(),
+        devices: [
+            {
+                deviceId: tableData.value[1].irn,
+                attributes: Object.keys(chartProps),
+            },
+        ],
+        interval: '1m',
+    }
+    getRealValueRangeReq(params).then((res) => {
+        if (res.data) {
+        }
+    })
+}
+const getRealData = () => {
+    const params = [
+        {
+            deviceId: tableData.value[0].irn,
+            attributes: Object.keys(chartProps),
+        },
+    ]
+    getRealValueListReq(params).then((res) => {
+        if (res.data) {
+            const time = dayjs().format('YYYY-MM-DD HH:mm:ss')
+            createChartData(res.data?.[tableData.value[0].irn], time)
+        }
+    })
+}
+
+let autoUpdateChartTimer: any = null
+
+const autoUpdateChart = () => {
+    if (!autoUpdateChartTimer) {
+        autoUpdateChartTimer = setInterval(() => {
+            getRealData()
+        }, 1000)
+    }
+}
+
+const infoList = ref([
+    {
+        label: '风机总功率kW',
+        value: 157646,
+    },
+    {
+        label: '当前有功指令kW',
+        value: 156212,
+    },
+    {
+        label: '电网有功指令kW',
+        value: 120000,
+    },
+    {
+        label: '调频有功指令kW',
+        value: 156212,
+    },
+    {
+        label: '电网电压kV',
+        value: 200,
+    },
+    {
+        label: '风机总无功kVar',
+        value: 1596.4,
+    },
+    {
+        label: '当前无功指令kW',
+        value: 0.0,
+    },
+    {
+        label: '线路损耗功率kW',
+        value: 3259,
+    },
+    {
+        label: '电网出口功率kW',
+        value: 156679,
+    },
+    {
+        label: '电网频率Hz',
+        value: 0.0,
+    },
+])
+
+const containerHeight = ref('900px')
+const getContainerHeight = () => {
+    const container = document.querySelector('.leftContainer')
+    if (container) {
+        const { height } = container.getBoundingClientRect()
+        containerHeight.value = `${height}px`
+    }
+}
+onMounted(() => {
+    getContainerHeight()
+    autoUpdateAirBlower()
+    nextTick(() => {
+        createChart()
+    })
+    window.addEventListener('resize', getContainerHeight)
+})
+onUnmounted(() => {
+    window.removeEventListener('resize', getContainerHeight)
+    timer && clearInterval(timer)
+})
+</script>
+
+<style lang="scss" scoped>
+@mixin defaultBoxStyle {
+    display: flex;
+    align-self: center;
+    justify-content: space-between;
+    padding: 0 10px;
+    width: 100%;
+}
+@mixin borderstyle {
+    border-radius: 10px;
+    border: 1px solid #e1edf6;
+}
+@mixin overViewRight {
+    .right {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        .num {
+            font-size: 20px;
+            line-height: 20px;
+            color: #333333;
+            letter-spacing: 0;
+            font-weight: 700;
+        }
+        .unit {
+            margin-left: 5px;
+            height: 10%;
+            font-size: 14px;
+            color: #4e5969;
+            letter-spacing: 0;
+            line-height: 14px;
+            font-weight: 700;
+        }
+        .dot {
+            height: 45%;
+            aspect-ratio: 1/1;
+            border-radius: 50%;
+        }
+    }
+}
+@mixin overview {
+    .overview {
+        padding: 20px;
+        width: 100%;
+        background-color: #fff;
+        border-radius: 6px;
+        .title {
+            height: 28px;
+            font-size: 18px;
+            font-weight: 600;
+            color: #4e5969;
+        }
+        .content {
+            width: 100%;
+            height: calc(100% - 20px);
+            .rect {
+                @include defaultBoxStyle;
+                margin: 10px 0;
+                aspect-ratio: 310/70;
+                background-color: #f0f6ff;
+                @include borderstyle;
+                .left {
+                    display: flex;
+                    align-items: center;
+                    height: 100%;
+                    .img {
+                        height: 51%;
+                        aspect-ratio: 1/1;
+                        background-repeat: no-repeat;
+                        background-size: contain;
+                    }
+                    .imgName {
+                        margin-left: 5px;
+                        font-size: 14px;
+                        color: #4e5969;
+                        letter-spacing: 0;
+                        font-weight: 400;
+                    }
+                    .img1 {
+                        background-image: url('/@/assets/energyManage/power.png');
+                    }
+                    .img2 {
+                        background-image: url('/@/assets/energyManage/AGC.png');
+                    }
+                }
+                @include overViewRight;
+            }
+            .check {
+                @include defaultBoxStyle;
+                margin-bottom: 10px;
+                aspect-ratio: 310/50;
+                @include borderstyle;
+                .left {
+                    display: flex;
+                    align-items: center;
+                    height: 100%;
+                    color: #4e5969;
+                    .status {
+                        display: flex;
+                        align-items: center;
+                        height: 100%;
+                        .smallDot {
+                            margin-left: 5px;
+                            height: 25%;
+                            aspect-ratio: 1/1;
+                            border-radius: 50%;
+                        }
+                    }
+                }
+                @include overViewRight;
+            }
+            .checkInput {
+                padding: 0 10px;
+                margin-bottom: 10px;
+                width: 100%;
+                aspect-ratio: 310/88;
+                color: #4e5969;
+                @include borderstyle;
+                .top {
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    margin-top: 5px;
+                    margin-bottom: 10px;
+                    height: 30%;
+                }
+                .bottom {
+                    .el-input {
+                        background-color: #f0f6ff;
+                        :deep(.el-input__wrapper) {
+                            .el-input__inner {
+                                width: 92%;
+                                flex-grow: 0;
+                            }
+                        }
+                    }
+                    .saveBtn {
+                        margin: 0;
+                        height: 60%;
+                        aspect-ratio: 1/1;
+                        background-image: url('/@/assets/energyManage/defaultSave.png');
+                        background-size: contain;
+                        background-repeat: no-repeat;
+                        cursor: pointer;
+                    }
+                }
+            }
+        }
+    }
+}
+@mixin record {
+    .record {
+        margin: 20px 0;
+        padding: 20px;
+        width: 100%;
+        aspect-ratio: 350/270;
+        background-color: #fff;
+        border-radius: 6px;
+        color: #4e5969;
+        .title {
+            height: 30px;
+            font-size: 18px;
+            color: #4e5969;
+            font-weight: 600;
+        }
+        .recordList {
+            width: 100%;
+            height: calc(100% - 30px);
+            .recordItem {
+                width: 100%;
+                min-height: 32px;
+                line-height: 150%;
+                word-break: break-all;
+                background-color: #f0f6ff;
+                &:nth-child(2n) {
+                    background-color: #fff;
+                }
+            }
+        }
+    }
+}
+.energyManage {
+    width: 100%;
+    // height: 100%;
+    min-height: 100%;
+    background-color: #f2f3f5;
+    .el-row {
+        width: 100%;
+        height: 100%;
+        .el-col {
+            width: 100%;
+            height: 100%;
+            .successColor {
+                background-color: #06b429;
+            }
+            .errorColor {
+                background-color: #fe3731;
+            }
+            .defaultColor {
+                background-color: #e1e6ed;
+            }
+            .leftContainer {
+                @include overview;
+                @include record;
+            }
+            .centerContainer {
+                height: v-bind('containerHeight');
+                color: #4e5969;
+                .airBlowerList {
+                    padding: 20px;
+                    width: 100%;
+                    height: calc(50% - 10px);
+                    background-color: #fff;
+                    border-radius: 6px;
+                    .title {
+                        height: 38px;
+                        font-size: 18px;
+                        font-weight: 600;
+                    }
+                    .table {
+                        height: calc(100% - 38px);
+                    }
+                }
+                .chartPart {
+                    margin: 20px 0;
+                    padding: 20px;
+                    width: 100%;
+                    height: calc(50% - 10px);
+                    background-color: #fff;
+                    border-radius: 6px;
+                    .title {
+                        width: 100%;
+                        height: 32px;
+                        font-size: 14px;
+                        font-weight: 500;
+                    }
+                    .lineChart {
+                        width: 100%;
+                        height: calc(100% - 132px);
+                        .chart {
+                            width: 100%;
+                            height: 100%;
+                        }
+                    }
+                    .info {
+                        display: flex;
+                        flex-wrap: wrap;
+                        padding: 10px;
+                        width: 100%;
+                        height: 100px;
+                        background-color: #f0f6ff;
+                        .infoItem {
+                            display: flex;
+                            align-items: center;
+                            width: 20%;
+                            height: 50%;
+                            font-size: 12px;
+                            color: #333333;
+                            font-weight: 400;
+                            .label {
+                                margin-left: 10%;
+                            }
+                            .val {
+                                margin-left: 10px;
+                            }
+                        }
+                    }
+                }
+            }
+            .rightContainer {
+                @include overview;
+                @include record;
+            }
+        }
+    }
+}
+</style>

From e95e9745471909c84623e4f563c823832eb8f7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 17:36:30 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E8=83=BD=E9=87=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/energyManage/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/dasadmin/src/views/backend/energyManage/index.vue b/ui/dasadmin/src/views/backend/energyManage/index.vue
index b5d36d1e..8bd860b1 100644
--- a/ui/dasadmin/src/views/backend/energyManage/index.vue
+++ b/ui/dasadmin/src/views/backend/energyManage/index.vue
@@ -389,6 +389,7 @@ const getAirBlowerList = () => {
 }
 let timer: any = null
 const autoUpdateAirBlower = () => {
+    getAirBlowerList()
     if (!timer) {
         timer = setInterval(() => {
             getAirBlowerList()

From db87de1f5804c0f8c443047eaffecb5a531a357f Mon Sep 17 00:00:00 2001
From: geting <13585118195@163.com>
Date: Mon, 9 Dec 2024 09:41:20 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E5=8A=9F=E7=8E=87=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/statAnalysis/powerCurveAnalysis.vue     | 4 ++--
 ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue  | 4 ++--
 .../src/views/backend/statAnalysis/trendComparison.vue        | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
index 5bb94d49..8994d7be 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
@@ -339,7 +339,8 @@ const statAnalysisOperate = () => {
                         data: seriesData,
                         name: '实际值',
                         smooth: true,
-                        animation: false,
+                        symbolSize: 5,
+                        symbol: 'circle',
                     }
                     option.series.push(series)
                     option.legend.data.push('实际值')
@@ -354,7 +355,6 @@ const statAnalysisOperate = () => {
                     data: seriesData,
                     name: '理论值',
                     smooth: true,
-                    animation: false,
                     symbolSize: 0.1,
                     symbol: 'circle',
                 }
diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
index cdb626da..f6da1260 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
@@ -512,8 +512,8 @@ const historyDataReq = (promises: any) => {
                     data: yData.map((value: any) => ({
                         value: getCutDecimalsValue(value, 2),
                     })),
-                    showSymbol: true,
-                    animation: false,
+                    symbolSize: 5,
+                    symbol: 'circle',
                 }
                 option.legend.data.push(customName[index])
                 option.series.push(seriesData)
diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
index d67fe79d..2705f4ef 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
@@ -459,7 +459,8 @@ const historyDataReq = (data: any) => {
                                     value: getCutDecimalsValue(value, 2),
                                     unit: unit, // 将单位添加到每个数据点
                                 })),
-                                animation: false,
+                                symbolSize: 5,
+                                symbol: 'circle',
                             }
                             option.tooltip = {
                                 show: true,