From 9183a9a18a910d5b099119240a86a3a87ce42106 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java | 2 ++
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 6 +++---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 2 +-
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java | 12 +++++++-----
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
index 05ae0a6..a70b7b5 100644
--- a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
+++ b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
@@ -10,4 +10,6 @@
String name() default "";
+ int width() default 100;
+
}
diff --git a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
index 4cc2726..f6ded2f 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -12,7 +12,7 @@
public class PrintChina {
- public static <T> List<Map<String, String>> printChina(Class<T> tClass) {
+ public static <T> List<Map<String, Object>> printChina(Class<T> tClass) {
//灏嗗疄浣撶被鐨勫睘鎬у拰娉ㄩ噴杞崲鎴愬弬鏁�
List<Field> fieldList = new ArrayList<>();
while (tClass != null){
@@ -21,27 +21,29 @@
}
Field[] fields = new Field[fieldList.size()];
fieldList.toArray(fields);
- ArrayList<Map<String, String>> list = new ArrayList<>();
+ ArrayList<Map<String, Object>> list = new ArrayList<>();
for (Field field : fields) {
- Map<String, String> soundVo = new HashMap<>();
+ Map<String, Object> soundVo = new HashMap<>();
boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
if (bool2) {
int order = field.getAnnotation(ValueTableShow.class).value();
String value = field.getAnnotation(ValueTableShow.class).name();
+ int width = field.getAnnotation(ValueTableShow.class).width();
if (bool){
value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
}
soundVo.put("label", field.getName());
soundVo.put("value", value);
+ soundVo.put("width", width);
soundVo.put("order", order + "");
if(list.size() == 0){
list.add(soundVo);
}else{
boolean isAdd = false;
for (int i = 0; i < list.size(); i++) {
- Map<String, String> map = list.get(i);
- if(order < Integer.parseInt(map.get("order"))){
+ Map<String, Object> map = list.get(i);
+ if(order < Integer.parseInt(map.get("order").toString())){
list.add(i, soundVo);
isAdd = true;
break;
diff --git a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index 8c4d5b8..413915b 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -60,9 +60,9 @@
@Override
protected void addInterceptors(InterceptorRegistry registry) {
// TODO: 2024/6/4 璁块棶swagger闇�鍏充笅闈㈡嫤鎴櫒
- registry.addInterceptor(fiferConfig).addPathPatterns("/**");
- registry.addInterceptor(powerConfig).addPathPatterns("/**");
- registry.addInterceptor(logConfig).addPathPatterns("/**");
+// registry.addInterceptor(fiferConfig).addPathPatterns("/**");
+// registry.addInterceptor(powerConfig).addPathPatterns("/**");
+// registry.addInterceptor(logConfig).addPathPatterns("/**");
super.addInterceptors(registry);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index e38a1f1..7a65f08 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -10,7 +10,7 @@
private String id;
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 190)
private String entrustCode;
@ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
--
Gitblit v1.9.3