Merge remote-tracking branch 'origin/main'

das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java

@@ -267,24 +267,24 @@ public class DataServiceImpl implements DataService {
             keyValueMap.put(key, high.get(fieldName).asDouble());
         }
         adminRedisTemplate.mSet(keyValueMap);
-        Long dataTime = data.getTime();
+//        Long dataTime = data.getTime();
-
+//
-        // 存入td库
+//        // 存入td库
-        List<RTData> highList = new ArrayList<>();
+//        List<RTData> highList = new ArrayList<>();
-        List<RTData> lowList = new ArrayList<>();
+//        List<RTData> lowList = new ArrayList<>();
-        RTData rtHighData = RTData.builder()
+//        RTData rtHighData = RTData.builder()
-                .dataTime(dataTime)
+//                .dataTime(dataTime)
-                .deviceId(Long.valueOf(deviceId))
+//                .deviceId(Long.valueOf(deviceId))
-                .values(highFieldMap)
+//                .values(highFieldMap)
-                .build();
+//                .build();
-        RTData rtLowData = RTData.builder()
+//        RTData rtLowData = RTData.builder()
-                .dataTime(dataTime)
+//                .dataTime(dataTime)
-                .deviceId(Long.valueOf(deviceId))
+//                .deviceId(Long.valueOf(deviceId))
-                .values(highFieldMap)
+//                .values(highFieldMap)
-                .build();
+//                .build();
-        highList.add(rtHighData);
+//        highList.add(rtHighData);
-        lowList.add(rtLowData);
+//        lowList.add(rtLowData);
-        tdEngineService.updateYCHighValues(highList, iotModelCode);
+//        tdEngineService.updateYCHighValues(highList, iotModelCode);
-        tdEngineService.updateYCLowValues(lowList, iotModelCode);
+//        tdEngineService.updateYCLowValues(lowList, iotModelCode);
     }
 }

docs/_sidebar.md

@@ -1,3 +1,7 @@
 - [首页](/)
 - [API说明](api/)  
+  - [系统管理接口](api/systemmgr.md)
+  - [设备管理接口](api/equipment.md)
+  - [节点管理接口](api/node.md)
+  - [数据访问接口](api/data.md)
 - [数据采集](datacollect/)

docs/api/_sidebar.md

@@ -1,4 +1 @@
-* [返回首页](/)
+* [返回首页](/)
-* [设备模块](equipment.md)
-* [节点模块](node.md)
-* [系统管理模块](systemmgr.md)

docs/api/data.md

@@ -0,0 +1,54 @@
+# 数据访问接口
+
+## API接口一览表
+
+| 接口分类   | 接口描述        | API接口                        | 权限                         |
+|--------|-------------|------------------------------| ---------------------------- |
+| 数据查询 | 实时数据查询   | /api/data/snapshot   |                              |
+|        | 历史区间数据查询 | /api/data/history   |        |
+|        | 历史断面数据查询 | /api/data/history/snapshot   |        |
+
+
+## 数据查询接口
+
+### 实时数据查询
+
+POST 请求接口
+
+> /api/data/snapshot
+
+请求参数
+
+
+```json
+{
+    "deviceId":"129476828342323",
+    "attributes":["power","windSpeed","dailyUsageHours","monthlyUsageHours"]
+}
+```
+入参描述
+
+| 参数名       | 参数类型 | 可选 | 描述   |
+| ------------ | -------- | ---- |------|
+| deviceId   | String   | no  | 设备ID |
+| attributes   | StringArray   | no  | 要查询实时数据的设备属性列表 |
+
+返回报文
+
+```json
+{
+	"code": 200,
+	"msg": "操作成功",
+	"success": true,
+	"data": {
+        "power": 56.2,
+        "windSpeed": 45.3,
+        "dailyUsageHours": 20,
+        "monthlyUsageHours": 78,
+        ....
+    }
+}
+```
+返参描述
+
+data 中以字典的方式，返回查询的属性的实时值。

ui/dasadmin/.env.development

@@ -6,9 +6,10 @@ VITE_BASE_PATH = './'
 
 # 代理配置（开发使用），必须在一行中
 # 本地
