From f574055ed80a64cbccd601b200afc437a87b52eb Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 07 二月 2026 16:03:39 +0800
Subject: [PATCH] RCS入库流程优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 197 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 192 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index e116812..c3eb876 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -7,7 +7,12 @@
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.DateUtils;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.*;
@@ -16,11 +21,13 @@
/**
* Created by vincent on 2/13/2024
*/
+@Slf4j
public class PageParam<T, U extends BaseParam> extends Page<T> {
private static final long serialVersionUID = 1L;
public static final String ORDER_DESC_VALUE = "desc";
+ @Getter
private final U where;
/**
@@ -29,6 +36,12 @@
private final boolean isToUnderlineCase;
private final Class<T> cls;
+
+ /**
+ * 棰濆鐨勫瓧娈甸獙璇佺被鍒楄〃锛堢敤浜庢敮鎸� DTO銆乂O 绛夌被鐨勫瓧娈甸獙璇侊級
+ */
+ @SuppressWarnings("unused")
+ private List<Class<?>> additionalFieldClasses;
public PageParam() {
this(null);
@@ -80,7 +93,9 @@
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
Object val = map.get(key);
-
+ if (Cools.isEmpty(val)){
+ continue;
+ }
if (key.contains("Range")) {
ArrayList<String> list = null;
if (val instanceof ArrayList) {
@@ -125,7 +140,13 @@
if (!Cools.isEmpty(where.getOrderBy())) {
if (sortIsSQL(where.getOrderBy())) {
- setOrders(parseOrderSQL(where.getOrderBy()));
+ List<OrderItem> orders = parseOrderSQL(where.getOrderBy());
+ // 濡傛灉鎵�鏈夋帓搴忓瓧娈甸兘鏃犳晥锛屼娇鐢ㄩ粯璁ゆ帓搴�
+ if (orders.isEmpty()) {
+ queryWrapper.orderByDesc("create_time");
+ } else {
+ setOrders(orders);
+ }
}
} else {
// queryWrapper.orderByDesc("create_time");
@@ -173,7 +194,9 @@
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
Object val = map.get(key);
-
+ if (Cools.isEmpty(val)){
+ continue;
+ }
if (key.contains("Range")) {
ArrayList<String> list = null;
if (val instanceof ArrayList) {
@@ -215,7 +238,13 @@
if (!Cools.isEmpty(where.getOrderBy())) {
if (sortIsSQL(where.getOrderBy())) {
- setOrders(parseOrderSQL(where.getOrderBy()));
+ List<OrderItem> orders = parseOrderSQL(where.getOrderBy());
+ // 濡傛灉鎵�鏈夋帓搴忓瓧娈甸兘鏃犳晥锛屼娇鐢ㄩ粯璁ゆ帓搴�
+ if (orders.isEmpty()) {
+ queryWrapper.orderByDesc("create_time");
+ } else {
+ setOrders(orders);
+ }
}
} else {
// queryWrapper.orderByDesc("create_time");
@@ -276,18 +305,176 @@
private List<OrderItem> parseOrderSQL(String orderSQL) {
List<OrderItem> orders = new ArrayList<>();
if (!Cools.isEmpty(orderSQL)) {
+ // 鑾峰彇瀹炰綋绫荤殑鏈夋晥瀛楁鍒楄〃
+ Set<String> validColumns = getValidColumns();
+
for (String item : orderSQL.split(",")) {
String[] temp = item.trim().split(" ");
if (!temp[0].isEmpty()) {
String column = this.isToUnderlineCase ? Utils.toSymbolCase(temp[0], '_') : temp[0];
+ // 楠岃瘉瀛楁鏄惁瀛樺湪锛屽鏋滀笉瀛樺湪鍒欒烦杩�
+ if (validColumns != null && !validColumns.isEmpty() && !validColumns.contains(column)) {
+ // 璺宠繃鏃犳晥鐨勬帓搴忓瓧娈�
+// String requestInfo = getRequestInfo();
+// log.warn("璺宠繃鏃犳晥鐨勬帓搴忓瓧娈�: '{}' (鍘熷鍊�: '{}')锛屽疄浣撶被: {}锛岃姹傚湴鍧�: {}",
+// column, temp[0], cls != null ? cls.getSimpleName() : "null", requestInfo);
+ continue;
+ }
+ // 妫�鏌ュ疄浣撶被瀛楁鐨� @TableField 娉ㄨВ锛屽鏋滃瓧娈垫槸淇濈暀鍏抽敭瀛楋紝浣跨敤娉ㄨВ涓寚瀹氱殑鍒楀悕锛堝甫鍙嶅紩鍙凤級
+ String dbColumn = getDbColumnName(column);
boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
- orders.add(new OrderItem(column, asc));
+ orders.add(new OrderItem(dbColumn, asc));
}
}
}
return orders;
}
+ /**
+ * 鑾峰彇鏁版嵁搴撳垪鍚嶏紝濡傛灉鏄繚鐣欏叧閿瓧鍒欐坊鍔犲弽寮曞彿
+ * @param fieldName 瀛楁鍚嶏紙涓嬪垝绾挎牸寮忥級
+ * @return 鏁版嵁搴撳垪鍚�
+ */
+ private String getDbColumnName(String fieldName) {
+ if (cls == null) {
+ // 濡傛灉娌℃湁瀹炰綋绫伙紝妫�鏌ユ槸鍚︽槸甯歌鐨勪繚鐣欏叧閿瓧
+ return wrapReservedKeyword(fieldName);
+ }
+
+ // 鏌ユ壘瀹炰綋绫讳腑瀵瑰簲鐨勫瓧娈�
+ for (Field field : Cools.getAllFields(cls)) {
+ String column = Utils.toSymbolCase(field.getName(), '_');
+ if (column.equals(fieldName)) {
+ // 妫�鏌ユ槸鍚︽湁 @TableField 娉ㄨВ
+ if (field.isAnnotationPresent(TableField.class)) {
+ TableField annotation = field.getAnnotation(TableField.class);
+ String value = annotation.value();
+ // 濡傛灉娉ㄨВ鍊间笉涓虹┖锛屼娇鐢ㄦ敞瑙ｅ�硷紙鍙兘宸茬粡鍖呭惈鍙嶅紩鍙凤級
+ if (!Cools.isEmpty(value) && !value.equals(fieldName)) {
+ return value;
+ }
+ }
+ // 濡傛灉娌℃湁娉ㄨВ鎴栨敞瑙ｅ�间负绌猴紝妫�鏌ユ槸鍚︽槸淇濈暀鍏抽敭瀛�
+ return wrapReservedKeyword(fieldName);
+ }
+ }
+
+ // 濡傛灉鎵句笉鍒板瓧娈碉紝妫�鏌ユ槸鍚︽槸淇濈暀鍏抽敭瀛�
+ return wrapReservedKeyword(fieldName);
+ }
+
+ /**
+ * 濡傛灉鏄� MySQL 淇濈暀鍏抽敭瀛楋紝鍒欐坊鍔犲弽寮曞彿
+ * @param column 鍒楀悕
+ * @return 澶勭悊鍚庣殑鍒楀悕
+ */
+ private String wrapReservedKeyword(String column) {
+ // MySQL 甯歌淇濈暀鍏抽敭瀛楀垪琛�
+ Set<String> reservedKeywords = new HashSet<>(Arrays.asList(
+ "row", "type", "length", "channel", "status", "order", "group", "key", "index",
+ "table", "database", "user", "select", "insert", "update", "delete", "from", "where"
+ ));
+
+ if (reservedKeywords.contains(column.toLowerCase())) {
+ return "`" + column + "`";
+ }
+ return column;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠璇锋眰淇℃伅锛堣矾寰勫拰鏂规硶锛�
+ * @return 璇锋眰淇℃伅瀛楃涓诧紝鏍煎紡锛欻TTP鏂规硶 璇锋眰璺緞
+ */
+ private String getRequestInfo() {
+ try {
+ ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ if (attributes != null) {
+ HttpServletRequest request = attributes.getRequest();
+ if (request != null) {
+ String method = request.getMethod();
+ String uri = request.getRequestURI();
+ return String.format("%s %s", method, uri);
+ }
+ }
+ } catch (Exception e) {
+ // 蹇界暐寮傚父锛岄伩鍏嶅奖鍝嶄富娴佺▼
+ log.debug("鑾峰彇璇锋眰淇℃伅澶辫触: {}", e.getMessage());
+ }
+ return "鏈煡";
+ }
+
+ /**
+ * 鑾峰彇瀹炰綋绫荤殑鏈夋晥瀛楁鍒楄〃锛堢敤浜庨獙璇佹帓搴忓瓧娈碉級
+ * 鍖呮嫭锛氬疄浣撶被瀛楁銆佷互鍙婇澶栨寚瀹氱殑DTO/VO绫诲瓧娈�
+ * 娉ㄦ剰锛欱aseParam 鐨勫瓧娈垫槸鏌ヨ鍙傛暟锛屼笉鐢ㄤ簬鏁版嵁搴撳瓧娈甸獙璇�
+ */
+ private Set<String> getValidColumns() {
+ Set<String> columns = new HashSet<>();
+
+ // 1. 鑾峰彇瀹炰綋绫伙紙cls锛夌殑瀛楁
+ if (cls != null) {
+ addFieldsFromClass(cls, columns);
+ }
+
+ // 2. 鑾峰彇棰濆鎸囧畾鐨勭被锛圖TO/VO绛夛級鐨勫瓧娈�
+ if (additionalFieldClasses != null && !additionalFieldClasses.isEmpty()) {
+ for (Class<?> clazz : additionalFieldClasses) {
+ addFieldsFromClass(clazz, columns);
+ }
+ }
+
+ return columns.isEmpty() ? null : columns;
+ }
+
+ /**
+ * 浠庢寚瀹氱被涓彁鍙栧瓧娈靛苟娣诲姞鍒伴泦鍚堜腑
+ * @param clazz 瑕佹彁鍙栧瓧娈电殑绫�
+ * @param columns 瀛楁闆嗗悎
+ */
+ private void addFieldsFromClass(Class<?> clazz, Set<String> columns) {
+ for (Field field : Cools.getAllFields(clazz)) {
+ // 璺宠繃 final銆乻tatic銆乼ransient 瀛楁
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())) {
+ continue;
+ }
+
+ // 璺宠繃鏍囪涓� exist=false 鐨勫瓧娈碉紙杩欎簺瀛楁涓嶅瓨鍦ㄤ簬鏁版嵁搴撲腑锛�
+ if (field.isAnnotationPresent(TableField.class)) {
+ TableField annotation = field.getAnnotation(TableField.class);
+ if (!annotation.exist()) {
+ continue;
+ }
+ }
+
+ String column = Utils.toSymbolCase(field.getName(), '_');
+ columns.add(column);
+ }
+ }
+
+ /**
+ * 璁剧疆棰濆鐨勫瓧娈甸獙璇佺被鍒楄〃锛堢敤浜庢敮鎸� DTO銆乂O 绛夌被鐨勫瓧娈甸獙璇侊級
+ * @param classes 棰濆鐨勭被鍒楄〃
+ * @return 褰撳墠瀹炰緥锛屾敮鎸侀摼寮忚皟鐢�
+ */
+ public PageParam<T, U> setAdditionalFieldClasses(Class<?>... classes) {
+ if (classes != null && classes.length > 0) {
+ this.additionalFieldClasses = Arrays.asList(classes);
+ }
+ return this;
+ }
+
+ /**
+ * 璁剧疆棰濆鐨勫瓧娈甸獙璇佺被鍒楄〃锛堢敤浜庢敮鎸� DTO銆乂O 绛夌被鐨勫瓧娈甸獙璇侊級
+ * @param classes 棰濆鐨勭被鍒楄〃
+ * @return 褰撳墠瀹炰緥锛屾敮鎸侀摼寮忚皟鐢�
+ */
+ public PageParam<T, U> setAdditionalFieldClasses(List<Class<?>> classes) {
+ this.additionalFieldClasses = classes;
+ return this;
+ }
+
public Map<String, Object> checkoutMap() {
Map<String, Object> map = where.getMap();
if (!Cools.isEmpty(where.getOrderBy())) {
--
Gitblit v1.9.1