'commit'

DataEase开发环境.txt

@@ -0,0 +1,4 @@
+http://10.10.14.203:8100/
+
+admin
+DataEase@123456

src/main/java/com/dsideal/base/BaseApplication.java

@@ -26,6 +26,7 @@ import com.jfinal.kit.PathKit;
 import com.jfinal.kit.Prop;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.activerecord.OrderedFieldContainerFactory;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
@@ -123,8 +124,14 @@ public class BaseApplication extends JFinalConfig {
         // 配置ActiveRecord插件
         ActiveRecordPlugin arp = new ActiveRecordPlugin(plugin);
         arp.setDialect(new MysqlDialect());
+        //保证数据列返回与SQL语句中的顺序是一致的
+        arp.setContainerFactory(new OrderedFieldContainerFactory());
+
+
         ActiveRecordPlugin dataEaseArp = new ActiveRecordPlugin("dataease", dataEasePlugin);
         dataEaseArp.setDialect(new MysqlDialect());
+        //保证数据列返回与SQL语句中的顺序是一致的
+        dataEaseArp.setContainerFactory(new OrderedFieldContainerFactory());
 
         //遍历sql目录下所有的sql文件
         File sqlDir;

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -8,6 +8,8 @@ import net.sf.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.dsideal.base.Tools.InitDataEaseDataSet.DB_NAME;
+
 public class DataEaseModel {
     /**
      * 获取当前人员可以看到哪些数据集
@@ -15,7 +17,7 @@ public class DataEaseModel {
      * @param identity_id 身份id
      * @return 数据集列表
      */
-    public List<com.jfinal.plugin.activerecord.Record> getDataSet(int identity_id) {
+    public List<Record> getDataSet(int identity_id) {
         String sql = "select * from t_dp_dataset where owner_id=? order by dataset_name";
         return Db.find(sql, identity_id);
     }
@@ -26,11 +28,12 @@ public class DataEaseModel {
      * @param dataset_id 数据集id
      * @return
      */
-    public List<com.jfinal.plugin.activerecord.Record> getDataSetTableContent(int dataset_id) {
-        com.jfinal.plugin.activerecord.Record record = getTableName(dataset_id);
+    public List<Record> getDataSetTableContent(int dataset_id) {
+        Record record = getTableName(dataset_id);
         if (record == null) return null;
-        String sql = "select * from dataease.`" + record.getStr("table_name") + "`";
-        return Db.find(sql);
+        String sql = "select * from `" + record.getStr("table_name") + "`";
+        List<Record> list=Db.use(DB_NAME).find(sql);
+        return list;
     }
 
     /**
@@ -39,7 +42,7 @@ public class DataEaseModel {
      * @param dataset_id 数据集id
      * @return 表对象
      */
-    public com.jfinal.plugin.activerecord.Record getTableName(int dataset_id) {
+    public Record getTableName(int dataset_id) {
         String sql = "select * from t_dp_dataset where id=?";
         return Db.findFirst(sql, dataset_id);
     }
@@ -61,12 +64,12 @@ public class DataEaseModel {
             String sql = "delete from dataease.`" + tableName + "`";
             Db.update(sql);
         }
-        List<com.jfinal.plugin.activerecord.Record> list = new ArrayList<>();
+        List<Record> list = new ArrayList<>();
         for (int i = 0; i < ja.size(); i++) {
             JSONObject jsonObject = ja.getJSONObject(i);
             //遍历jo的每一个属性
             // 或者使用keySet和for-each循环遍历
-            com.jfinal.plugin.activerecord.Record record = new Record();
+            Record record = new Record();
             for (Object key : jsonObject.keySet()) {
                 Object value = jsonObject.get(key);
                 if (value.equals("null")) value = null;

src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java

@@ -197,7 +197,7 @@ public class InitDataEaseDataSet {
             addDataSet(parent_name, table_name, dataset_name);
         }
         //加上主键
-        addPrimaryKey();
+        //addPrimaryKey();
         //将所有非空列去掉不允许为空的限制
         updateNotNullColumns();
     }

src/main/resources/application_dataease.yaml

@@ -1,8 +0,0 @@
-mysql:
-  # 数据库信息
-  driverClassName: com.mysql.cj.jdbc.Driver
-  user: root
-  password: Password123@mysql
-  jdbcUrl : jdbc:mysql://10.10.14.203:3306/dataease?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-
-