Merge branch 'master' of http://116.63.33.55/git/industry-data-platform

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/ItemParent.java

@@ -54,6 +54,7 @@ public class ItemParent implements Serializable {
     private String countDataValue;
     private String dataValue;
     private String dataTime;
+    private String identifier;
 
     /**
      * 将点位信息，以及实时数据，赋值给泛型（ItemParent为泛型的父类）

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/ItemsParent.java

@@ -42,6 +42,7 @@ public class ItemsParent extends ItemParent implements Serializable {
                     itemsParent.setCountDataValueList(commonItem.getCountDataValueList());
                     itemsParent.setDataValueList(commonItem.getDataValueList());
                     itemsParent.setDataTimeList(commonItem.getDataTimeList());
+                    itemsParent.setIdentifier(commonItem.getIdentifier());
                     break;
                 }
             }

industry-system/industry-da/src/main/java/com/example/opc_da/validate/dataSource/OpcUaValidate.java

@@ -192,6 +192,7 @@ public class OpcUaValidate implements DataSourceValidate {
                 map.put("itemReadName", str + "." + name);
 //                map.put("nodeId", nd.getNodeId());
                 map.put("nodeIndex", nd.getNodeId().getNamespaceIndex().intValue());
+                map.put("identifier",nd.getNodeId().getIdentifier());
                 map.put("dataType", nd.getNodeId().getType());
                 map.put("description", nd.getDescription());
                 mapLeaveList.add(map);
@@ -224,6 +225,7 @@ public class OpcUaValidate implements DataSourceValidate {
                 map.put("nodeId", nd.getNodeId());
                 map.put("nodeIndex", nd.getNodeId().getNamespaceIndex().intValue());
                 map.put("dataType", nd.getNodeId().getType());
+                map.put("identifier",nd.getNodeId().getIdentifier());
                 map.put("description", nd.getDescription());
                 mapList.add(map);
             }

industry-system/industry-da/src/main/resources/static/reportSheet/js/util/constants.js

@@ -349,7 +349,7 @@ const sheetOption = {
 		matrix: false, // 矩阵操作选区
 		sort: false, // 排序选区
 		filter: false, // 筛选选区
-		chart: false, // 图表生成
+		chart: true, // 图表生成
 		image: true, // 插入图片
 		link: false, // 插入链接
 		data: false, // 数据验证