From fbed36dfc26fb55f7ee3da9225a0f66798f75679 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Tue, 28 Jul 2026 15:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E7=82=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=A4=9A=E9=A1=B9=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/appmana/controller/DataCenterController.java | 1 - .../modules/appmana/service/impl/CommonServiceImpl.java | 5 +++++ .../system/applet/controller/SurvAlertRecordController.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/DataCenterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/DataCenterController.java index 3c3eed0..9d4e1c7 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/DataCenterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/DataCenterController.java @@ -85,7 +85,6 @@ public class DataCenterController { @PostMapping(value = "/deviceAlertStatistic") public Result deviceAlertStatistic(@RequestBody SurvSummaryDTO survSummaryDTO) { - survSummaryDTO.setTenantId(TenantContext.getTenant()); SurvSummaryVo survSummaryVo = commonService.getSurvSummary(survSummaryDTO); return Result.OK(survSummaryVo); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java index 07af13c..830630e 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java @@ -12,6 +12,7 @@ import org.jeecg.common.constant.enums.PollutionEnum; import org.jeecg.common.dto.CommonDTO; import org.jeecg.common.dto.SurvSummaryDTO; import org.jeecg.common.entity.*; +import org.jeecg.common.tenant.TenantContextHolder; import org.jeecg.common.util.*; import org.jeecg.common.vo.VOHisResult; import org.jeecg.common.vo.iot.common.SurvItemInfo; @@ -473,6 +474,10 @@ public class CommonServiceImpl { public SurvSummaryVo getSurvSummary(SurvSummaryDTO survSummaryDTO) { + if(StringUtils.isNotBlank(survSummaryDTO.getTenantId())){ + TenantContext.setTenant(survSummaryDTO.getTenantId()); + } + SurvSummaryVo survSummaryVo = new SurvSummaryVo(); Map itemInfo = new HashMap<>(); List itemList = new ArrayList<>(); diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java index d19a529..5405873 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java @@ -11,6 +11,7 @@ import org.jeecg.system.applet.annotation.ApiLogin; import org.jeecg.system.applet.client.ZhAdminFeignClient; import org.jeecg.system.applet.dto.AlertSummaryDTO; import org.jeecg.system.applet.service.ISurvAlertRecordService; +import org.jeecg.system.applet.util.TenantUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -43,6 +44,8 @@ public class SurvAlertRecordController { @PostMapping(value = "/alertSummary") @ApiLogin public R alertSummary(@RequestBody SurvSummaryDTO survSummaryDTO) { + String tenantId = TenantUtil.getCurTenant(null); + survSummaryDTO.setTenantId(tenantId); SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO); return R.ok(survSummaryVo); }