- # VITE_APP_PROXY=[["/api","http://10.65.57.55:8080/api"]]
+#  VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]]
 # 线上
   VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]
+  
 
 
 

ui/dasadmin/src/views/backend/auth/model/index.vue

@@ -185,13 +185,28 @@
                 <el-form-item :label="ModelAttributeFieldsEnums['attributeCode']" prop="attributeCode">
                     <el-input v-model="attributeForm.attributeCode" :placeholder="'请输入' + ModelAttributeFieldsEnums['attributeCode']"></el-input>
                 </el-form-item>
-                <el-form-item :label="ModelAttributeFieldsEnums['attributeTypeName']" prop="attributeType">
+                <div class="formRowStyle">
-                    <el-select v-model="attributeForm.attributeType" :placeholder="'请选择' + ModelAttributeFieldsEnums['attributeTypeName']">
+                    <el-form-item :label="ModelAttributeFieldsEnums['attributeTypeName']" prop="attributeType">
-                        <el-option label="模拟量" :value="138"></el-option>
+                        <el-select
-                        <el-option label="累积量" :value="139"></el-option>
+                            v-model="attributeForm.attributeType"
-                        <el-option label="离散量" :value="140"></el-option>
+                            :placeholder="'请选择' + ModelAttributeFieldsEnums['attributeTypeName']"
-                    </el-select>
+                            @change="attributeTypeChange"
-                </el-form-item>
+                        >
+                            <el-option label="模拟量" :value="138"></el-option>
+                            <el-option label="累积量" :value="139"></el-option>
+                            <el-option label="离散量" :value="140"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="ModelAttributeFieldsEnums['dataType']" prop="dataType">
+                        <el-select
+                            :disabled="!attributeForm.attributeType || attributeForm.attributeType === 140"
+                            v-model="attributeForm.dataType"
+                            :placeholder="'请选择' + ModelAttributeFieldsEnums['dataType']"
+                        >
+                            <el-option v-for="v in attributeFormDataTypeOptions" :key="v.value" :label="v.value" :value="v.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </div>
                 <el-form-item :label="ModelAttributeFieldsEnums['porder']" prop="porder">
                     <el-input v-model="attributeForm.porder" :placeholder="'请输入' + ModelAttributeFieldsEnums['porder']"></el-input>
                 </el-form-item>
@@ -201,6 +216,9 @@
                 <el-form-item :label="ModelAttributeFieldsEnums['highSpeed']" prop="highSpeed">
                     <el-checkbox v-model="attributeForm.highSpeed"></el-checkbox>
                 </el-form-item>
+                <el-form-item :label="ModelAttributeFieldsEnums['visible']" prop="visible">
+                    <el-checkbox v-model="attributeForm.visible"></el-checkbox>
+                </el-form-item>
             </el-form>
             <template #footer>
                 <el-button type="primary" @click="submitAttributeForm">提交</el-button>
@@ -278,7 +296,9 @@ import {
     ModelAttributeTableType,
     ModelServiceTableType,
     ModelServiceFieldsEnums,
+    ModelAttributeType,
     AttributeDialogTitleStateType,
+    attributeTypeDataType,
     serviceDialogTitleStateType,
     GetModelServiceType,
     GetModelAttributeType,
@@ -533,6 +553,7 @@ const getAttributeList = (type?: radioGroupType, value?: string) => {
                                     ? '离散量'
                                     : item.attributeType!,
                         highSpeed: item.highSpeed === 1,
+                        visible: item.visible === 1,
                     }
                 })
                 pageTotal.value = res.total
