From b74b08d18d677b0f4a85db49a7fe719302a881ba Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Mon, 1 Dec 2025 16:00:10 +0800 Subject: [PATCH] =?UTF-8?q?getRiliDeviceInfo=E5=A2=9E=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml | 2 +- .../datacenter/business/service/impl/CommonServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml index c6228a2..3022f2f 100644 --- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml +++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml @@ -471,7 +471,7 @@ from device_info left join type on device_info.type_id = type.id - where device_info.flag = 0 + where device_info.flag = 0 AND device_info.company_id = #{companyId} AND device_info.device_id IN diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java index 34301e9..09cf740 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java @@ -1434,6 +1434,10 @@ public class CommonServiceImpl implements CommonService { return SimpleDataResponse.fail(ResponseCode.MSG_ERROR, "Apikey is invalid", new ArrayList<>()); } + Map companySearchMap = new HashMap<>(); + companySearchMap.put("apikey", apikey); + ApikeyInfo2 selfCompanyInfo = basicCompanyMapperExt.getAuroraInfoByApikey(companySearchMap); + DataSourceContextHolder.clearCurrentDataSourceKey(); DataSourceContextHolder.setCurrentDataSourceKey(Constants.DATASOURCE_PREFIX+ apikeyInfo.getId()); @@ -1473,6 +1477,7 @@ public class CommonServiceImpl implements CommonService { if (deviceIdList.size() > 0) { Map paramMap = new HashMap<>(); paramMap.put("deviceIdList", deviceIdList); + paramMap.put("companyId", selfCompanyInfo.getId()); dpfDeviceInfoVOs = deviceInfoMapperExt.getRiliDeviceInfo(paramMap); // Retrieve the set of DeviceId from DeviceInfoVOs