model

ibzlite-core/src/main/java/cn/ibizlab/core/extensions/service/DstDataSourceExService.java

@@ -26,7 +26,6 @@ import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.util.*;
 
-import static cn.ibizlab.core.lite.extensions.util.LiteStorage.parseDatasource;
 
 /**
  * 实体[数据源] 自定义服务对象
@@ -144,16 +143,22 @@ public class DstDataSourceExService extends DstDataSourceServiceImpl {
     @Override
     @Transactional
     public DstDataSource initDS(DstDataSource et) {
-        DstDataSource dstDataSource = buildDS(et);
-        if(ObjectUtils.isEmpty(dstDataSource)){
+        DstDataSource ds = getById(et.getDsId());
+
+        if(ObjectUtils.isEmpty(ds)){
             throw new BadRequestAlertException("数据源不存在，请检查是否填写正确","","ibzInit");
         }
-        DstDataSource ds = get(dstDataSource.getDsId());
+        buildDS(ds);
+
         String datasourceMessage = ds.getDsCfg();
+
         if(ObjectUtils.isEmpty(datasourceMessage)){
             throw new BadRequestAlertException("数据源不能为空","","ibzInit");
         }
-        Map datasourceMap = parseDatasource(datasourceMessage);
+        List<Setting> settings = JSONArray.parseArray(ds.getDsCfg(), Setting.class);
+        Map datasourceMap = new HashMap();
+        settings.forEach(setting -> datasourceMap.put(setting.getProperty(),setting.getValue()));
+
         if(ObjectUtils.isEmpty(datasourceMap.get("username"))){
             throw new BadRequestAlertException("数据源用户名不能为空","","ibzInit");
         }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/DataModel.java

@@ -332,4 +332,18 @@ public class DataModel {
         return properties;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    public LinkedHashSet<Property> getAllProperty()
+    {
+        LinkedHashSet<Property> properties=this.getObjectProperties();
+
+        if (this.getNestedDataModels() != null) {
+            for (DataModel dm : this.getNestedDataModels()) {
+                properties.addAll(dm.getAllProperty());
+            }
+        }
+        return properties;
+    }
+
 }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/util/LiteStorage.java

@@ -88,14 +88,4 @@ public class LiteStorage {
             }
         }
     }
-    public static Map parseDatasource (String json) {
-        JSONArray tableData = JSONArray.parseArray(json);
-        Map map = new HashMap();
-        for (int i = 0; i < tableData.size(); i++) {
-            JSONObject jsonObject = tableData.getJSONObject(i);
-            map.put(jsonObject.get("param"), jsonObject.get("value"));
-        }
-        return map;
-    }
-
 }