diff --git a/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml b/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml new file mode 100644 index 0000000000..4cbef9c152 --- /dev/null +++ b/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml @@ -0,0 +1,1545 @@ + + + + + dataease + dataease + + 80020202 + MongoDB + + jdbc:mongodb://123.56.8.132:27017/dataease?rebuildschema=true&authSource=admin&schema=4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml + mongodb.jdbc.MongoDriver + mongodb.jdbc.MongoDriver + " + + + + + + no1:thingdata:02:0 + "NO1:thingdata:02:0" + dataease + + true + + 3 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 测试1 + "测试1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 测试2 + "测试2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + 测试3 + "测试3" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + pk_NO1:thingdata:02:0 + 1 + + "_id" + + + +
+ + + books + "books" + dataease + + true + + 1000 + + _id + "_id" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 1 + + 0 + + + + author + "author" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + category + "category" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + createddate + "createdDate" + 93 + timestamp + 25 + 0 + 25 + + + 25 + 4 + + 0 + + + + onsale + "onSale" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + price + "price" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + title + "title" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + pk_books + 1 + + "_id" + + + +
+ + + create-test + "create-test" + dataease + + true + + 0 +
+ + + jinlong + "jinlong" + dataease + + true + + 2 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + cnecustuuid + "cneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + groupid + "groupID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + num_1 + "num_1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + parentcnecustuuid + "parentCneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + parentname + "parentName" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + text_1 + "text_1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + text_2 + "text_2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + pk_jinlong + 1 + + "_id" + + + +
+ + + jinlong2 + "jinlong2" + dataease + + true + + 0 +
+ + + mjq + "mjq" + dataease + + true + + 1 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + age + "age" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + pk_mjq + 1 + + "_id" + + + +
+ + + mjq-test + "mjq-test" + dataease + + true + + 2 + + *attrs + "*Attrs" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 18 + + 0 + + + + *应用程序 + "*应用程序" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + *用户名 + "*用户名" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + *系统用户 + "*系统用户" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + id + "Id" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + ssh公钥 + "SSH公钥" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + ssh密钥 + "SSH密钥" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 创建日期 + "创建日期" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + 密码 + "密码" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + 应用名称 + "应用名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + 更新日期 + "更新日期" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 13 + + 0 + + + + 版本 + "版本" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + 类别 + "类别" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 16 + + 0 + + + + 类别名称 + "类别名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 17 + + 0 + + + + 类型 + "类型" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 14 + + 0 + + + + 类型名称 + "类型名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 15 + + 0 + + + + 系统用户 + "系统用户" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + 组织名称 + "组织名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 19 + + 0 + + + + pk_mjq-test + 1 + + "_id" + + + +
+ + + mjqznb + "mjqznb" + dataease + + true + + 1 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + cnecustuuid + "cneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + groupid + "groupID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + num_1 + "num_1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + parentcnecustuuid + "parentCneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + parentname + "parentName" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + text_1 + "text_1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + text_2 + "text_2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + pk_mjqznb + 1 + + "_id" + + + +
+ + + report + "report" + dataease + + true + + 50 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + count + "count" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + id + "id" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + latitude + "latitude" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + longitude + "longitude" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + unit_price + "unit_price" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + pk_report + 1 + + "_id" + + + +
+ + + time + "time" + dataease + + true + + 1 + + 1 + "1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 10 + "10" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + 11 + "11" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + 12 + "12" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 13 + + 0 + + + + 13 + "13" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 14 + + 0 + + + + 2 + "2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + 3 + "3" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + 4 + "4" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + 5 + "5" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + 6 + "6" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + 7 + "7" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + 8 + "8" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + 9 + "9" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + pk_time + 1 + + "_id" + + + +
+ + + timeallmore + "timeallmore" + dataease + + true + + 15 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 数值 + "数值" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 14 + + 0 + + + + 时间带时分秒（-） + "时间带时分秒（-）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + 时间带时分秒（/） + "时间带时分秒（/）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + 时间没有分隔符带时分秒（时分秒以：） + "时间没有分隔符带时分秒（时分秒以：）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + 时间（-） + "时间（-）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 时间（/） + "时间（/）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + 时间（） + "时间（）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + 自定义1 + "自定义1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + 自定义2 + "自定义2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + 自定义3 + "自定义3" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + 自定义4 + "自定义4" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + 自定义5 + "自定义5" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + 自定义6 + "自定义6" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 13 + + 0 + + + + pk_timeallmore + 1 + + "_id" + + + +
+ + diff --git a/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml b/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml new file mode 100644 index 0000000000..ddd8c60378 --- /dev/null +++ b/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml @@ -0,0 +1,1871 @@ + + + + + dataease + dataease + + 80020202 + MongoDB + + jdbc:mongodb://123.56.8.132:27018/dataease?rebuildschema=true&authSource=admin&schema=476409e8-9887-438e-a6ce-e4e29ddd64bc.xml + mongodb.jdbc.MongoDriver + mongodb.jdbc.MongoDriver + " + + + + + + no1:thingdata:02:0 + "NO1:thingdata:02:0" + dataease + + true + + 3 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 测试1 + "测试1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 测试2 + "测试2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + 测试3 + "测试3" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + pk_NO1:thingdata:02:0 + 1 + + "_id" + + + +
+ + + sheet1 + "Sheet1" + dataease + + true + + 31 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + age + "age" + 4 + integer + 10 + 0 + 10 + + + 10 + 3 + + 0 + + + + bit + "bit" + 8 + double + 20 + 0 + 21 + + + 20 + 6 + + 0 + + + + bool + "bool" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + data + "data" + 93 + timestamp + 25 + 0 + 25 + + + 25 + 4 + + 0 + + + + float + "float" + 8 + double + 20 + 0 + 21 + + + 20 + 7 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + pk_Sheet1 + 1 + + "_id" + + + +
+ + + books + "books" + dataease + + true + + 1000 + + _id + "_id" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 1 + + 0 + + + + author + "author" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + category + "category" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + createddate + "createdDate" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + onsale + "onSale" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + price + "price" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + title + "title" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + pk_books + 1 + + "_id" + + + +
+ + + booksale + "booksale" + dataease + + true + + 20 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + b_date + "b_date" + 93 + timestamp + 25 + 0 + 25 + + + 25 + 6 + + 0 + + + + b_id + "b_id" + 4 + integer + 10 + 0 + 10 + + + 10 + 2 + + 0 + + + + b_name + "b_name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + b_price + "b_price" + 8 + double + 20 + 0 + 21 + + + 20 + 4 + + 0 + + + + b_sale + "b_sale" + -5 + bigint + 20 + 0 + 20 + + + 20 + 5 + + 0 + + + + pk_booksale + 1 + + "_id" + + + +
+ + + jinlong + "jinlong" + dataease + + true + + 16 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + cnecustuuid + "cneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + groupid + "groupID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + parentcnecustuuid + "parentCneCustUUID" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + parentname + "parentName" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + pk_jinlong + 1 + + "_id" + + + +
+ + + mjq-test + "mjq-test" + dataease + + true + + 1 + + *用户名 + "*用户名" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + *系统用户 + "*系统用户" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 18 + + 0 + + + + *资产 + "*资产" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 17 + + 0 + + + + ip + "IP" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + id + "Id" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + ssh公钥 + "SSH公钥" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + ssh密钥 + "SSH密钥" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 主机名 + "主机名" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + 创建日期 + "创建日期" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + 协议组 + "协议组" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + 可连接性 + "可连接性" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 14 + + 0 + + + + 备注 + "备注" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 16 + + 0 + + + + 密码 + "密码" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + 更新日期 + "更新日期" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 13 + + 0 + + + + 校验日期 + "校验日期" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 15 + + 0 + + + + 版本 + "版本" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + 系统平台 + "系统平台" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + 系统用户名称 + "系统用户名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 19 + + 0 + + + + 组织名称 + "组织名称" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 20 + + 0 + + + + pk_mjq-test + 1 + + "_id" + + + +
+ + + number + "number" + dataease + + true + + 9 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + age + "age" + -5 + bigint + 20 + 0 + 20 + + + 20 + 3 + + 0 + + + + float + "float" + 8 + double + 20 + 0 + 21 + + + 20 + 4 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + pk_number + 1 + + "_id" + + + +
+ + + runoob + "runoob" + dataease + + true + + 1 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + createdat + "createdAt" + 93 + timestamp + 25 + 0 + 25 + + + 25 + 4 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + userid + "userId" + 8 + double + 20 + 0 + 21 + + + 20 + 3 + + 0 + + + + pk_runoob + 1 + + "_id" + + + +
+ + + test + "test" + dataease + + true + + 14 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + _index + "_index" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + inputtype + "inputType" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + label + "label" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + optionlist + "optionList" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + required + "required" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + resourcepooltag + "resourcePoolTag" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + role + "role" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + textfield + "textField" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + value + "value" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + valuefield + "valueField" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + pk_test + 1 + + "_id" + + + +
+ + + testdatetime + "testdatetime" + dataease + + true + + 33 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + datetime + "datetime" + 93 + timestamp + 25 + 0 + 25 + + + 25 + 2 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + number + "number" + -5 + bigint + 20 + 0 + 20 + + + 20 + 3 + + 0 + + + + sing + "sing" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + zhi + "zhi" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + pk_testdatetime + 1 + + "_id" + + + +
+ + + testtable + "testtable" + dataease + + true + + 10 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + strint + "strint" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + x + "x" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + pk_testtable + 1 + + "_id" + + + +
+ + + testtable2 + "testtable2" + dataease + + true + + 10 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + strint + "strint" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + y + "y" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + pk_testtable2 + 1 + + "_id" + + + +
+ + + timeallmore + "timeallmore" + dataease + + true + + 15 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 数值 + "数值" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 14 + + 0 + + + + 时间带时分秒（-） + "时间带时分秒（-）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + 时间带时分秒（/） + "时间带时分秒（/）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 6 + + 0 + + + + 时间没有分隔符带时分秒（时分秒以：） + "时间没有分隔符带时分秒（时分秒以：）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 7 + + 0 + + + + 时间（-） + "时间（-）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 时间（/） + "时间（/）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + 时间（） + "时间（）" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + 自定义1 + "自定义1" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 8 + + 0 + + + + 自定义2 + "自定义2" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 9 + + 0 + + + + 自定义3 + "自定义3" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 10 + + 0 + + + + 自定义4 + "自定义4" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 11 + + 0 + + + + 自定义5 + "自定义5" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 12 + + 0 + + + + 自定义6 + "自定义6" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 13 + + 0 + + + + pk_timeallmore + 1 + + "_id" + + + +
+ + + 测试 + "测试" + dataease + + true + + 33 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + 地区 + "地区" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + 女 + "女" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 4 + + 0 + + + + 比例 + "比例" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 5 + + 0 + + + + 男 + "男" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 3 + + 0 + + + + pk_测试 + 1 + + "_id" + + + +
+ + diff --git a/core/backend/src/main/java/io/dataease/auth/service/ProxyAuthService.java b/core/backend/src/main/java/io/dataease/auth/service/ProxyAuthService.java index baae1b8f80..ad1a812ddc 100644 --- a/core/backend/src/main/java/io/dataease/auth/service/ProxyAuthService.java +++ b/core/backend/src/main/java/io/dataease/auth/service/ProxyAuthService.java @@ -4,9 +4,9 @@ import java.util.List; import org.apache.shiro.authc.AuthenticationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import groovy.lang.Lazy; import io.dataease.auth.api.dto.CurrentRoleDto; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.entity.SysUserEntity; diff --git a/core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java index 2b1ca6686f..7c67ca446a 100644 --- a/core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java +++ b/core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java @@ -116,7 +116,7 @@ public interface ParamConstants { DS_CHECK_INTERVAL_TYPE("basic.dsCheckIntervalType"), DEFAULT_LOGIN_TYPE("basic.loginType"), OPEN_HOME_PAGE("ui.openHomePage"), - + AUTO_MOBILE("ui.autoMobile"), OPEN_MARKET_PAGE("ui.openMarketPage"), TEMPLATE_MARKET_ULR("basic.templateMarketUlr"), diff --git a/core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java b/core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java index 8edcc6bde5..ba7f003500 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java @@ -29,5 +29,7 @@ public class BasicInfo extends LoginLimitInfo implements Serializable { private String dsCheckInterval; @ApiModelProperty("数据源检测时间间隔类型") private String dsCheckIntervalType; + @ApiModelProperty("自动识别移动端") + private String autoMobile = "true"; } diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java index 13a67421c9..5b7ea7d612 100644 --- a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java +++ b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java @@ -14,11 +14,19 @@ public class Db2Configuration extends JdbcConfiguration { public String getJdbc() { if(StringUtils.isEmpty(extraParams.trim())){ - return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" - .replace("HOSTNAME", getHost().trim()) - .replace("PORT", getPort().toString().trim()) - .replace("DATABASE", getDataBase().trim() - .replace("SCHEMA",getSchema().trim())); + if (StringUtils.isEmpty(getSchema())) { + return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" + .replace("HOSTNAME", getHost().trim()) + .replace("PORT", getPort().toString().trim()) + .replace("DATABASE", getDataBase().trim()); + } else { + return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" + .replace("HOSTNAME", getHost().trim()) + .replace("PORT", getPort().toString().trim()) + .replace("DATABASE", getDataBase().trim()) + .replace("SCHEMA", getSchema().trim()); + } + }else { return "jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" .replace("HOSTNAME", getHost().trim()) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index 38eec38e6a..6db85d3ce8 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1077,8 +1077,11 @@ public class DorisQueryProvider extends QueryProvider { String format = transDateFormat(request.getDateStyle(), request.getDatePattern()); if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) { String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT); - if (request.getOperator().equals("between")) { - whereName = date; + if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) { + date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + date + ",'-01-01')", "%Y-01-01"); + } + if (request.getOperator().equals("between") && request.getDatasetTableField().getDeExtractType() != 1) { + whereName = String.format(MySQLConstants.UNIX_TIMESTAMP, date) + "*1000"; } else { whereName = String.format(MySQLConstants.DATE_FORMAT, date, format); } @@ -1126,10 +1129,14 @@ public class DorisQueryProvider extends QueryProvider { whereName = "upper(" + whereName + ")"; } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { if (request.getDatasetTableField().getDeType() == 1) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); - String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); - whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); + if (request.getDatasetTableField().getDeExtractType() == 1) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); + String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); + whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); + } else { + whereValue = String.format(DorisConstants.WHERE_BETWEEN, value.get(0), value.get(1)); + } } else { whereValue = String.format(DorisConstants.WHERE_BETWEEN, value.get(0), value.get(1)); } diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index bd791c3563..18b8ed35d8 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -31,11 +31,9 @@ import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; import javax.annotation.Resource; -import java.text.Format; import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -1415,6 +1413,11 @@ public class CKQueryProvider extends QueryProvider { } } + @Override + public String sqlForPreview(String table, Datasource ds) { + return "SELECT * FROM " + String.format(CKConstants.KEYWORD_TABLE, table); + } + public List dateformat() { return JSONArray.parseArray("[\n" + "{\"dateformat\": \"%Y%m%d\"},\n" + diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 34505d28ae..8b61050428 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -1066,12 +1066,12 @@ public class MysqlQueryProvider extends QueryProvider { String format = transDateFormat(request.getDateStyle(), request.getDatePattern()); if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) { String date; - if (field.getType().equalsIgnoreCase("YEAR")) { + if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) { date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originName + ",'-01-01')", StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT); } else { date = String.format(MySQLConstants.DATE_FORMAT, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT); } - if (request.getOperator().equals("between")) { + if (request.getOperator().equals("between") && request.getDatasetTableField().getDeExtractType() != 1) { whereName = String.format(MySQLConstants.UNIX_TIMESTAMP, date) + "*1000"; } else { if (StringUtils.equalsIgnoreCase(request.getDateStyle(), "y_Q")) { diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 594b0479dd..ea634adeb7 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -211,7 +211,7 @@ public class ExtractDataService { for (DatasetTableField oldField : oldFields) { boolean delete = true; for (DatasetTableField datasetTableField : datasetTableFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) { delete = false; } } diff --git a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 6d8fe979db..29ee567046 100644 --- a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -62,9 +62,11 @@ public class SystemParameterService { List homePageList = this.getParamList("ui.openHomePage"); List marketPageList = this.getParamList("ui.openMarketPage"); List loginLimitList = this.getParamList("loginlimit"); + List autoMobileList = this.getParamList("ui.autoMobile"); paramList.addAll(homePageList); paramList.addAll(marketPageList); paramList.addAll(loginLimitList); + paramList.addAll(autoMobileList); BasicInfo result = new BasicInfo(); result.setOpenHomePage("true"); Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LoginLimitXpackService.class)); @@ -92,6 +94,10 @@ public class SystemParameterService { boolean open = StringUtils.equals("true", param.getParamValue()); result.setOpenMarketPage(open ? "true" : "false"); } + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.AUTO_MOBILE.getValue())) { + boolean close = StringUtils.equals("false", param.getParamValue()); + result.setAutoMobile(close ? "false" : "true"); + } if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.TEMPLATE_MARKET_ULR.getValue())) { result.setTemplateMarketUlr(param.getParamValue()); } diff --git a/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql b/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql index 98682bc8f0..11953b83c9 100644 --- a/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql +++ b/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql @@ -47,7 +47,7 @@ ALTER TABLE `demo_stny_carbon_emission_trend` COMMENT = '官方示例模板数 ALTER TABLE `demo_stny_disposable_energy` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `demo_stny_energy_consumption_proportion` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `demo_stny_energy_consumption_total` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; -ALTER TABLE `demo_stny_province_city_index` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; +ALTER TABLE `demo_stny_province_city_ index` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `de_engine` COMMENT = '引擎设置表'; ALTER TABLE `file_content` COMMENT = '文件内容表'; ALTER TABLE `file_metadata` COMMENT = '文件基础信息表'; diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue index 9a864b18f9..1059a9408c 100644 --- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue +++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue @@ -2,6 +2,7 @@
@@ -75,19 +76,19 @@ diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue index 678959c715..aa2edfdbdc 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue @@ -8,19 +8,19 @@ - @@ -84,7 +84,7 @@ @add="addCustomFilter" @update="calcData(true)"> @@ -98,7 +98,7 @@ diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue index 3dd5952d69..0afbe621e3 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue @@ -1,24 +1,65 @@ diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js index caa4c17e11..1d49e69424 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/utils/map.js @@ -87,6 +87,7 @@ export const DEFAULT_SLIDER = { export const DEFAULT_Graphic = { show: true, fontSize: '60', + marginModel: 'absolute', color: '#000000', alpha: 25, bottom: 90, @@ -842,7 +843,7 @@ const hexToRgba = (hex, opacity) => { } export const getMarginUnit = marginForm => { - if (!marginForm.marginModel || marginForm.marginModel === 'auto') return null + if (!marginForm || !marginForm.marginModel || marginForm.marginModel === 'auto') return null if (marginForm.marginModel === 'absolute') return 'px' if (marginForm.marginModel === 'relative') return '%' return null diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue index 499f1c3b58..fcc287506f 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue @@ -9,18 +9,18 @@ @add="addXaxis" @update="calcData(true)"> @@ -97,7 +97,7 @@ @add="addCustomFilter" @update="calcData(true)"> @@ -111,10 +111,10 @@