Parcourir la source

优化门禁_设备信息表-列表接口,新增domain域名刷选条件,增加未登录情况下获取门禁设备信息

james il y a 4 mois
Parent
commit
099de41d0f

+ 8 - 1
service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgDeviceServiceImpl.java

@@ -55,13 +55,20 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
     @Override
     public CommonPage<EgDevice> page(EgDeviceRequestVO requestVO){
         IPage<EgDevice> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
+        Integer tenantId ;
+
+        if(StringUtils.isNotBlank(requestVO.getDomain())){
+            tenantId = egDeviceMapper.sysTenantId(requestVO.getDomain());
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
 
         LambdaQueryWrapper<EgDevice> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(requestVO.getDeviceName()),EgDevice::getDeviceName,requestVO.getDeviceName())
                 .like(StringUtils.isNotBlank(requestVO.getInstallAddress()),EgDevice::getInstallAddress,requestVO.getInstallAddress())
                 .eq(null != requestVO.getServiceStatus(),EgDevice::getServiceStatus,requestVO.getServiceStatus())
                 .eq(null != requestVO.getId(),EgDevice::getId,requestVO.getId())
-                .eq(EgDevice::getTenantId,SecurityUtils.getTenantId())
+                .eq(EgDevice::getTenantId,tenantId)
                 .orderByDesc(EgDevice::getId);
         page = this.page(page,queryWrapper);
         if(page.getRecords().size() > 0){

+ 4 - 0
service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceRequestVO.java

@@ -36,4 +36,8 @@ public class EgDeviceRequestVO implements Serializable {
      */
     private Integer id;
 
+    /**
+     * 域名
+     */
+    private String domain;
 }