优化

model/com/brilliance/rmb/report/model/Desc.java

+package com.brilliance.rmb.report.model;
+
+import java.lang.annotation.*;
+
+/**
+ * Created by cjh on 2019/9/5 0005.
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Desc {
+    String value() ;
+
+    String typeName() default "";
+}

model/com/brilliance/rmb/report/model/HEAD.java

+package com.brilliance.rmb.report.model;
+
+/**
+ * @Description
+ * @Author s_guodong
+ * @Date 2023/5/11
+ */
+public class HEAD {
+    private String sendBic;
+
+    public String getSendBic() {
+        return sendBic;
+    }
+
+    public void setSendBic(String sendBic) {
+        this.sendBic = sendBic;
+    }
+}

model/com/brilliance/rmb/report/model/Len.java

+package com.brilliance.rmb.report.model;
+
+import java.lang.annotation.*;
+
+/**
+ * Created by cjh on 2019/9/5 0005.
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Len {
+    int size() default 0;
+
+    int min() default 0;
+
+    int max() default 0;
+}

model/com/brilliance/rmb/report/model/Need.java

+package com.brilliance.rmb.report.model;
+
+import java.lang.annotation.*;
+
+/**
+ * Created by cjh on 2019/9/5 0005.
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Need {
+    String value() default "";
+}

model/com/brilliance/rmb/report/model/UnSig.java

+package com.brilliance.rmb.report.model;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.FIELD})
+public @interface UnSig {
+    Class<?>[] filter() default {};
+	String regex() default "";
+    int[] num() default {};//满足域序号的进行加签
+}

model/com/brilliance/rmb/report/model/Xmlns.java

+package com.brilliance.rmb.report.model;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Xmlns {
+    String value() default "";
+}

src/main/java/com/brilliance/report/rmb/generator/util/DZXTTemplateUtil.java → src/main/java/com/brilliance/rmb/report/generator/util/DZXTTemplateUtil.java

-package com.brilliance.report.rmb.generator.util;
+package com.brilliance.rmb.report.generator.util;
 
 import cn.hutool.core.thread.GlobalThreadPool;
 import org.apache.velocity.app.VelocityEngine;

src/main/java/com/brilliance/report/rmb/generator/util/FastJsonUtil.java → src/main/java/com/brilliance/rmb/report/generator/util/FastJsonUtil.java

-package com.brilliance.report.rmb.generator.util;
+package com.brilliance.rmb.report.generator.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.JSONLibDataFormatSerializer;

src/main/java/com/brilliance/report/rmb/generator/util/ModelGenerator.java → src/main/java/com/brilliance/rmb/report/generator/util/ModelGenerator.java

-package com.brilliance.report.rmb.generator.util;
+package com.brilliance.rmb.report.generator.util;
 
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 public class ModelGenerator {
     public static final URL excel = ModelGenerator.class.getClassLoader().getResource("msgstruct.xlsx");
     private static final String TEMPLATENAM = "bean.vm";
-    private static final String MSG_PACKAGE = "com.brilliance.report.rmb.model";
+    private static final String MSG_PACKAGE = "com.brilliance.rmb.report.model";
     private static final String COL_TAG = "tag";
     private static final String COL_NAM = "nam";
     private static final String COL_TYP = "typ";
@@ -25,14 +25,14 @@ public class ModelGenerator {
     private static final String COL_OPT = "opt";
     private static final String COL_KEY = "key";
     private static final String COL_CLASS = "class";
-    private static final String DES = "import com.brilliance.report.rmb.model.Desc;\n";
-    private static final String LEN = "import com.brilliance.report.rmb.model.Len;\n";
-    private static final String UNSIG = "import com.brilliance.report.rmb.model.UnSig;\n";
+    private static final String DES = "import com.brilliance.rmb.report.model.Desc;\n";
+    private static final String LEN = "import com.brilliance.rmb.report.model.Len;\n";
+    private static final String UNSIG = "import com.brilliance.rmb.report.model.UnSig;\n";
     private static final String XJTA = "import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n";
-    private static final String ACAA = "import com.brilliance.report.rmb.model.ActiveCurrencyAndAmount;\n";
-    private static final String NEED = "import com.brilliance.report.rmb.model.Need;\n";
+    private static final String ACAA = "import com.brilliance.rmb.report.model.ActiveCurrencyAndAmount;\n";
+    private static final String NEED = "import com.brilliance.rmb.report.model.Need;\n";
     private static final String LIST = "import java.util.List;\n";
-    private static final String HEAD = "import com.brilliance.report.rmb.model.HEAD;\n";
+    private static final String HEAD = "import com.brilliance.rmb.report.model.HEAD;\n";
 
     private static final String NODE_NAME = "obj";
     private static final String LIST_NAME = "list";
@@ -189,11 +189,14 @@ public class ModelGenerator {
             }
             // 提取字段长度信息
             if (StringUtil.isNotEmpty(len)) {
-                if (len.contains(",")) {
-                    String s = len.replaceAll("\\[", "")
-                            .replaceAll("]", "")
-                            .replaceAll("\\(", "")
-                            .replaceAll("\\)", "");
+                String s = len.replaceAll("\\[", "")
+                        .replaceAll("]", "")
+                        .replaceAll("\\(", "")
+                        .replaceAll("\\)", "")
+                        .replaceAll("）", "")
+                        .replaceAll("（", "")
+                        .replaceAll("，", ",");
+                if (s.contains(",")) {
                     String[] split = s.split(",");
                     ((Set) field.get("fieldannotation")).add("@Len(min = " + Integer.valueOf(split[0]) + ",max =" + Integer.valueOf(split[1]) + " )");
                 } else {

src/main/java/com/brilliance/report/rmb/generator/util/StringUtil.java → src/main/java/com/brilliance/rmb/report/generator/util/StringUtil.java

-package com.brilliance.report.rmb.generator.util;
+package com.brilliance.rmb.report.generator.util;
 
 import org.bouncycastle.util.encoders.Base64;