手持表切换租户查询

cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/service/impl/TdengineServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.hand.vo.AlarmMessageLog;
 import cn.iocoder.yudao.module.hand.dal.HandDetectorDO;
 import cn.iocoder.yudao.module.hand.mapper.TdengineMapper;
@@ -77,10 +78,8 @@ public class TdengineServiceImpl implements TdengineService {
     @Override
     public PageResult<TdengineDataVo> getHandDataLog(HandTdenginePageVO pageReqVO) {
         IPage<TdengineDataVo> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        LoginUser loginUser = getLoginUser();
-        if (loginUser != null){
-            pageReqVO.setTenantId(loginUser.getTenantId());
-        }
+        Long tenantId = TenantContextHolder.getTenantId();
+        pageReqVO.setTenantId(tenantId);
         IPage<TdengineDataVo> resultPage = tdengineMapper.selectPage(page, pageReqVO);
 
         List<TdengineDataVo> doList = resultPage.getRecords();
@@ -96,10 +95,8 @@ public class TdengineServiceImpl implements TdengineService {
     public PageResult<HandOriginalLog> getOriginalLogPage(HandTdenginePageVO pageReqVO) {
         IPage<HandOriginalLog> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
-        LoginUser loginUser = getLoginUser();
-        if (loginUser != null){
-            pageReqVO.setTenantId(loginUser.getTenantId());
-        }
+        Long tenantId = TenantContextHolder.getTenantId();
+        pageReqVO.setTenantId(tenantId);
         IPage<HandOriginalLog> resultPage = tdengineMapper.selectOriginalPage(page, pageReqVO);
 
         List<HandOriginalLog> doList = resultPage.getRecords();
@@ -113,10 +110,8 @@ public class TdengineServiceImpl implements TdengineService {
     @Override
     public List<TdengineDataVo> HistoricalSn(HandTdenginePo po) {
 
-        LoginUser loginUser = getLoginUser();
-        if (loginUser != null){
-            po.setTenantId(loginUser.getTenantId());
-        }
+        Long tenantId = TenantContextHolder.getTenantId();
+        po.setTenantId(tenantId);
        return tdengineMapper.HistoricalSn(po);
     }
 
@@ -134,10 +129,8 @@ public class TdengineServiceImpl implements TdengineService {
 
         IPage<AlarmMessageLog> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
-        LoginUser loginUser = getLoginUser();
-        if (loginUser != null){
-            pageReqVO.setTenantId(loginUser.getTenantId());
-        }
+        Long tenantId = TenantContextHolder.getTenantId();
+        pageReqVO.setTenantId(tenantId);
         IPage<AlarmMessageLog> resultPage = tdengineMapper.selectMessagePage(page, pageReqVO);
 
         List<AlarmMessageLog> doList = resultPage.getRecords();