From 7f188b08fe6af48efe7639437da062ffd1fe5961 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 18 Jun 2024 11:28:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9C=AA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9B=91=E6=B5=8B=E7=B1=BB=E5=9E=8B=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xydl/cac/controller/I2syncController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xydl/cac/controller/I2syncController.java b/src/main/java/com/xydl/cac/controller/I2syncController.java index 4892dd3..385ba9c 100644 --- a/src/main/java/com/xydl/cac/controller/I2syncController.java +++ b/src/main/java/com/xydl/cac/controller/I2syncController.java @@ -1,5 +1,6 @@ package com.xydl.cac.controller; +import com.alibaba.excel.util.StringUtils; import com.xydl.cac.entity.I2syncConfig; import com.xydl.cac.entity.I2syncField; import com.xydl.cac.entity.I2syncRecord; @@ -11,6 +12,7 @@ import com.xydl.cac.model.i2sync.Datanode; import com.xydl.cac.model.i2sync.Monitordata; import com.xydl.cac.model.i2sync.Request; import com.xydl.cac.service.I2syncService; +import com.xydl.cac.util.DataTable; import com.xydl.cac.util.DateUtil; import com.xydl.cac.util.JSONUtil; import io.swagger.annotations.Api; @@ -103,7 +105,7 @@ public class I2syncController extends BasicController { } Datanode node = new Datanode(); node.setSensorid("HNHFT001Q1W000104"); - node.setType("027002"); + node.setType(DataTable.getDevType(tablename)); node.setEquipmentid("HNHFT001Q1W000104"); node.setTimestamp(DateUtil.format(new Date())); node.setAttr(attrs); @@ -116,7 +118,11 @@ public class I2syncController extends BasicController { Request request = new Request(); request.setMonitordata(monitordata); String xml = JSONUtil.object2Xml(request); - return Response.success(xml); + Response resp = Response.success(xml); + if (StringUtils.isBlank(node.getType())) { + resp.setWarnMsg("改类型还未配置对应的监测类型编码"); + } + return resp; } }