From 01fa93b5dd9f20286ef8f22515caf55307f76a9d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs
---
src/main/java/com/zy/common/web/BaseController.java | 191 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 178 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index af55b2b..0c43dad 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -2,11 +2,18 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Node;
+import com.zy.asrs.entity.Tag;
+import com.zy.asrs.service.NodeService;
+import com.zy.asrs.service.TagService;
import com.zy.system.entity.User;
+import com.zy.system.entity.UserLogin;
+import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,19 +21,55 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.temporal.Temporal;
+import java.util.*;
/**
* Created by vincent on 2019-09-09
*/
public class BaseController extends AbstractBaseController {
+ protected static final String RANGE_TIME_LINK = " - ";
+
@Autowired
protected HttpServletRequest request;
@Autowired
private UserService userService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private UserLoginService userLoginService;
+
+ protected Node getOriginNode(){
+ Node node = nodeService.getTop();
+ if (node == null) {
+ throw new CoolException("搴撳尯鏁版嵁閿欒");
+ }
+ return node;
+ }
+
+ protected Long getHostId(){
+ if (getUserId() == 9527) {
+ return null;
+ }
+ User user = getUser();
+ if (user.getRoleId() == 1) {
+ String hostId = String.valueOf(request.getAttribute("hostId"));
+ if (Cools.isEmpty(hostId)) {
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ if (userLogin != null) {
+ return userLogin.getHostId();
+ }
+ }
+ return Long.parseLong(hostId);
+ } else {
+ return user.getHostId();
+ }
+ }
protected Long getUserId(){
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
@@ -50,6 +93,60 @@
return "";
}
+ protected Tag getOriginTag(){
+ return tagService.getTop();
+ }
+
+ protected <T> void hostEq(EntityWrapper<T> wrapper){
+ Long hostId = getHostId();
+ if (hostId != null) {
+ wrapper.eq("host_id", hostId);
+ }
+ }
+
+ /**
+ * 鍒嗛〉缁勮
+ * @param pageNumber
+ * @param pageSize
+ * @param map
+ * @param cls
+ * @param <T>
+ * @return
+ */
+ protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls){
+ // 鍒嗛〉绱㈠紩鍜屽崟椤垫暟閲忕粍瑁�
+ pageNumber = Optional.ofNullable(pageNumber).orElse(1);
+ pageSize = Optional.ofNullable(pageSize).orElse(10);
+ Page<T> page = new Page<>(pageNumber, pageSize);
+ map.put("pageNumber", pageNumber);
+ map.put("pageSize", pageSize);
+
+ // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
+ if (!Cools.isEmpty(map.get("condition"))) {
+ Set<String> columns = new HashSet<>();
+ for (Field field : Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!map.keySet().contains(column)) {
+ columns.add(column);
+ }
+ }
+ columns.forEach(col->map.put(col, map.get("condition")));
+ }
+ page.setCondition(map);
+ return page;
+ }
+
/**
* 鍏ㄥ瓧娈垫ā绯婃悳绱�
* @param cls 妯″瀷绫�
@@ -60,7 +157,11 @@
if (Cools.isEmpty(condition)) {
return;
}
- List<String> columns = new ArrayList<>();
+ String keyword = String.valueOf(condition).trim();
+ if (keyword.isEmpty()) {
+ return;
+ }
+ boolean appended = false;
for (Field field :Cools.getAllFields(cls)){
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
@@ -75,19 +176,83 @@
column = field.getName();
}
if (!set.contains(column)) {
- columns.add(column);
+ if (supportsLikeSearch(field.getType())) {
+ if (!appended) {
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.like(column, keyword);
+ appended = true;
+ continue;
+ }
+ Object exactValue = parseExactSearchValue(field.getType(), keyword);
+ if (exactValue != null) {
+ if (!appended) {
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.eq(column, exactValue);
+ appended = true;
+ }
}
}
- if (columns.isEmpty()) {
- return;
+ }
+
+ private boolean supportsLikeSearch(Class<?> fieldType) {
+ return CharSequence.class.isAssignableFrom(fieldType)
+ || fieldType == Character.class
+ || fieldType == char.class
+ || Date.class.isAssignableFrom(fieldType)
+ || Temporal.class.isAssignableFrom(fieldType);
+ }
+
+ private Object parseExactSearchValue(Class<?> fieldType, String keyword) {
+ if (!isNumericField(fieldType)) {
+ return null;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
- wrapper.and();
- } else {
- wrapper.or();
+ try {
+ BigDecimal numericValue = new BigDecimal(keyword);
+ if (fieldType == Integer.class || fieldType == int.class) {
+ return numericValue.stripTrailingZeros().scale() <= 0 ? numericValue.intValueExact() : null;
}
- wrapper.like(columns.get(i), condition);
+ if (fieldType == Long.class || fieldType == long.class) {
+ return numericValue.stripTrailingZeros().scale() <= 0 ? numericValue.longValueExact() : null;
+ }
+ if (fieldType == Short.class || fieldType == short.class) {
+ return numericValue.stripTrailingZeros().scale() <= 0 ? numericValue.shortValueExact() : null;
+ }
+ if (fieldType == Byte.class || fieldType == byte.class) {
+ return numericValue.stripTrailingZeros().scale() <= 0 ? numericValue.byteValueExact() : null;
+ }
+ if (fieldType == BigInteger.class) {
+ return numericValue.stripTrailingZeros().scale() <= 0 ? numericValue.toBigIntegerExact() : null;
+ }
+ if (fieldType == Float.class || fieldType == float.class) {
+ float value = numericValue.floatValue();
+ return Float.isFinite(value) ? value : null;
+ }
+ if (fieldType == Double.class || fieldType == double.class) {
+ double value = numericValue.doubleValue();
+ return Double.isFinite(value) ? value : null;
+ }
+ if (fieldType == BigDecimal.class) {
+ return numericValue;
+ }
+ } catch (Exception ignored) {
+ return null;
}
+ return null;
+ }
+
+ private boolean isNumericField(Class<?> fieldType) {
+ return Number.class.isAssignableFrom(fieldType)
+ || fieldType == byte.class
+ || fieldType == short.class
+ || fieldType == int.class
+ || fieldType == long.class
+ || fieldType == float.class
+ || fieldType == double.class;
}
}
--
Gitblit v1.9.1