From 5e3f592be4e3368c9ba66743946f39b547ae06eb Mon Sep 17 00:00:00 2001 From: huguanghan Date: Mon, 4 Nov 2024 10:22:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9EdeviceEvent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/node/service/impl/NodeMessageServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java index 894ae726..40a7d714 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java @@ -307,8 +307,7 @@ public class NodeMessageServiceImpl implements NodeMessageService { deviceEventInfo.setDeviceName(deviceInfoCache.getDeviceName()); deviceEventInfo.setDeviceCode(deviceInfoCache.getDeviceCode()); String eventType = getEventType(item.getEventType()); - String model = dataService.iotModelMap.get(item.getDeviceId()); - log.info("物模型缓存{}",dataService.iotModelMap); + String model = dataService.deviceModelMap.get(item.getDeviceId()); if (StringUtils.isEmpty(model)){ log.debug("未查询到物模型code，设备id：{}",item.getDeviceId()); } From 56e76adb02a1d8b0dd703240dd8e408326f9445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Mon, 4 Nov 2024 10:28:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=87=E4=BB=A4desc=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A3=8E=E6=9C=BA=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/api/backend/airBlower/request.ts | 2 +- ui/dasadmin/src/views/backend/WindBlower/index.vue | 4 ++-- .../src/views/backend/equipment/airBlower/index.vue | 8 ++++++-- .../backend/equipment/equipmentManagement/control.vue | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ui/dasadmin/src/api/backend/airBlower/request.ts b/ui/dasadmin/src/api/backend/airBlower/request.ts index a2fa3dc8..93da9094 100644 --- a/ui/dasadmin/src/api/backend/airBlower/request.ts +++ b/ui/dasadmin/src/api/backend/airBlower/request.ts @@ -15,7 +15,7 @@ export const getBelongLineListReq = () => { } export const runAirBlowerReq = (data: (CommandReqType & { measType: 199 | 147 | 146 | 138 | 139 | 140 })[]) => { - return createAxios({ + return createAxios>({ url: '/api/page/turbines/windTurbinesControl', method: 'post', data: data diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue index 529057c1..453c048a 100644 --- a/ui/dasadmin/src/views/backend/WindBlower/index.vue +++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue @@ -1375,7 +1375,7 @@ const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbin type: 'warning', }).then(() => { const serviceName = sendTypeEnum[type] - const optDesc = serviceName + 1 + const optDesc = serviceName + ',设定值为：1' sendCommandReq({ deviceId: route.query.irn as string, serviceCode: type, @@ -1403,7 +1403,7 @@ const sendManualCommand = (type: 1 | 0) => { deviceId: route.query.irn as string, serviceCode: 'Locked', serviceName, - optDesc: serviceName + type, + optDesc: serviceName +',设定值为：'+ type, opValue: type, }).then((res) => { if (res.code == 200) { diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue index f92fc83c..16f5f95f 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue @@ -246,7 +246,7 @@ const airBlowerOperate = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setT deviceId: item, serviceName: sendTypeEnum[type], serviceCode: type, - optDesc: sendTypeEnum[type] + 1, + optDesc: sendTypeEnum[type] +'，设定值为：'+ 1, opValue: 1 as const, measType: 147 as const, } @@ -255,8 +255,12 @@ const airBlowerOperate = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setT runAirBlowerReq(data).then((res) => { console.log(res); - + if(res.success){ + ElMessage.success('指令发送成功') + } // ElMessage.success('操作成功') + }).catch(()=>{ + ElMessage.error('操作失败') }) } diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue index c7d1babb..db8923dd 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue @@ -192,7 +192,7 @@ const sendValue = (data: { serviceCode: string; opValue: number }, type: 146 | 1 type === 146 ? deviceServiceType146List.value.find((item) => item.value === val.serviceCode)?.label : deviceServiceType147List.value.find((item) => item.value === val.serviceCode)?.label - val.optDesc = val.serviceName + val.opValue + val.optDesc = val.serviceName +'，设定值为：'+ val.opValue sendCommandReq(val) .then((res) => { console.log(res) From 12bfebe1d6fdf60808ea88f68e44a9ca010d3bbc Mon Sep 17 00:00:00 2001 From: huguanghan Date: Mon, 4 Nov 2024 10:32:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9EdeviceEvent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/data/service/TDEngineService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java index 9b3e7fc1..4c26008e 100644 --- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java @@ -385,19 +385,19 @@ public class TDEngineService { for (DeviceEventInfo dv : list) { sb.append("E_"); sb.append(dv.getDeviceId()); - sb.append(" using event_info tags ("); + sb.append(" using event_info tags ('"); sb.append(dv.getDeviceCode()); - sb.append(","); + sb.append("','"); sb.append(dv.getDeviceName()); - sb.append(") values ("); + sb.append("') values ("); sb.append(dv.getUpdateTime()); sb.append(","); sb.append(dv.getEventId()); sb.append(","); sb.append(dv.getEventLevel()); - sb.append(","); + sb.append(",'"); sb.append(dv.getEventText()); - sb.append(","); + sb.append("',"); sb.append(dv.getConfirmed()); sb.append(","); sb.append(dv.getConfirmAccount());