@@ -607,6 +628,12 @@ const delServiceForm = (data: AddModelServiceType & UpdateModelServiceType) => {
 
 const attributeVisible = ref(false)
 const attributeFormTitle = ref(AttributeDialogTitleStateType['add'])
+const attributeFormDataTypeOptions: { value: attributeTypeDataType }[] = [
+    { value: 'int4' },
+    { value: 'int8' },
+    { value: 'float4' },
+    { value: 'float8' },
+]
 const originAttributeForm: AddModelAttributeType & UpdateModelAttributeType = {
     id: null,
     iotModelId: '',
@@ -615,7 +642,9 @@ const originAttributeForm: AddModelAttributeType & UpdateModelAttributeType = {
     attributeType: null,
     porder: null,
     highSpeed: false,
-    subsystem:'',
+    subsystem: '',
+    dataType: '',
+    visible: true,
     revision: 1,
     createdBy: undefined,
     createdTime: undefined,
@@ -625,6 +654,12 @@ const originAttributeForm: AddModelAttributeType & UpdateModelAttributeType = {
 const attributeFormRef = ref<FormInstance>()
 const attributeForm = ref<AddModelAttributeType & UpdateModelAttributeType>(JSON.parse(JSON.stringify(originAttributeForm)))
 
+const attributeTypeChange = (value: ModelAttributeType) => {
+    if (value === 140) {
+        attributeForm.value.dataType = ''
+    }
+}
+
 const closeAttributeForm = () => {
     attributeVisible.value = false
     attributeForm.value = JSON.parse(JSON.stringify(originAttributeForm))
@@ -633,11 +668,12 @@ const closeAttributeForm = () => {
 const submitAttributeForm = () => {
     attributeFormRef.value?.validate((valid: boolean) => {
         if (valid) {
+            const copyFormData = JSON.parse(JSON.stringify(attributeForm.value))
+            copyFormData.highSpeed = copyFormData.highSpeed ? 1 : 0
+            copyFormData.visible = copyFormData.visible ? 1 : 0
             if (attributeFormTitle.value === AttributeDialogTitleStateType['add']) {
-                const addFormData = JSON.parse(JSON.stringify(attributeForm.value))
+                copyFormData.iotModelId = curContextMenuTreeData.value!.id!
-                addFormData.iotModelId = curContextMenuTreeData.value!.id!
+                addModelAttributeReq(copyFormData)
-                addFormData.highSpeed = addFormData.highSpeed ? 1 : 0
-                addModelAttributeReq(addFormData)
                     .then((res) => {
                         if (res.success) {
                             ElMessage.success('新增物模型属性成功')
@@ -651,9 +687,7 @@ const submitAttributeForm = () => {
                         ElMessage.error(err?.response?.data?.msg ?? '新增失败')
                     })
             } else if (attributeFormTitle.value === AttributeDialogTitleStateType['edit']) {
-                const updateForm = JSON.parse(JSON.stringify(attributeForm.value))
+                updateModelAttributeReq(copyFormData)
-                updateForm.highSpeed = updateForm.highSpeed ? 1 : 0
-                updateModelAttributeReq(updateForm)
                     .then((res) => {
                         if (res.success) {
                             ElMessage.success('修改物模型属性成功')
@@ -964,4 +998,10 @@ $paginationHeight: 32px;
         }
     }
 }
+.formRowStyle {
+    display: flex;
+    .el-select {
+        width: 184px;
+    }
+}
 </style>

ui/dasadmin/src/views/backend/auth/model/type.ts

@@ -62,8 +62,10 @@ export enum ModelAttributeFieldsEnums {
     'attributeType' = '属性类型value',
     'attributeTypeName' = '属性类型',
     'porder' = '序号',
-    'highSpeed'='是否高频',
+    'highSpeed' = '是否高频',
-    'subsystem'='子系统',
+    'subsystem' = '子系统',
+    'dataType' = '数据类型',
+    'visible'='是否可见',
     'revision' = '乐观锁',
     'createdBy' = '创建人',
     'createdTime' = '创建时间',
@@ -94,14 +96,17 @@ export type GetModelAttributeType = {
     pageNum: number
 }
 
+export type attributeTypeDataType = 'int4' | 'int8' | 'float4' | 'float8'
 export type AddModelAttributeType = {
     iotModelId: string
     attributeCode: string
     attributeName: string
     attributeType: ModelAttributeType | null
     porder: number | null
-    highSpeed:0|1|boolean
+    highSpeed: 0 | 1 | boolean
-    subsystem:string
+    subsystem: string
+    dataType: ''
+    visible: 0 | 1 | boolean
     revision: number
     createdBy?: string
     createdTime?: string