From 72c49f3afa22c4f84760d57001e45a4fadf2d482 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 09:32:33 +0800
Subject: [PATCH] #升级JDK17
---
src/main/java/com/zy/common/web/BaseController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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..eaf584e 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,17 +1,17 @@
package com.zy.common.web;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+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;
import com.core.exception.CoolException;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
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 +35,7 @@
}
protected User getUser(){
- User user = userService.selectById(getUserId());
+ User user = userService.getById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
}
@@ -46,7 +46,8 @@
Field[] fields = Cools.getAllFields(cls);
for (Field field : fields){
if (fieldName.equals(field.getName())){
- return field.getAnnotation(ApiModelProperty.class).value();
+ Schema schema = field.getAnnotation(Schema.class);
+ return schema == null ? "" : schema.description();
}
}
return "";
@@ -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;
}
@@ -83,13 +84,13 @@
if (columns.isEmpty()) {
return;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
- wrapper.andNew();
- } else {
- wrapper.or();
+ wrapper.and(inner -> {
+ for (int i = 0; i < columns.size(); i++) {
+ if (i > 0) {
+ inner.or();
+ }
+ inner.like(columns.get(i), condition);
}
- wrapper.like(columns.get(i), condition);
- }
+ });
}
}
--
Gitblit v1.9.1