From b7a738a16531191b43ea2327acca7d861dfd9f09 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 三月 2026 14:25:31 +0800
Subject: [PATCH] #算法增加经过其他出库站点的惩罚系数
---
src/main/java/com/zy/common/web/BaseController.java | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 1d40c1d..31ec0c9 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,7 +1,8 @@
package com.zy.common.web;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
@@ -11,7 +12,7 @@
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -35,7 +36,7 @@
}
protected User getUser(){
- User user = userService.selectById(getUserId());
+ User user = userService.getById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
}
@@ -58,7 +59,7 @@
* @param set 鎺掗櫎瀛楁闆嗗悎
* @param condition 鎼滅储鍐呭
*/
- protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ protected <T> void allLike(Class<T> cls, Set<String> set, QueryWrapper<T> wrapper, String condition){
if (Cools.isEmpty(condition)) {
return;
}
@@ -69,27 +70,41 @@
|| Modifier.isTransient(field.getModifiers())){
continue;
}
- String column = null;
- if (field.isAnnotationPresent(TableField.class)) {
- column = field.getAnnotation(TableField.class).value();
- }
+ String column = resolveColumn(field);
if (Cools.isEmpty(column)) {
- column = field.getName();
+ continue;
}
- if (!set.contains(column)) {
+ if (!set.contains(column) && !set.contains(field.getName())) {
columns.add(column);
}
}
if (columns.isEmpty()) {
return;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
- wrapper.andNew();
- } else {
- wrapper.or();
+ wrapper.and(q -> {
+ for (int i = 0; i < columns.size(); i++) {
+ q.like(columns.get(i), condition);
+ if (i < columns.size() - 1) {
+ q.or();
+ }
}
- wrapper.like(columns.get(i), condition);
+ });
+ }
+
+ private String resolveColumn(Field field) {
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ TableField tableField = field.getAnnotation(TableField.class);
+ if (!tableField.exist()) {
+ return null;
+ }
+ column = tableField.value();
+ } else if (field.isAnnotationPresent(TableId.class)) {
+ column = field.getAnnotation(TableId.class).value();
}
+ if (Cools.isEmpty(column)) {
+ column = humpToLine(field.getName());
+ }
+ return column;
}
}
--
Gitblit v1.9.1