From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/java/com/zy/common/web/BaseController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 995c3d9..d3ef2f5 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -121,6 +121,14 @@
// 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
+ // 鍒涘缓涓�涓复鏃秏ap锛屾帓闄ondition鍙傛暟鍜屽垎椤垫帓搴忓弬鏁�
+ Map<String, Object> tempMap = new HashMap<>(map);
+ tempMap.remove("condition");
+ tempMap.remove("curr");
+ tempMap.remove("limit");
+ tempMap.remove("orderByField");
+ tempMap.remove("orderByType");
+
for (Field field : Cools.getAllFields(cls)){
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
@@ -134,7 +142,7 @@
if (Cools.isEmpty(column)) {
column = field.getName();
}
- if (!map.keySet().contains(column)) {
+ if (!tempMap.keySet().contains(column)) {
columns.add(column);
}
}
@@ -154,6 +162,14 @@
if (Cools.isEmpty(condition)) {
return;
}
+ // 鍒涘缓涓�涓柊鐨勯泦鍚堬紝鎺掗櫎condition鍙傛暟鏈韩
+ Set<String> excludeSet = new HashSet<>(set);
+ excludeSet.remove("condition");
+ excludeSet.remove("curr");
+ excludeSet.remove("limit");
+ excludeSet.remove("orderByField");
+ excludeSet.remove("orderByType");
+
List<String> columns = new ArrayList<>();
for (Field field :Cools.getAllFields(cls)){
if (Modifier.isFinal(field.getModifiers())
@@ -168,7 +184,7 @@
if (Cools.isEmpty(column)) {
column = field.getName();
}
- if (!set.contains(column)) {
+ if (!excludeSet.contains(column)) {
columns.add(column);
}
}
--
Gitblit v1.9.1