web端租户接口调整

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/device/DeviceDTO.java

@@ -29,6 +29,7 @@ public class DeviceDTO extends BaseVO {
     @Schema(description = "租户Id")
     private Long tenantId;
 
+
     /**
      * 用户openid
      */

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -47,11 +47,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -149,10 +145,8 @@ public class WebGatewayImpl implements WebGateway {
         }
 
         // 执行分页查询,根据tenantId是否为空来选择不同的查询方法
-//        Page<DevInfo> devInfoPage = devInfoService.queryDevList(queryReq);
-        Page<DevInfo> devInfoPage = (queryReq.getTenantId() != null)
-                ? devInfoService.queryDevListByTenantId(queryReq)
-                : devInfoService.queryDevList(queryReq);
+        Long tenantId =  (Long) StpUtil.getSession().get(UserConstants.SA_USER_TENANT_ID);
+        Page<DevInfo> devInfoPage = devInfoService.queryDevList(queryReq, tenantId);
         // 换为目标DTO
         List<DeviceDTO> targets = CopyUtils.copyList(devInfoPage.getRecords(), DeviceDTO.class);
         return CopyUtils.copyPage(devInfoPage, targets);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/DevInfoService.java

@@ -23,9 +23,8 @@ public interface DevInfoService extends IService<DevInfo> {
 
     List<String> queryClientIdListByClientIds(List<String> devIds);
 
-    Page<DevInfo> queryDevList(DeviceListQueryReq queryReq);
+    Page<DevInfo> queryDevList(DeviceListQueryReq queryReq ,Long tenantId);
 
     DevInfo queryOneByClientId(String clientId);
 
-    Page<DevInfo> queryDevListByTenantId(DeviceListQueryReq queryReq);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -166,7 +166,7 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
     }
 
     @Override
-    public Page<DevInfo> queryDevList(DeviceListQueryReq queryReq) {
+    public Page<DevInfo> queryDevList(DeviceListQueryReq queryReq, Long tenantId) {
         Page<DevInfo> page = new Page<>(queryReq.getPageNo(), queryReq.getPageSize());
 
         // 2. 构建查询条件
@@ -180,6 +180,12 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
         if (queryReq.getOnline() != null){
             queryWrapper.eq(DevInfo::getOnline, queryReq.getOnline());
         }
+        if (queryReq.getTenantId() != null){
+            queryWrapper.eq(DevInfo::getTenantId, queryReq.getTenantId());
+        }
+        if (tenantId !=  null){
+            queryWrapper.eq(DevInfo::getTenantId, tenantId);
+        }
 
         // 3. 添加日期条件
         if (Objects.nonNull(queryReq.getCreateTimeStart())) {
@@ -201,39 +207,4 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
         return this.baseMapper.selectOne(wrapper);
     }
 
-    @Override
-    public Page<DevInfo> queryDevListByTenantId(DeviceListQueryReq queryReq) {
-        Page<DevInfo> page = new Page<>(queryReq.getPageNo(), queryReq.getPageSize());
-
-        // 2. 构建查询条件
-        LambdaQueryWrapper<DevInfo> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.hasText(queryReq.getClientId())) {
-            queryWrapper.like(DevInfo::getClientId, queryReq.getClientId());
-        }
-        if (StringUtils.hasText(queryReq.getDevName())) {
-            queryWrapper.like(DevInfo::getDevName, queryReq.getDevName());
-        }
-        if (queryReq.getOnline() != null) {
-            queryWrapper.eq(DevInfo::getOnline, queryReq.getOnline());
-        }
-
-        // 3. 添加日期条件
-        if (Objects.nonNull(queryReq.getCreateTimeStart())) {
-            queryWrapper.ge(DevInfo::getCreateTime, queryReq.getCreateTimeStart());
-        }
-        if (Objects.nonNull(queryReq.getCreateTimeEnd())) {
-            queryWrapper.lt(DevInfo::getCreateTime, queryReq.getCreateTimeEnd().plusDays(1));
-        }
-
-        // 4. 添加 tenantId 条件
-        if (queryReq.getTenantId() != null) {
-            queryWrapper.eq(DevInfo::getTenantId, queryReq.getTenantId());
-        }
-
-        // 5. 设置排序
-        queryWrapper.orderByDesc(DevInfo::getCreateTime);
-
-        // 6. 执行查询
-        return this.baseMapper.selectPage(page, queryWrapper);
-    }
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/TblTenantServiceImpl.java

@@ -50,7 +50,7 @@ public class TblTenantServiceImpl extends ServiceImpl<TblTenantMapper, TblTenant
         }
 
         // 4. 设置排序
-        queryWrapper.orderByDesc(TblTenant::getCreateTime);
+        queryWrapper.orderByAsc(TblTenant::getSort);
         return this.baseMapper.selectPage(page, queryWrapper);
     }
 }