From 8caf916a37adb37eb071d5f22dc04da960177e46 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 09:39:37 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=A2=9E=E5=8A=A0=20unit=EF=BC=88=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=EF=BC=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/风场采集.pdma.json | 1879 +++++++++++++++++------------------
 1 file changed, 905 insertions(+), 974 deletions(-)

diff --git a/database/风场采集.pdma.json b/database/风场采集.pdma.json
index 12007701..ddeb7c0a 100644
--- a/database/风场采集.pdma.json
+++ b/database/风场采集.pdma.json
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.9.2",
   "createdTime": "2024-5-29 17:03:05",
-  "updatedTime": "2024-10-16 12:46:26",
+  "updatedTime": "2024-10-24 09:39:04",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1590,24 +1590,7 @@
       "indexes": [],
       "defName": "设备基础属性表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
-          "refField": "out2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "out2",
-          "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF",
-          "refField": "in2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
@@ -2154,6 +2137,42 @@
           "domain": "",
           "id": "2944D273-92E6-4728-8171-EEF78499EB8D"
         },
+        {
+          "defKey": "datatype",
+          "defName": "数据类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "678C1012-5492-4AB4-973C-2B54338792AA"
+        },
+        {
+          "defKey": "visible",
+          "defName": "是否可见",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "94AF7E4F-55F5-4C5E-8A7D-2A582D3C9AA9"
+        },
         {
           "defKey": "porder",
           "defName": "测点序号",
@@ -2172,6 +2191,24 @@
           "domain": "",
           "id": "29A0C6A7-1799-4B95-A684-ABB298462FA3"
         },
