move

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/lite/DynamicModelStorage.java

@@ -144,6 +144,9 @@ public class DynamicModelStorage {
                         .setDsId(iPSSystem.getCodeName()+"-"+((StringUtils.isEmpty(dataEntity.getDSLink())||dataEntity.getDSLink().equalsIgnoreCase("DEFAULT"))?"master":dataEntity.getDSLink()))
                         .setDsName(metaEntityModel.getDsId())
                         .setSystemId(iPSSystem.getCodeName()).setSystemName(iPSSystem.getLogicName()).setShowOrder(i);
+                if(dataEntity.getPSSystemModule()!=null)
+                    metaEntityModel.setModuleId(dataEntity.getPSSystemModule().getCodeName()).setModuleName(dataEntity.getPSSystemModule().getName());
+
                 i++;
                 entities.put(metaEntityModel.getCodeName(),metaEntityModel);
                 if(!metaEntityModel.getCodeName().toLowerCase().equals(metaEntityModel.getCodeName()))
@@ -173,6 +176,7 @@ public class DynamicModelStorage {
         IPSDataEntity dataEntity = iPSSystem.getPSDataEntity(metaEntityModel.getEntityId(),true);
         Assert.notNull(dataEntity,"未找到对应的实体模型:"+entity);
         EntityModel entityModel=new EntityModel();
+        entityModel.setNode(dataEntity);
 
         if(dataEntity.isLogicValid())
         {
@@ -209,6 +213,7 @@ public class DynamicModelStorage {
             try { dict=defield.getPSCodeList()!=null?defield.getPSCodeList().getCodeName():null; } catch (Exception ex){}
 
             FieldModel fieldModel=new FieldModel();
+            fieldModel.setNode(defield);
             MetaFieldModel metaFieldModel=new MetaFieldModel();
             metaFieldModel.setFieldId(defield.getId()).setFieldName(defield.getName()).setCodeName(defield.getCodeName()).setFieldLogicName(defield.getLogicName())
                     .setEntityId(dataEntity.getId()).setEntityCodeName(dataEntity.getCodeName()).setEntityName(dataEntity.getName()).setSystemId(metaEntityModel.getSystemId())

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/lite/EntityModel.java

@@ -495,4 +495,7 @@ public class EntityModel {
     }
 
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private Object node;
 }

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/lite/FieldModel.java

@@ -109,4 +109,8 @@ public class FieldModel {
         return DataObject.getStringValue(field.get("column-"+dsType.toLowerCase()),getColumnName());
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private Object node;
+
 }

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/lite/RelationshipModel.java

 package com.ibizlab.codegen.lite;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -31,4 +33,8 @@ public class RelationshipModel {
 
     private MetaRelationshipModel relation;
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private Object node;
+
 }

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/model/ModelStorage.java

@@ -28,9 +28,7 @@ public class ModelStorage {
 
     public String getModelPath()
     {
-        if(modelPath.equals(File.separator))
-            return modelPath.substring(0,modelPath.length()-1);
-        return modelPath;
+        return null;
     }
 
 

modules/ibizlab-generator-core/src/main/java/com/ibizlab/codegen/model/PojoSchema.java

@@ -95,7 +95,7 @@ public class PojoSchema {
     @JsonIgnore
     public String getPackage()
     {
-        return this.getOptions().getSystem();
+        return this.getOptions().getPackage();
     }