From 93250718a9c304b857be8ad515bdf38e35dcd442 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 17 May 2024 10:51:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imdroid/beidou/controller/IndexController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index 15c85257..0a1ab1f8 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -1,9 +1,9 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; import com.imdroid.beidou.entity.Tenant; import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; @@ -110,8 +110,11 @@ public class IndexController extends BasicController{ @ResponseBody public JSONObject list(HttpSession session, Integer page, Integer limit) { Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("tenantid",Tenant.SAAS_PROVIDER_ID); + MPJQueryWrapper queryWrapper = new MPJQueryWrapper<>(); + queryWrapper.selectAll(GnssStatus.class) + .leftJoin("gnssdevices d on t.deviceid = d.deviceid") + .ne("d.tenantid",Tenant.SAAS_PROVIDER_ID) + .eq("opmode",GnssDevice.OP_MODE_USE); String query = (String) session.getAttribute("query"); if(query != null){ if(query.equals("offline")){