From f347602c855991822f596f2cb0983dfea743c111 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 15:09:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
/dev/null | 60 ------------------------------------------------------------
1 files changed, 0 insertions(+), 60 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/annotation/ValueTableShow.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/annotation/ValueTableShow.java
deleted file mode 100644
index cd1a804..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/annotation/ValueTableShow.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.framework.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ValueTableShow {
-
- int value() default 1;
-
- String name() default "";
-
- int width() default 0;
-
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/common/PrintChina.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/common/PrintChina.java
deleted file mode 100644
index d02315e..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/common/PrintChina.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ruoyi.framework.common;
-
-import com.ruoyi.framework.annotation.ValueTableShow;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-/*鏉庢灄
-* 閫氳繃娉ㄨВ蹇�熺敓鎴恡able琛ㄥご*/
-
-public class PrintChina {
-
- public static <T> List<Map<String, Object>> printChina(Class<T> tClass) {
- //灏嗗疄浣撶被鐨勫睘鎬у拰娉ㄩ噴杞崲鎴愬弬鏁�
- List<Field> fieldList = new ArrayList<>();
- while (tClass != null){
- fieldList.addAll(new ArrayList<>(Arrays.asList(tClass.getDeclaredFields())));
- tClass = (Class<T>) tClass.getSuperclass();
- }
- Field[] fields = new Field[fieldList.size()];
- fieldList.toArray(fields);
- ArrayList<Map<String, Object>> list = new ArrayList<>();
- for (Field field : fields) {
- 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);
- if(width>0){
- soundVo.put("width", width);
- }
- soundVo.put("order", order + "");
- if(list.isEmpty()){
- list.add(soundVo);
- }else{
- boolean isAdd = false;
- for (int i = 0; i < list.size(); i++) {
- Map<String, Object> map = list.get(i);
- if(order < Integer.parseInt(map.get("order").toString())){
- list.add(i, soundVo);
- isAdd = true;
- break;
- }
- }
- if (!isAdd) list.add(soundVo);
- }
- }
- }
- return list;
- }
-
-}
--
Gitblit v1.9.3