Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、优化解算结果的查询

Browse Source
This commit is contained in:
weidong 2024-03-10 07:46:13 +08:00
parent 025b947b31
commit 3a2cba9e43
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
View File

@ -1,7 +1,6 @@
package com.imdroid.beidou.controller; package com.imdroid.beidou.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.query.MPJQueryWrapper; import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.entity.Tenant; import com.imdroid.beidou.entity.Tenant;
@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@ -51,12 +49,6 @@ public class GnssCalcDataController extends BasicController implements CommonExc
isJoinQuery = searchParams.contains("parentid"); isJoinQuery = searchParams.contains("parentid");
} }
else isJoinQuery = false; else isJoinQuery = false;
QueryWrapper<GnssCalcData> queryWrapper = new QueryWrapper<>();
queryWrapper.last("limit "+limit);
queryWrapper.orderByDesc("createtime");
logger.info("gnss calc data query begin... ");
List<GnssCalcData> gnssCalcDataList = dataMapper.selectList(queryWrapper);
logger.info("gnss calc data query done with count={}",gnssCalcDataList.size());
logger.info("gnss calc data query begin...join={} ",isJoinQuery); logger.info("gnss calc data query begin...join={} ",isJoinQuery);
JSONObject result = this.pageList(session, page, limit, searchParams); JSONObject result = this.pageList(session, page, limit, searchParams);
logger.info("gnss calc data query done."); logger.info("gnss calc data query done.");
@ -99,10 +91,17 @@ public class GnssCalcDataController extends BasicController implements CommonExc
@Override @Override
public MPJQueryWrapper<GnssCalcData> prepareQueryWrapper() { public MPJQueryWrapper<GnssCalcData> prepareQueryWrapper() {
return new MPJQueryWrapper<GnssCalcData>() if(isJoinQuery) {
.selectAll(GnssCalcData.class) return new MPJQueryWrapper<GnssCalcData>()
.leftJoin("gnssdevices d on t.deviceid = d.deviceid") .selectAll(GnssCalcData.class)
.orderByDesc("t.createtime"); .leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.orderByDesc("t.createtime");
}
else{
return new MPJQueryWrapper<GnssCalcData>()
.selectAll(GnssCalcData.class)
.orderByDesc("createtime");
}
} }
/** /**