+        {
+          "defKey": "unit",
+          "defName": "单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "4DC8240C-6F32-4A96-A6F2-453DA7E26665"
+        },
         {
           "defKey": "revision",
           "defName": "乐观锁",
@@ -2275,16 +2312,7 @@
       "defName": "物模型_属性定义",
       "indexes": [],
       "notes": {},
-      "correlations": [
-        {
-          "myField": "bottom2",
-          "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
-          "refField": "top",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "6CCDA6D5-AABD-4DCA-A3C6-868F4F23AFFB",
@@ -2626,16 +2654,7 @@
       "type": "P",
       "defName": "物模型_方法定义",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "bottom2",
-          "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
-          "refField": "top3",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "F146908D-A604-440F-9524-8C28E6A31564",
@@ -2941,16 +2960,7 @@
       "type": "P",
       "defName": "系统节点(服务器)",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "bottom2",
-          "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF",
-          "refField": "top2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ],
+      "correlations": [],
       "indexes": []
     },
     {
@@ -3275,16 +3285,7 @@
       "type": "P",
       "defName": "通讯链路",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "F146908D-A604-440F-9524-8C28E6A31564",
-          "refField": "out2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "85CB25D9-D1CC-4C15-A0BE-611DCF579620",
@@ -3644,16 +3645,7 @@
       "type": "P",
       "defName": "链路映射表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "top2",
-          "refEntity": "C1EBE30B-0D85-4C7A-B992-FF70A793ED1D",
-          "refField": "bottom2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "61D89BFE-FE50-42F5-BDCF-CC7378570C56",
@@ -4049,16 +4041,7 @@
       "type": "P",
       "defName": "职业&账号表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "top2",
-          "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF",
-          "refField": "bottom2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9",
@@ -4922,24 +4905,7 @@
       "type": "P",
       "defName": "职员与角色关系表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "61D89BFE-FE50-42F5-BDCF-CC7378570C56",
-          "refField": "bottom2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "out2",
-          "refEntity": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9",
-          "refField": "bottom2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "AE06892E-BC15-4A74-9374-81B89277E005",
@@ -5227,24 +5193,7 @@
       "type": "P",
       "defName": "角色与权限关系表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9",
-          "refField": "bottom3",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "out2",
-          "refEntity": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7",
-          "refField": "bottom3",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "172B2FD1-14C3-499B-A87B-758F8BF87C58",
@@ -5640,16 +5589,7 @@
       "type": "P",
       "defName": "系统菜单",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7",
-          "refField": "out2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457",
@@ -6279,16 +6219,7 @@
       "type": "P",
       "defName": "枚举值表",
       "notes": {},
-      "correlations": [
-        {
-          "myField": "in2",
-          "refEntity": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457",
-          "refField": "out2",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     }
   ],
   "views": [],
@@ -6950,145 +6881,6 @@
     "relationType": "entity",
     "canvasData": {
       "cells": [
-        {
-          "id": "ee3bb43a-2484-4a03-8cc3-219f30706ca2",
-          "shape": "table",
-          "position": {
-            "x": -1460,
-            "y": -990
-          },
-          "count": 0,
-          "originKey": "044FECED-CF78-4907-806F-DC4C98C2BCBA",
-          "type": "P",
-          "size": {
-            "width": 385,
-            "height": 284
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
         {
           "id": "1a42f2a5-52d2-4f20-9ea7-6f3bd8f3441e",
           "shape": "table",
@@ -7367,285 +7159,6 @@
             ]
           }
         },
-        {
-          "id": "8be908ab-85b6-4230-b708-1ddf2da33830",
-          "shape": "table",
-          "position": {
-            "x": 290,
-            "y": 150
-          },
-          "count": 0,
-          "originKey": "80203FEF-6CCA-4E85-8EE8-EB117AAEE55C",
-          "type": "P",
-          "size": {
-            "width": 348,
-            "height": 215
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
-        {
-          "id": "1d3dd585-bacc-4259-9521-98795230b154",
-          "shape": "table",
-          "position": {
-            "x": -1260,
-            "y": -630
-          },
-          "count": 0,
-          "originKey": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
-          "fillColor": "#DDE5FF",
-          "type": "P",
-          "size": {
-            "width": 396,
-            "height": 238
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
         {
           "id": "1e824348-e23a-4c14-b9c4-baaf33fc9416",
           "shape": "table",
@@ -7924,145 +7437,6 @@
             ]
           }
         },
-        {
-          "id": "4e9a7a00-d60a-43d2-8600-f83922c37647",
-          "shape": "table",
-          "position": {
-            "x": 511,
-            "y": -240
-          },
-          "count": 0,
-          "originKey": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9",
-          "type": "P",
-          "size": {
-            "width": 344,
-            "height": 215
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
         {
           "id": "1306f2f8-afb2-44c7-99bd-6a4b4e639626",
           "shape": "table",
@@ -8341,284 +7715,6 @@
             ]
           }
         },
-        {
-          "id": "5030703c-3b10-44b9-bc28-1bb8d31c8fac",
-          "shape": "table",
-          "position": {
-            "x": -1238,
-            "y": -200
-          },
-          "count": 0,
-          "originKey": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457",
-          "type": "P",
-          "size": {
-            "width": 352,
-            "height": 215
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
-        {
-          "id": "192f839e-8983-466e-9df7-818c17430f45",
-          "shape": "table",
-          "position": {
-            "x": -754,
-            "y": -234.5
-          },
-          "count": 0,
-          "originKey": "693514C4-32C9-4FF9-9842-5E08581C905F",
-          "type": "P",
-          "size": {
-            "width": 433,
-            "height": 284
-          },
-          "autoSize": true,
-          "ports": {
-            "groups": {
-              "in": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "zIndex": 3,
-                "position": {
-                  "name": "left"
-                }
-              },
-              "out": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "right"
-                }
-              },
-              "top": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "top"
-                }
-              },
-              "bottom": {
-                "attrs": {
-                  "circle": {
-                    "r": 4,
-                    "magnet": true,
-                    "stroke": "#1890FF",
-                    "fill": "#FFF",
-                    "strokeWidth": 1,
-                    "style": {
-                      "visibility": "hidden"
-                    }
-                  }
-                },
-                "position": {
-                  "name": "bottom"
-                }
-              }
-            },
-            "items": [
-              {
-                "group": "in",
-                "id": "in"
-              },
-              {
-                "group": "in",
-                "id": "in2"
-              },
-              {
-                "group": "in",
-                "id": "in3"
-              },
-              {
-                "group": "out",
-                "id": "out"
-              },
-              {
-                "group": "out",
-                "id": "out2"
-              },
-              {
-                "group": "out",
-                "id": "out3"
-              },
-              {
-                "group": "top",
-                "id": "top"
-              },
-              {
-                "group": "top",
-                "id": "top2"
-              },
-              {
-                "group": "top",
-                "id": "top3"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom2"
-              },
-              {
-                "group": "bottom",
-                "id": "bottom3"
-              }
-            ]
-          }
-        },
         {
           "id": "a4493502-571d-4863-a467-39b891145b94",
           "shape": "table",
@@ -8758,6 +7854,145 @@
             ]
           }
         },
+        {
+          "id": "7ac8a5d4-1b88-4286-af3e-bf143e4511ca",
+          "shape": "table",
+          "position": {
+            "x": 960,
+            "y": -240
+          },
+          "count": 0,
+          "originKey": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7",
+          "type": "P",
+          "size": {
+            "width": 358,
+            "height": 215
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
+        },
         {
           "id": "06afc394-00c8-4dad-ab6a-3700d00d2c66",
           "shape": "erdRelation",
@@ -9331,17 +8566,17 @@
           }
         },
         {
-          "id": "7ac8a5d4-1b88-4286-af3e-bf143e4511ca",
+          "id": "4e9a7a00-d60a-43d2-8600-f83922c37647",
           "shape": "table",
           "position": {
-            "x": 960,
+            "x": 511,
             "y": -240
           },
           "count": 0,
-          "originKey": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7",
+          "originKey": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9",
           "type": "P",
           "size": {
-            "width": 358,
+            "width": 344,
             "height": 215
           },
           "autoSize": true,
@@ -9607,6 +8842,702 @@
               }
             ]
           }
