feat-ReferenceInfo-优化ctrl转化成ReferenceInfo的逻辑

ximatai · Sep 25, 2024 · fbe638d · fbe638d
1 parent 6a30901
commit fbe638d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/my-boot/src/test/java/net/ximatai/muyun/test/core/TestReference.java b/my-boot/src/test/java/net/ximatai/muyun/test/core/TestReference.java
@@ -127,7 +127,7 @@ public List<QueryItem> queryItemList() {
     @Override
     public List<ReferenceInfo> getReferenceList() {
         return List.of(
-            new ReferenceInfo("id_at_test_table_referable", testReferableController).autoPackage()
+            testReferableController.toReferenceInfo("id_at_test_table_referable")
         );
     }
 }

diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/IReferableAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/IReferableAbility.java
@@ -23,7 +23,7 @@ default boolean checkColumnExist(String column) {
     }
 
     default ReferenceInfo toReferenceInfo(String foreignKey) {
-        return new ReferenceInfo(foreignKey, this);
+        return new ReferenceInfo(foreignKey, this).autoPackage();
     }
 
 }
diff --git a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/DepartmentController.java b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/DepartmentController.java
@@ -52,7 +52,7 @@ public TableWrapper getTableWrapper() {
     @Override
     public List<ReferenceInfo> getReferenceList() {
         return List.of(
-            organizationProvider.get().toReferenceInfo("id_at_org_organization").autoPackage(),
+            organizationProvider.get().toReferenceInfo("id_at_org_organization"),
             dictController.toReferenceInfo("dict_dept_type")
         );
     }

diff --git a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/OrganizationController.java b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/OrganizationController.java
@@ -4,24 +4,29 @@
 import jakarta.ws.rs.Path;
 import net.ximatai.muyun.ability.IChildrenAbility;
 import net.ximatai.muyun.ability.IReferableAbility;
+import net.ximatai.muyun.ability.IReferenceAbility;
 import net.ximatai.muyun.ability.ITreeAbility;
 import net.ximatai.muyun.base.BaseBusinessTable;
 import net.ximatai.muyun.core.database.MyTableWrapper;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.ChildTableInfo;
+import net.ximatai.muyun.model.ReferenceInfo;
 import net.ximatai.muyun.platform.ScaffoldForPlatform;
 
 import java.util.List;
 
 import static net.ximatai.muyun.platform.PlatformConst.BASE_PATH;
 
 @Path(BASE_PATH + "/organization")
-public class OrganizationController extends ScaffoldForPlatform implements ITreeAbility, IChildrenAbility, IReferableAbility {
+public class OrganizationController extends ScaffoldForPlatform implements ITreeAbility, IChildrenAbility, IReferableAbility, IReferenceAbility {
 
     @Inject
     BaseBusinessTable base;
 
+    @Inject
+    DictController dictController;
+
     @Inject
     DepartmentController departmentController;
 
@@ -51,4 +56,10 @@ public List<ChildTableInfo> getChildren() {
         return List.of(departmentController.toChildTable("id_at_org_organization"));
     }
 
+    @Override
+    public List<ReferenceInfo> getReferenceList() {
+        return List.of(
+            dictController.toReferenceInfo("dict_orga_type")
+        );
+    }
 }