From 4d96ab1845b16a9da1642a57dba22690f4b2474b Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 4 Mar 2024 10:55:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cac/service/impl/NSensorServiceImpl.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java index 893ebaa..23acfaf 100644 --- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java @@ -72,6 +72,15 @@ public class NSensorServiceImpl implements NSensorService { } } + private void fillOtherName(NSensor sensor) throws Exception { + ModevType modevType = modevTypeService.detail(sensor.getTypeId()); + sensor.setTableName(modevType.getTablename()); + sensor.setTypeName(modevType.getMc()); + Zsb zsb = zsbService.detail(sensor.getZsbId()); + sensor.setZsbName(zsb.getMc()); + } + + @Override public Page list(int pageNum, int pageSize) throws Exception { PageRequest request = PageRequest.of(pageNum, pageSize); @@ -116,12 +125,16 @@ public class NSensorServiceImpl implements NSensorService { throw new BusinessException("未找到该装置"); } NSensor sensor = optional.get(); - if (StringUtils.isBlank(sensor.getTableName())) { - throw new BusinessException("该装置缺少table_name信息"); + if (sensor.getTypeId() == null) { + throw new BusinessException("该装置缺少类型id信息"); } if (sensor.getDevId() == null) { throw new BusinessException("该装置缺少dev_id信息"); } + this.fillOtherName(sensor); + if (StringUtils.isBlank(sensor.getTableName())) { + throw new BusinessException("该装置类型" + sensor.getTypeName() + "缺少table_name信息"); + } List points = pointRepository.findBySensorIdAndType(sensor.getId(), YaoCe); if (CollectionUtils.isEmpty(points)) { throw new BusinessException("该装置缺少属性点表信息");