+        },
+        {
+          "id": "8be908ab-85b6-4230-b708-1ddf2da33830",
+          "shape": "table",
+          "position": {
+            "x": 290,
+            "y": 150
+          },
+          "count": 0,
+          "originKey": "80203FEF-6CCA-4E85-8EE8-EB117AAEE55C",
+          "type": "P",
+          "size": {
+            "width": 348,
+            "height": 215
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
+        },
+        {
+          "id": "5030703c-3b10-44b9-bc28-1bb8d31c8fac",
+          "shape": "table",
+          "position": {
+            "x": -1238,
+            "y": -200
+          },
+          "count": 0,
+          "originKey": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457",
+          "type": "P",
+          "size": {
+            "width": 352,
+            "height": 215
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
+        },
+        {
+          "id": "192f839e-8983-466e-9df7-818c17430f45",
+          "shape": "table",
+          "position": {
+            "x": -754,
+            "y": -234.5
+          },
+          "count": 0,
+          "originKey": "693514C4-32C9-4FF9-9842-5E08581C905F",
+          "type": "P",
+          "size": {
+            "width": 433,
+            "height": 284
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
+        },
+        {
+          "id": "1d3dd585-bacc-4259-9521-98795230b154",
+          "shape": "table",
+          "position": {
+            "x": -1260,
+            "y": -630
+          },
+          "count": 0,
+          "originKey": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03",
+          "fillColor": "#DDE5FF",
+          "type": "P",
+          "size": {
+            "width": 396,
+            "height": 238
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
+        },
+        {
+          "id": "ee3bb43a-2484-4a03-8cc3-219f30706ca2",
+          "shape": "table",
+          "position": {
+            "x": -1550,
+            "y": -1024.5
+          },
+          "count": 0,
+          "originKey": "044FECED-CF78-4907-806F-DC4C98C2BCBA",
+          "type": "P",
+          "size": {
+            "width": 393,
+            "height": 353
+          },
+          "autoSize": true,
+          "ports": {
+            "groups": {
+              "in": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "zIndex": 3,
+                "position": {
+                  "name": "left"
+                }
+              },
+              "out": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "right"
+                }
+              },
+              "top": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "top"
+                }
+              },
+              "bottom": {
+                "attrs": {
+                  "circle": {
+                    "r": 4,
+                    "magnet": true,
+                    "stroke": "#1890FF",
+                    "fill": "#FFF",
+                    "strokeWidth": 1,
+                    "style": {
+                      "visibility": "hidden"
+                    }
+                  }
+                },
+                "position": {
+                  "name": "bottom"
+                }
+              }
+            },
+            "items": [
+              {
+                "group": "in",
+                "id": "in"
+              },
+              {
+                "group": "in",
+                "id": "in2"
+              },
+              {
+                "group": "in",
+                "id": "in3"
+              },
+              {
+                "group": "out",
+                "id": "out"
+              },
+              {
+                "group": "out",
+                "id": "out2"
+              },
+              {
+                "group": "out",
+                "id": "out3"
+              },
+              {
+                "group": "top",
+                "id": "top"
+              },
+              {
+                "group": "top",
+                "id": "top2"
+              },
+              {
+                "group": "top",
+                "id": "top3"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom2"
+              },
+              {
+                "group": "bottom",
+                "id": "bottom3"
+              }
+            ]
+          }
         }
       ]
     },

From 1965faeb2e577dadb1cbc73f7762b973b2fd8fcb Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 09:44:23 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/modules/data/domain/SnapshotValueQueryParam.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/data/domain/SnapshotValueQueryParam.java b/das/src/main/java/com/das/modules/data/domain/SnapshotValueQueryParam.java
index c431d698..31cc3be6 100644
--- a/das/src/main/java/com/das/modules/data/domain/SnapshotValueQueryParam.java
+++ b/das/src/main/java/com/das/modules/data/domain/SnapshotValueQueryParam.java
@@ -6,15 +6,20 @@ import lombok.Data;
 
 import java.util.List;
 
+/**
+ * 数据查询参数
+ */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
 public class SnapshotValueQueryParam
 {
     /**
-     * 测点irn列表
+     * 设备ID
      */
     @NotNull
     private String deviceId;
-
+    /**
+     * 设备所属物模型中的属性列表
+     */
     private List<String> attributes;
 }

From d4af88c55fcd15b8501b159822bb615b2dd16841 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 09:54:41 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/modules/data/controller/DataController.java  |  6 +++---
 .../com/das/modules/data/service/DataService.java    | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/das/src/main/java/com/das/modules/data/controller/DataController.java b/das/src/main/java/com/das/modules/data/controller/DataController.java
