From 98b901e6ab1bbcdf31c48afa57e2da4365564180 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 6 Jan 2025 18:09:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/access/service/impl/CsDevModelServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index 3fd9b5f..5f32d14 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -91,6 +91,12 @@ public class CsDevModelServiceImpl implements ICsDevModelService { json = JsonUtil.convertStreamToString(file.getInputStream()); Gson gson = new Gson(); TemplateDto templateDto = gson.fromJson(json, TemplateDto.class); + //判断设备型号 + String devType = templateDto.getDevType(); + DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode(devType).getData(); + if (Objects.isNull(dictTreeVO)){ + throw new BusinessException(AccessResponseEnum.DEV_TYPE_NOT_FIND); + } logDto.setOperate("新增设备模板,模板名称:" + templateDto.getDevType()); //模板文件存入文件服务器 String filePath = fileStorageUtil.uploadMultipart(file, OssPath.DEV_MODEL + templateDto.getDevType() + "_"); @@ -838,9 +844,6 @@ public class CsDevModelServiceImpl implements ICsDevModelService { List dataSetList = templateDto.getDataSet(); String devType = templateDto.getDevType(); DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode(devType).getData(); - if (Objects.isNull(dictTreeVO)){ - throw new BusinessException(AccessResponseEnum.DEV_TYPE_NOT_FIND); - } String code = dictTreeFeignClient.queryById(dictTreeVO.getPid()).getData().getCode(); //逻辑设备录入 if (CollectionUtil.isNotEmpty(dataSetList)){