From 2da0b65971ea1ef4af2858b42c01758a58129ff6 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 23 Aug 2024 17:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=89=A9=E5=85=B3=E7=B3=BB=E7=9A=84=E8=B0=83=E6=95=B4?= =?UTF-8?q?=202024=E5=B9=B48=E6=9C=8823=E6=97=A517:08:55?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eq/eqbxwx/service/impl/EqBxServiceImpl.java | 3 ++- .../service/impl/IotThingsServiceImpl.java | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/equipment/src/main/java/com/thing/eq/eqbxwx/service/impl/EqBxServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqbxwx/service/impl/EqBxServiceImpl.java index 6dffb9f..0e4d8f5 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqbxwx/service/impl/EqBxServiceImpl.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqbxwx/service/impl/EqBxServiceImpl.java @@ -28,6 +28,7 @@ import com.thing.sys.biz.mapper.SysDeptMapper; import com.thing.sys.biz.mapper.SysUserMapper; import com.thing.sys.biz.service.SysUserService; import com.thing.sys.security.context.TenantContext; +import com.thing.sys.security.context.UserContext; import com.thing.sys.security.domain.SecurityUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -256,7 +257,7 @@ public class EqBxServiceImpl extends BaseServiceImpl imp lastNo = SerialNumberUnit.generateNumber("BX", eqBxEntity.getBxNo()); dto.setBxNo(lastNo); - dto.setTenantCode(SecurityUser.getTenantCode()); + dto.setTenantCode(UserContext.getRealTenantCode()); // Long eqBxId = IdWorker.getId(); // dto.setId(eqBxId); diff --git a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java index 5edce9d..88281bf 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java @@ -393,9 +393,19 @@ public class IotThingsServiceImpl implements IotThingsService { @Override public EqDTO getInfo(Long id) { + EqDTO info = new EqDTO(); //获取设备 - IotThingEntity eq = iotThingEntityDao.selectOneById(id); + + IotThingBaseInfoEntity baseInfoEntity = iotThingBaseInfoService.getById(id); + if (baseInfoEntity==null){ + return null; + } + Long thingId = baseInfoEntity.getThingId(); + if (thingId==null){ + return null; + } + IotThingEntity eq = iotThingEntityDao.selectOneById(thingId); if (eq==null){ return null; } @@ -411,8 +421,7 @@ public class IotThingsServiceImpl implements IotThingsService { info.setUpdateDate(eq.getUpdateDate()); // BeanUtils.copyProperties(eq,info); //获取设备基础信息 - IotThingBaseInfoDTO baseInfoDTO = iotThingBaseInfoService.getByThingsId(id); - BeanUtils.copyProperties(baseInfoDTO,info); + BeanUtils.copyProperties(baseInfoEntity,info); List imageUrls = new ArrayList<>(); List attachmentUrls = new ArrayList<>();