From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/common/web/BaseController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 62c9fbe..8f1fade 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -2,10 +2,13 @@
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.Tag;
+import com.zy.asrs.service.TagService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -14,19 +17,21 @@
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.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;
protected Long getUserId(){
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
@@ -48,6 +53,53 @@
}
}
return "";
+ }
+
+ protected Tag getOriginTag(){
+ return tagService.getTop();
+ }
+
+ /**
+ * 鍒嗛〉缁勮
+ * @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;
}
/**
@@ -90,4 +142,29 @@
wrapper.like(columns.get(i), condition);
}
}
+
+ public static boolean isJSON(String str) {
+ if (Cools.isEmpty(str)) {
+ return false;
+ } else {
+ str = str.trim();
+ if (str.startsWith("{") && str.endsWith("}")) {
+ return true;
+ } else if (str.startsWith("[") && str.endsWith("]")) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+
+ public static boolean isNumber(String str){
+ for (int i = str.length();--i>=0;){
+ if (!Character.isDigit(str.charAt(i))){
+ return false;
+ }
+ }
+ return true;
+ }
+
}
--
Gitblit v1.9.1