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-05-28 15:03:15 +08:00
parent 1bbe31c62b
commit cbaee8600f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
View File

@ -337,12 +337,12 @@ public class GnssDeviceController extends BasicController{
JSONObject search = (JSONObject) JSONObject.parse(searchParams); JSONObject search = (JSONObject) JSONObject.parse(searchParams);
//设备号 //设备号
String deviceid = search.getString("deviceid"); String deviceid = search.getString("deviceid");
if (!StringUtils.hasText(deviceid)) { if (!StringUtils.isEmpty(deviceid)) {
queryWrapper.like("deviceid", deviceid); queryWrapper.like("deviceid", deviceid);
} }
//父设备号 //父设备号
String parentid = search.getString("parentid"); String parentid = search.getString("parentid");
if (!StringUtils.hasText(parentid)) { if (!StringUtils.isEmpty(parentid)) {
queryWrapper.like("parentid", parentid); queryWrapper.like("parentid", parentid);
} }
//设备类型 //设备类型

12
sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
View File

@ -47,7 +47,7 @@ public interface CommonExcelService<T, R> {
*/ */
default AbstractWrapper prepareQueryWrapper() { default AbstractWrapper prepareQueryWrapper() {
QueryWrapper<T> queryWrapper = new QueryWrapper<>(); QueryWrapper<T> queryWrapper = new QueryWrapper<>();
if (!StringUtils.hasText(getOrderByColumn())) { if (!StringUtils.isEmpty(getOrderByColumn())) {
if ("desc".equals(getOrder())) { if ("desc".equals(getOrder())) {
queryWrapper.orderByDesc(getOrderByColumn()); queryWrapper.orderByDesc(getOrderByColumn());
} else { } else {
@ -192,19 +192,19 @@ public interface CommonExcelService<T, R> {
*/ */
default void setQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) { default void setQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) {
// String // String
if (paraName.startsWith("s") && !StringUtils.hasText((String)paraValue)) { if (paraName.startsWith("s") && !StringUtils.isEmpty(paraValue)) {
addStringQueryWrapper(queryWrapper, paraName, paraValue); addStringQueryWrapper(queryWrapper, paraName, paraValue);
} }
// Number // Number
else if (paraName.startsWith("n") && !StringUtils.hasText((String)paraValue)) { else if (paraName.startsWith("n") && !StringUtils.isEmpty(paraValue)) {
addNumberQueryWrapper(queryWrapper, paraName, paraValue); addNumberQueryWrapper(queryWrapper, paraName, paraValue);
} }
// Date & Time // Date & Time
else if (paraName.startsWith("d") && !StringUtils.hasText((String)paraValue)) { else if (paraName.startsWith("d") && !StringUtils.isEmpty(paraValue)) {
addDateQueryWrapper(queryWrapper, paraName, paraValue); addDateQueryWrapper(queryWrapper, paraName, paraValue);
} }
// Boolean // Boolean
else if (paraName.startsWith("b") && !StringUtils.hasText((String)paraValue)) { else if (paraName.startsWith("b") && !StringUtils.isEmpty(paraValue)) {
addBooleanQueryWrapper(queryWrapper, paraName, paraValue); addBooleanQueryWrapper(queryWrapper, paraName, paraValue);
} }
} }
@ -216,7 +216,7 @@ public interface CommonExcelService<T, R> {
default void addStringQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) { default void addStringQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) {
String column = getColumn(paraName); String column = getColumn(paraName);
String value = paraValue.toString(); String value = paraValue.toString();
if (StringUtils.hasText(value)) { if (StringUtils.isEmpty(value)) {
return; return;
} }
if (paraName.startsWith("s_")) { if (paraName.startsWith("s_")) {