index f312ec6f..edcaecd3 100644
--- a/das/src/main/java/com/das/modules/data/controller/DataController.java
+++ b/das/src/main/java/com/das/modules/data/controller/DataController.java
@@ -29,7 +29,7 @@ public class DataController {
 
     /**
      * 实时数据查询
-     * @param param 查询数据请求体
+     * @param param 查询条件
      * @return redis数据
      */
     @PostMapping("/snapshot")
@@ -43,8 +43,8 @@ public class DataController {
 
     /**
      * 历史区间数据查询
-     * @param param
-     * @return
+     * @param param 查询条件
+     * @return TD数据库数据
      */
     @PostMapping("/history")
     public R<Map<String, Map<String, Map<String, Object>>>> queryTimeSeriesValues(@RequestBody @Valid TSValueQueryParam param) {
diff --git a/das/src/main/java/com/das/modules/data/service/DataService.java b/das/src/main/java/com/das/modules/data/service/DataService.java
index 4cd55fdc..d91de72a 100644
--- a/das/src/main/java/com/das/modules/data/service/DataService.java
+++ b/das/src/main/java/com/das/modules/data/service/DataService.java
@@ -35,7 +35,11 @@ public class DataService {
     @Autowired
     private DataServiceImpl dataService;
 
-    // 读取实时数据快照
+    /**
+     * 读取实时数据快照
+     * @param paramList 设备id及设备属性列表
+     * @return
+     */
     public Map<String, Map<String, Object>> querySnapshotValues(List<SnapshotValueQueryParam> paramList) {
         long start = System.currentTimeMillis();
         Map<String, Map<String, Object>> result = new HashMap<>(paramList.size());
@@ -80,7 +84,11 @@ public class DataService {
         return finalResult;
     }
 
-
+    /**
+     * 历史区间数据查询
+     * @param param 查询条件
+     * @return TD数据库数据
+     */
     public Map<String, Map<String, Map<String, Object>>> queryTimeSeriesValues(TSValueQueryParam param) {
         if (CollectionUtil.isEmpty(param.getDevices()) || (param.getStartTime() == null && param.getEndTime() == null)) {
             throw new ServiceException("必要参数缺失");

From 96cea9636e90a6f4b450e0a74562ff29db78ba0c Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Thu, 24 Oct 2024 10:11:56 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=89=A9=E7=90=86=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7,=E5=A2=9E=E5=8A=A0(=E5=8D=95=E4=BD=8D)?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dto/SysIotModelFieldDto.java       |  4 ++++
 .../domain/excel/SysIotModelFieldExcel.java   |  5 +++++
 .../domain/vo/SysIotModelFieldVo.java         | 21 +++++++++++++++----
 .../equipment/entity/SysIotModelField.java    |  6 ++++++
 .../service/impl/SysIotModelServiceImpl.java  | 12 ++++++-----
 .../mapper/SysIotModelFieldMapper.xml         |  1 +
 .../resources/mapper/SysIotModelMapper.xml    |  1 +
 7 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java b/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java
index 9d081a3d..a800f88d 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java
@@ -68,6 +68,10 @@ public class SysIotModelFieldDto implements Serializable {
     private String orderColumn;
 
     private String orderType;
+    /**
+     * 单位
+     */
+    private String unit;
 
 
 }
diff --git a/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java b/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java
index 7cd599fe..86717758 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java
@@ -60,5 +60,10 @@ public class SysIotModelFieldExcel {
      * 是否可见
      */
     private Integer visible;
+    /**
+     * 单位
+     */
+    private String unit;
+
 
 }
diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java
index cc510347..56c4ca55 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java
@@ -44,13 +44,26 @@ public class SysIotModelFieldVo {
     private Integer porder;
 
     private Integer revision;
-
+    /**
+     * 属性频度：0低频属性，1高频属性
+     */
     private Integer highSpeed;
-
+    /**
+     * 子系统
+     */
     private String subSystem;
-
+    /**
+     * 数据类型:int4,int8;float4;float8
+     */
     private String dataType;
-
+    /**
+     * 是否可见：0不可见，1可见
+     */
     private Integer visible;
+    /**
+     *
+     * 单位
+     */
+    private String unit;
 
 }
diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java b/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java
index 6f5409ea..58e87492 100644
--- a/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java
+++ b/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java
@@ -93,4 +93,10 @@ public class SysIotModelField extends BaseEntity {
      */
     @TableField("visible")
     private Integer visible;
+
+    /**
+     * 单位
+     */
+    @TableField("unit")
+    private String unit;
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index cddb1293..ba0b63e7 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -284,6 +284,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         map.put("attributeCode", "*物模型属性编码");
         map.put("attributeName", "*物模型属性名称");
         map.put("attributeType", "*属性类型（138：模拟量，139：累积量，140：离散量）");
+        map.put("unit", "单位");
         map.put("porder", "*测点序号");
         map.put("subSystem", "子系統");
         map.put("dataType", "数据类型");
@@ -453,11 +454,12 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         field.setAttributeCode(row.get(3).toString().toLowerCase());
         field.setAttributeName(row.get(4).toString());
         field.setAttributeType(Integer.valueOf(row.get(5).toString()));
-        field.setPorder(Integer.valueOf(row.get(6).toString()));
-        field.setSubSystem(row.get(7).toString());
-        field.setDataType(row.get(8).toString());
-        field.setVisible(Integer.valueOf(row.get(9).toString()));
-        field.setHighSpeed(Integer.valueOf(row.get(10).toString()));
+        field.setUnit(row.get(6).toString());
+        field.setPorder(Integer.valueOf(row.get(7).toString()));
+        field.setSubSystem(row.get(8).toString());
+        field.setDataType(row.get(9).toString());
+        field.setVisible(Integer.valueOf(row.get(10).toString()));
+        field.setHighSpeed(Integer.valueOf(row.get(11).toString()));
         field.setIotModelId(Long.valueOf(iotModelId));
     }
 
diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index 4f92fa5d..1468de4a 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -10,6 +10,7 @@
         <result property="revision" column="revision" jdbcType="INTEGER"/>
         <result property="id" column="id" jdbcType="BIGINT"/>
         <result property="iotModelId" column="iot_model_id" jdbcType="BIGINT"/>
+        <result property="unit" column="unit" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="querySysIotModelFieldList" resultMap="SysIotModelFieldMap">
diff --git a/das/src/main/resources/mapper/SysIotModelMapper.xml b/das/src/main/resources/mapper/SysIotModelMapper.xml
index f048d2a4..8e5d8dc7 100644
--- a/das/src/main/resources/mapper/SysIotModelMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelMapper.xml
@@ -23,6 +23,7 @@
         <result property="subSystem" column="subsystem" jdbcType="VARCHAR"/>
         <result property="dataType" column="datatype" jdbcType="VARCHAR"/>
         <result property="visible" column="visible" jdbcType="INTEGER"/>
+        <result property="unit" column="unit" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap type="com.das.modules.equipment.domain.vo.SysIotModelVo" id="SysIotModelMap">

From 923be23083cfbc0ab9df18a8e5838e30b1a11fcb Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 10:12:16 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/controller/SysNodeController.java    | 32 +++++++++----------
 .../node/service/impl/SysNodeServiceImpl.java |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
index f6568784..7a72581c 100644
--- a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
+++ b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
@@ -48,7 +48,7 @@ public class SysNodeController {
     public R<SysNodeVo> createSysNode(@RequestBody SysNodeDto sysNodeDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -60,7 +60,7 @@ public class SysNodeController {
     public R<SysNodeVo> updateSysNode(@RequestBody SysNodeDto sysNodeDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -72,7 +72,7 @@ public class SysNodeController {
     public R<Void> deleteSysNode(@RequestBody SysNodeDto sysNodeDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -104,7 +104,7 @@ public class SysNodeController {
     public R<SysCommunicationLinkVo> createSysCommunicationLink(@RequestBody SysCommunicationLinkDto sysCommunicationLinkDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -116,7 +116,7 @@ public class SysNodeController {
     public R<SysCommunicationLinkVo> updateSysCommunicationLink(@RequestBody SysCommunicationLinkDto sysCommunicationLinkDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -128,7 +128,7 @@ public class SysNodeController {
     public R<SysCommunicationLinkVo> deleteSysCommunicationLink(@RequestBody SysCommunicationLinkDto sysCommunicationLinkDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -160,13 +160,13 @@ public class SysNodeController {
     public R<?> getMappingList(@RequestBody SysImptabmappingDto sysImptabmappingDto) {
 
         //判断是否有权限
-//        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
-//        if(!hasPermission){
-//            return R.fail("没有节点管理权限");
-//        }
-//        if (sysImptabmappingDto.getLinkId() == null) {
-//            throw new ServiceException("参数缺失");
-//        }
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
+        if(!hasPermission){
+            return R.fail("没有节点管理权限");
+        }
+        if (sysImptabmappingDto.getLinkId() == null) {
+            throw new ServiceException("参数缺失");
+        }
         List<ImptabmappingVo> list = sysNodeService.getMappingList(sysImptabmappingDto);
         return R.success(list);
     }
@@ -176,7 +176,7 @@ public class SysNodeController {
     public R<?> getBindDeviceTree(@RequestBody SysImptabmappingDto sysImptabmappingDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -192,7 +192,7 @@ public class SysNodeController {
     public R<Void> bindMeas(@RequestBody BindEquipmentDto bindEquipmentDto) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
@@ -205,7 +205,7 @@ public class SysNodeController {
     public R<Void> saveMappingList(@RequestBody List<ImptabmappingDto> impList) {
 
         //判断是否有权限
-        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());
         if(!hasPermission){
             return R.fail("没有节点管理权限");
         }
diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
index 37f9724b..0f25cb1f 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
@@ -289,7 +289,7 @@ public class SysNodeServiceImpl implements SysNodeService {
             }
             IoUtil.close(os);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(),e);
         }
     }
 

From 1db030b3556d3b53e92284a2ad70d70f50f2a803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 24 Oct 2024 10:33:43 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=EF=BC=9A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/auth/model/index.vue      | 17 ++++++++++++++---
 .../src/views/backend/auth/model/type.ts        |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue
index 9fdcedd6..7f4a49ca 100644
--- a/ui/dasadmin/src/views/backend/auth/model/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/model/index.vue
@@ -237,9 +237,14 @@
                         </el-form-item>
                     </template>
                 </div>
-                <el-form-item :label="ModelAttributeFieldsEnums['porder']" prop="porder">
-                    <el-input v-model="attributeForm.porder" :placeholder="'请输入' + ModelAttributeFieldsEnums['porder']"></el-input>
-                </el-form-item>
+                <div class="formRowStyle">
+                    <el-form-item :label="ModelAttributeFieldsEnums['porder']" prop="porder">
+                        <el-input v-model="attributeForm.porder" :placeholder="'请输入' + ModelAttributeFieldsEnums['porder']"></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="attributeForm.attributeType === 138 || attributeForm.attributeType === 139" :label="ModelAttributeFieldsEnums['unit']" prop="unit">
+                        <el-input v-model="attributeForm.unit" :placeholder="'请输入' + ModelAttributeFieldsEnums['unit']"></el-input>
+                    </el-form-item>
+                </div>
                 <el-form-item :label="ModelAttributeFieldsEnums['subSystem']" prop="subSystem">
                     <el-input v-model="attributeForm.subSystem" :placeholder="'请输入' + ModelAttributeFieldsEnums['subSystem']"></el-input>
                 </el-form-item>
@@ -750,6 +755,7 @@ const originAttributeForm: AddModelAttributeType & UpdateModelAttributeType = {
     subSystem: '',
     dataType: '',
     visible: true,
+    unit:'',
     revision: 1,
     createdBy: undefined,
     createdTime: undefined,
@@ -907,8 +913,10 @@ const attributeAndServiceRules = {
 
 const addModelAttributeAndService = () => {
     if (ModelTabs.value === 'attribute') {
+        attributeFormTitle.value = AttributeDialogTitleStateType['add']
         attributeVisible.value = true
     } else {
+        serviceFormTitle.value = serviceDialogTitleStateType['add']
         serviceVisible.value = true
     }
 }
@@ -1110,5 +1118,8 @@ $paginationHeight: 32px;
     .el-select {
         width: 184px;
     }
+    .el-input{
+        width: 184px;
+    }
 }
 </style>
diff --git a/ui/dasadmin/src/views/backend/auth/model/type.ts b/ui/dasadmin/src/views/backend/auth/model/type.ts
index fb32c728..0293db06 100644
--- a/ui/dasadmin/src/views/backend/auth/model/type.ts
+++ b/ui/dasadmin/src/views/backend/auth/model/type.ts
@@ -66,6 +66,7 @@ export enum ModelAttributeFieldsEnums {
     'subSystem' = '子系统',
     'dataType' = '数据类型',
     'visible' = '是否可见',
+    'unit'='单位',
     'revision' = '乐观锁',
     'createdBy' = '创建人',
     'createdTime' = '创建时间',
@@ -108,6 +109,7 @@ export type AddModelAttributeType = {
     highSpeed: 0 | 1 | boolean
     subSystem: string
     dataType: attributeTypeDataType | ''
+    unit:string
     visible: 0 | 1 | boolean
     revision: number
     createdBy?: string

From a4e52d6742181054bc521ed90864478e09316923 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 11:07:13 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E5=90=8E=E5=8F=B0api=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/common/constant/SysAuthorityIds.java    |  5 +++++
 .../controller/WindTurbinesPageController.java  | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java

diff --git a/das/src/main/java/com/das/common/constant/SysAuthorityIds.java b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java
index 95b5bd3e..058214f4 100644
--- a/das/src/main/java/com/das/common/constant/SysAuthorityIds.java
+++ b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java
@@ -16,4 +16,9 @@ public interface SysAuthorityIds {
      * 设备台账浏览权限
      */
     Integer SYS_AUTHORITY_ID_DEVICE_VIEW = 103;
+
+    /**
+     * 风机启停复位控制权限
+     */
+    Integer SYS_AUTHORITY_ID_TURBINE_CTRL=104;
 }
diff --git a/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
new file mode 100644
index 00000000..a153687c
--- /dev/null
+++ b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
@@ -0,0 +1,17 @@
+package com.das.modules.page.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author houwei
+ * @date 2024-10-24
+ * @description: 风机列表页面 对应的 后端api
+ */
+@Slf4j
+@RequestMapping("/api/page")
+@RestController
+public class WindTurbinesPageController {
+
+}

From c4513b0c18bb531639d7dd7fc1969b9585726892 Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Thu, 24 Oct 2024 11:17:56 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7=E6=8E=A5=E5=8F=A3,?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7=E7=BC=96=E7=A0=81=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E6=80=A7=E4=BC=98=E5=8C=96;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/service/impl/SysIotModelServiceImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index ba0b63e7..05e86556 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -186,10 +186,9 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         }
         SysIotModelFieldVo sysIotModelFieldQuery = sysIotModelFieldMapper.selectByAttributeCode(sysIotModelFieldDto.getIotModelId(), sysIotModelFieldDto.getAttributeCode());
         if (!(sysIotModelFieldQuery == null)) {
-            if (sysIotModelFieldQuery.getId() != sysIotModelFieldDto.getId()){
+            if (!sysIotModelFieldQuery.getId().equals(sysIotModelFieldDto.getId())){
                 throw new ServiceException("物模型属性code已经存在");
             }
-
         }
         sysIotModelFieldMapper.updateById(sysIotModelField);
 

From 357a053b4d7cb3a1f034d9ead48c5bfb95ed090a Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Thu, 24 Oct 2024 13:45:18 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=A5=E6=8E=A7?=
 =?UTF-8?q?=E9=81=A5=E8=B0=83=E6=93=8D=E4=BD=9C=E7=9A=84api=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/controller/SysNodeController.java    | 20 +++++--
 ...eControlDto.java => DeviceCommandDto.java} | 20 ++++---
 .../node/domain/dto/DeviceSetPointDto.java    | 23 ++++++++
 .../modules/node/service/SysNodeService.java  | 12 +++-
 .../node/service/impl/SysNodeServiceImpl.java | 55 ++++++++++++++++++-
 .../WindTurbinesPageController.java           | 16 +++++-
 6 files changed, 130 insertions(+), 16 deletions(-)
 rename das/src/main/java/com/das/modules/node/domain/dto/{DeviceControlDto.java => DeviceCommandDto.java} (65%)
 create mode 100644 das/src/main/java/com/das/modules/node/domain/dto/DeviceSetPointDto.java

diff --git a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
index 7a72581c..d4e05401 100644
--- a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
+++ b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
@@ -232,10 +232,22 @@ public class SysNodeController {
         return R.success("导入失败");
     }
 
-    /** 遥控遥调 */
-    @PostMapping("/link/deviceControl")
-    public void deviceControl(@RequestBody DeviceControlDto device) {
-        sysNodeService.deviceControl(device);
+    /**
+     * 设备遥控操作
+     * @param deviceInfo 遥控信息
+     */
+    @PostMapping("/link/command")
+    public void deviceCommand(@RequestBody DeviceCommandDto deviceInfo) {
+        sysNodeService.deviceCommand(deviceInfo);
+    }
+
+    /**
+     * 设备遥调操作
+     * @param deviceInfo 遥控信息
+     */
+    @PostMapping("/link/setPoint")
+    public void deviceSetPoint(@RequestBody DeviceSetPointDto deviceInfo) {
+        sysNodeService.deviceSetPoint(deviceInfo);
     }
 }
 
diff --git a/das/src/main/java/com/das/modules/node/domain/dto/DeviceControlDto.java b/das/src/main/java/com/das/modules/node/domain/dto/DeviceCommandDto.java
similarity index 65%
rename from das/src/main/java/com/das/modules/node/domain/dto/DeviceControlDto.java
rename to das/src/main/java/com/das/modules/node/domain/dto/DeviceCommandDto.java
index 1eb7df2f..dfba26ce 100644
--- a/das/src/main/java/com/das/modules/node/domain/dto/DeviceControlDto.java
+++ b/das/src/main/java/com/das/modules/node/domain/dto/DeviceCommandDto.java
@@ -4,17 +4,23 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+/**
+ * 设备控制 输入参数
+ */
 @Data
-public class DeviceControlDto {
-
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long nodeId;
-
+public class DeviceCommandDto {
+    /**
+     * 设备ID
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long deviceId;
 
+    /**
+     * 遥控命令
+     */
     private String serviceName;
-
+    /**
+     *遥控值, 1或者0
+     */
     private Integer opValue;
 }
diff --git a/das/src/main/java/com/das/modules/node/domain/dto/DeviceSetPointDto.java b/das/src/main/java/com/das/modules/node/domain/dto/DeviceSetPointDto.java
new file mode 100644
index 00000000..2fba41da
--- /dev/null
+++ b/das/src/main/java/com/das/modules/node/domain/dto/DeviceSetPointDto.java
@@ -0,0 +1,23 @@
+package com.das.modules.node.domain.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+@Data
+public class DeviceSetPointDto {
+    /**
+     * 设备ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deviceId;
+
+    /**
+     * 遥调命令
+     */
+    private String serviceName;
+    /**
+     *遥调值,浮点数
+     */
+    private Float opValue;
+}
diff --git a/das/src/main/java/com/das/modules/node/service/SysNodeService.java b/das/src/main/java/com/das/modules/node/service/SysNodeService.java
index bc0c4d9e..0af0ef54 100644
--- a/das/src/main/java/com/das/modules/node/service/SysNodeService.java
+++ b/das/src/main/java/com/das/modules/node/service/SysNodeService.java
@@ -43,5 +43,15 @@ public interface SysNodeService {
 
     boolean importMappingList(String linkId, MultipartFile file);
 
-    void deviceControl(DeviceControlDto device);
+    /**
+     * 设备遥控操作
+     * @param deviceInfo 遥控具体的设备信息，设备id、遥控命令、遥控值
+     */
+    void deviceCommand(DeviceCommandDto deviceInfo);
+
+    /**
+     * 设备遥调操作
+     * @param deviceInfo 遥调具体的设备信息，设备id、遥调命令、遥调值
+     */
+    void deviceSetPoint(DeviceSetPointDto deviceInfo);
 }
diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
index 0f25cb1f..eb9f51df 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
@@ -334,7 +334,7 @@ public class SysNodeServiceImpl implements SysNodeService {
     }
 
     @Override
-    public void deviceControl(DeviceControlDto device) {
+    public void deviceCommand(DeviceCommandDto device) {
         try {
             HashMap map = new HashMap<>();
             ObjectMapper objectMapper = new ObjectMapper();
@@ -345,6 +345,12 @@ public class SysNodeServiceImpl implements SysNodeService {
             map.put("serviceName", device.getServiceName());
             map.put("opValue", device.getOpValue());
 
+            //激活的node节点Id
+            long activeNodeId = getActiveNodeId();
+            if(activeNodeId==0){
+                throw new RuntimeException("找不到激活的节点信息");
+            }
+
             // 将 HashMap 转换为 JsonNode
             ObjectNode jsonNode = objectMapper.convertValue(map, ObjectNode.class);
             TerminalMessage configUpdate = TerminalMessage.builder()
@@ -353,13 +359,58 @@ public class SysNodeServiceImpl implements SysNodeService {
                     .time(time)
                     .data(jsonNode)
                     .build();
-            terminalMessageEventHandler.sendTerminalMessageWithResult(device.getNodeId(), configUpdate);
+            terminalMessageEventHandler.sendTerminalMessageWithResult(activeNodeId, configUpdate);
+        } catch (Exception e) {
+            log.error("设备控制失败 ", e);
+        }
+    }
+
+    @Override
+    public void deviceSetPoint(DeviceSetPointDto device) {
+        try {
+            HashMap map = new HashMap<>();
+            ObjectMapper objectMapper = new ObjectMapper();
+            String cmd = NodeConstant.DEVICE_CONTROL;
+            Long time = System.currentTimeMillis();
+
+            map.put("deviceId", device.getDeviceId());
+            map.put("serviceName", device.getServiceName());
+            map.put("opValue", device.getOpValue());
+
+            //激活的node节点Id
+            long activeNodeId = getActiveNodeId();
+            if(activeNodeId==0){
+                throw new RuntimeException("找不到激活的节点信息");
+            }
+
+            // 将 HashMap 转换为 JsonNode
+            ObjectNode jsonNode = objectMapper.convertValue(map, ObjectNode.class);
+            TerminalMessage configUpdate = TerminalMessage.builder()
+                    .cmd(cmd)
+                    .cmdId(String.valueOf(device.getDeviceId()))
+                    .time(time)
+                    .data(jsonNode)
+                    .build();
+            terminalMessageEventHandler.sendTerminalMessageWithResult(activeNodeId, configUpdate);
         } catch (Exception e) {
             log.error("设备控制失败 ", e);
         }
 
     }
 
+    /**
+     * 获得当前激活的节点id
+     * @return 节点id
+     */
+    private long getActiveNodeId(){
+        List<SysNodeVo> list = sysNodeMapper.querySysNodeList();
+        if(list.isEmpty()){
+            return 0;
+        }else{
+            return list.get(0).getId();
+        }
+    }
+
     // 绑定设备的测点信息，不是绑定设备到映射表
     private void addSysImptabmapping(List<BindEquipmentInfoDto> equipmentId, Long linkId, SysUserVo sysUserVo, List<SysImptabmapping> addList) {
 
diff --git a/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
index a153687c..595ff7b2 100644
--- a/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
+++ b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
@@ -1,17 +1,29 @@
 package com.das.modules.page.controller;
 
+import com.das.common.result.R;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author houwei
  * @date 2024-10-24
  * @description: 风机列表页面 对应的 后端api
  */
 @Slf4j
-@RequestMapping("/api/page")
+@RequestMapping("/api/page/turbines")
 @RestController
 public class WindTurbinesPageController {
-
+    /**
+     * 获取风机机组所属线路列表
+     * @return 返回字符串数组
+     */
+    @PostMapping("/lines")
+    public R<List<String>> queryBelongLines() {
+        //TODO: 查询sql: select distinct belong_line as name  from sys_equipment t where t.object_type = 10002 and belong_line !='';
+        return R.success();
+    }
 }