From 5ce9dbee67b690b594f039da6ee05c0dc00ed697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 31 Mar 2023 17:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91CodeGenerateOneToM?=
 =?UTF-8?q?any=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generate/impl/CodeGenerateOneToMany.java  | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
index 4fc2da99..61dace9b 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
@@ -91,33 +91,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
                 }
             }
 
-            for (SubTableVo subTableVo : this.subTables) {
-                // 从表(局部变量)
-                List<ColumnVo> originalColumns;
-                if (subTableVo.getColums() == null || subTableVo.getColums().isEmpty()) {
-                    originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName());
-                    subTableVo.setColums(originalColumns);
-                }
-
-                if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().isEmpty()) {
-                    originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName());
-                    subTableVo.setOriginalColumns(originalColumns);
-                }
-                // 从表外键
-                String[] foreignKeys = subTableVo.getForeignKeys();
-                // 存储外键的集合
-                ArrayList<String> list = new ArrayList<>();
-                String[] foreignKeys1 = foreignKeys;
-                int length = foreignKeys.length;
-
-                for (int i = 0; i < length; ++i) {
-                    String foreignKey = foreignKeys1[i];
-                    list.add(DbReadTableUtil.convertForeignKeyToCamelCase(foreignKey));
-                }
-                // put外键数组
-                subTableVo.setForeignKeys(list.toArray(new String[0]));
-                subTableVo.setOriginalForeignKeys(foreignKeys);
-            }
+            setSubTableVo();
             // put从表集合
             hashMap.put("subTables", this.subTables);
         } catch (Exception e) {
@@ -130,6 +104,36 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
         return hashMap;
     }
 
+    private void setSubTableVo() throws Exception {
+        for (SubTableVo subTableVo : this.subTables) {
+            // 从表(局部变量)
+            List<ColumnVo> originalColumns;
+            if (subTableVo.getColums() == null || subTableVo.getColums().isEmpty()) {
+                originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName());
+                subTableVo.setColums(originalColumns);
+            }
+
+            if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().isEmpty()) {
+                originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName());
+                subTableVo.setOriginalColumns(originalColumns);
+            }
+            // 从表外键
+            String[] foreignKeys = subTableVo.getForeignKeys();
+            // 存储外键的集合
+            ArrayList<String> list = new ArrayList<>();
+            String[] foreignKeys1 = foreignKeys;
+            int length = foreignKeys.length;
+
+            for (int i = 0; i < length; ++i) {
+                String foreignKey = foreignKeys1[i];
+                list.add(DbReadTableUtil.convertForeignKeyToCamelCase(foreignKey));
+            }
+            // put外键数组
+            subTableVo.setForeignKeys(list.toArray(new String[0]));
+            subTableVo.setOriginalForeignKeys(foreignKeys);
+        }
+    }
+
     @Override
     public List<String> generateCodeFile(String stylePath) throws Exception {
         String projectPath = com.jero.codegenerate.properties.CodeConfigProperties.projectPath;