diff --git a/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml b/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml new file mode 100644 index 0000000000..b1f93db966 --- /dev/null +++ b/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml @@ -0,0 +1,1675 @@ + + + + + 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 +
+ + + mapx + "mapX" + dataease + + true + + 55 + + _id + "_id" + 12 + varchar + 24 + 0 + 24 + + + 24 + 1 + + 0 + + + + count + "count" + 4 + integer + 10 + 0 + 10 + + + 10 + 7 + + 0 + + + + id + "id" + 8 + double + 20 + 0 + 21 + + + 20 + 5 + + 0 + + + + latitude + "latitude" + 8 + double + 20 + 0 + 21 + + + 20 + 4 + + 0 + + + + longitude + "longitude" + 8 + double + 20 + 0 + 21 + + + 20 + 3 + + 0 + + + + name + "name" + 12 + varchar + 16793600 + 0 + 16793600 + + + 16793600 + 2 + + 0 + + + + unit_price + "unit_price" + 8 + double + 20 + 0 + 21 + + + 20 + 6 + + 0 + + + + pk_mapX + 1 + + "_id" + + + +
+ + + 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 + + 2 + + 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/controller/exportCenter/ExportCenterController.java b/core/backend/src/main/java/io/dataease/controller/exportCenter/ExportCenterController.java index fa6a9ada08..74d88b52d7 100644 --- a/core/backend/src/main/java/io/dataease/controller/exportCenter/ExportCenterController.java +++ b/core/backend/src/main/java/io/dataease/controller/exportCenter/ExportCenterController.java @@ -34,6 +34,11 @@ public class ExportCenterController { exportCenterService.delete(ids); } + @PostMapping("/deleteAll/{type}") + public void deleteAll(@PathVariable String type){ + exportCenterService.deleteAll(type); + } + @GetMapping("/download/{id}") public void download(@PathVariable String id, HttpServletResponse response) throws Exception { exportCenterService.download(id, response); diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java index 02e8945706..2ba74cacf7 100644 --- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java +++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java @@ -15,6 +15,7 @@ import io.dataease.dto.dataset.DataSetPreviewPage; import io.dataease.dto.dataset.DataSetTableUnionDTO; import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.*; +import io.dataease.plugins.common.base.mapper.ChartViewMapper; import io.dataease.plugins.common.base.mapper.DatasetTableMapper; import io.dataease.plugins.common.base.mapper.DatasourceMapper; import io.dataease.plugins.common.base.mapper.ExportTaskMapper; @@ -37,6 +38,8 @@ import io.dataease.service.dataset.*; import io.dataease.service.datasource.DatasourceService; import io.dataease.service.engine.EngineService; import io.dataease.service.panel.PanelGroupService; +import io.dataease.websocket.entity.WsMessage; +import io.dataease.websocket.service.WsService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; @@ -47,6 +50,7 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -68,6 +72,8 @@ import java.util.stream.Collectors; @Service public class ExportCenterService { + @Resource + private ChartViewMapper chartViewMapper; @Resource private ExportTaskMapper exportTaskMapper; @Value("${export.dataset.limit:100000}") @@ -108,6 +114,9 @@ public class ExportCenterService { private int keepAliveSeconds = 600; private Map Running_Task = new HashMap<>(); + @Autowired + private WsService wsService; + @PostConstruct public void init() { scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(corePoolSize); @@ -121,6 +130,16 @@ public class ExportCenterService { Map.Entry entry = iterator.next(); if (entry.getValue().isDone()) { iterator.remove(); + try { + ExportTask exportTask = exportTaskMapper.selectByPrimaryKey(entry.getKey()); + ExportTaskDTO exportTaskDTO = new ExportTaskDTO(); + BeanUtils.copyBean(exportTaskDTO, exportTask); + setExportFromName(exportTaskDTO); + WsMessage message = new WsMessage(exportTask.getUserId(), "/task-export-topic", exportTaskDTO); + wsService.releaseMessage(message); + } catch (Exception e) { + + } } } } @@ -157,6 +176,32 @@ public class ExportCenterService { exportTaskMapper.deleteByPrimaryKey(id); } + public void deleteAll(String type) { + if (!STATUS.contains(type)) { + DataEaseException.throwException("无效的状态"); + } + ExportTaskExample exportTaskExample = new ExportTaskExample(); + ExportTaskExample.Criteria criteria = exportTaskExample.createCriteria(); + criteria.andUserIdEqualTo(AuthUtils.getUser().getUserId()); + if (!type.equalsIgnoreCase("ALL")) { + criteria.andExportStatusEqualTo(type); + } + List exportTasks = exportTaskMapper.selectByExample(exportTaskExample); + exportTasks.parallelStream().forEach(exportTask -> { + Iterator> iterator = Running_Task.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + if (entry.getKey().equalsIgnoreCase(exportTask.getId())) { + entry.getValue().cancel(true); + iterator.remove(); + } + } + FileUtil.deleteDirectoryRecursively(exportData_path + exportTask.getId()); + exportTaskMapper.deleteByPrimaryKey(exportTask.getId()); + }); + + } + public void delete(List ids) { ids.forEach(id -> { delete(id); @@ -188,16 +233,17 @@ public class ExportCenterService { ExportTaskExample exportTaskExample = new ExportTaskExample(); ExportTaskExample.Criteria criteria = exportTaskExample.createCriteria(); criteria.andUserIdEqualTo(AuthUtils.getUser().getUserId()); + exportTaskExample.setOrderByClause(" export_time desc "); List exportTasks = exportTaskMapper.selectByExample(exportTaskExample); List result = new ArrayList<>(); exportTasks.forEach(exportTask -> { ExportTaskDTO exportTaskDTO = new ExportTaskDTO(); BeanUtils.copyBean(exportTaskDTO, exportTask); if (status.equalsIgnoreCase("ALL")) { - setExportFromName(exportTaskDTO); + setExportFromAbsName(exportTaskDTO); } if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) { - setExportFromName(exportTaskDTO); + setExportFromAbsName(exportTaskDTO); } result.add(exportTaskDTO); }); @@ -205,7 +251,7 @@ public class ExportCenterService { return result; } - private void setExportFromName(ExportTaskDTO exportTaskDTO) { + private void setExportFromAbsName(ExportTaskDTO exportTaskDTO) { if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) { exportTaskDTO.setExportFromName(panelGroupService.getAbsPath(exportTaskDTO.getExportFrom())); } @@ -214,6 +260,16 @@ public class ExportCenterService { } } + private void setExportFromName(ExportTaskDTO exportTaskDTO) { + if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) { + exportTaskDTO.setExportFromName(chartViewMapper.selectByPrimaryKey(exportTaskDTO.getExportFrom()).getName()); + } + if (exportTaskDTO.getExportFromType().equalsIgnoreCase("dataset")) { + exportTaskDTO.setExportFromName(datasetTableMapper.selectByPrimaryKey(exportTaskDTO.getExportFrom()).getName()); + } + } + + public void exportTableDetails(PanelViewDetailsRequest request, Workbook wb, CellStyle cellStyle, Sheet detailsSheet) throws IOException { List details = request.getDetails(); Integer[] excelTypes = request.getExcelTypes(); diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue index c4195e93b2..c03573952f 100644 --- a/core/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue @@ -488,7 +488,7 @@ export default { const customClass = `de-message-loading de-message-export`; this.$message({ message: h("p", null, [ - "后台导出中,可前往", + this.$t('data_export.exporting'), h( Button, { @@ -503,9 +503,9 @@ export default { }, }, }, - "数据导出中心", + this.$t('data_export.export_center'), ), - "查看进度,进行下载、暂停等操作", + this.$t('data_export.export_info'), ]), iconClass, showClose: true, @@ -533,7 +533,7 @@ export default { }, }, }, - "数据导出中心", + this.$t('data_export.export_center'), ), ]), iconClass, diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue index 1cb4f4afd6..3c4cbf26e3 100644 --- a/core/frontend/src/components/canvas/customComponent/UserView.vue +++ b/core/frontend/src/components/canvas/customComponent/UserView.vue @@ -765,7 +765,7 @@ export default { const customClass = `de-message-loading de-message-export`; this.$message({ message: h("p", null, [ - "后台导出中,可前往", + this.$t('data_export.exporting'), h( Button, { @@ -780,9 +780,9 @@ export default { }, }, }, - "数据导出中心", + this.$t('data_export.export_center'), ), - "查看进度,进行下载、暂停等操作", + this.$t('data_export.export_info'), ]), iconClass, showClose: true, @@ -810,7 +810,7 @@ export default { }, }, }, - "数据导出中心", + this.$t('data_export.export_center'), ), ]), iconClass, diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 507f69936b..8d32f0ae51 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -538,6 +538,7 @@ export default { confirm: 'Confirm' }, deDataset: { + goto:', go to ', search_by_name: 'Search by name', new_folder: 'New Folder', search_fields: 'Search Fields', @@ -3209,5 +3210,15 @@ export default { geometry: 'Geometry', onlinemap: 'Online map', empty_desc: 'No map key' + }, + data_export:{ + export_center: 'Data Export Center', + export_info: 'View progress and download', + exporting: 'Exporting in the background, you can go to', + del_all: 'Delete all', + export_failed: 'Export failed', + export_from: 'Export source', + export_obj: 'Export object', + export_time: 'Export time' } } diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index 7a89233370..ea414c4bc4 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -538,6 +538,7 @@ export default { confirm: '確 定' }, deDataset: { + goto:', 前往 ', search_by_name: '通過名稱搜索', new_folder: '新建資料夾', search_fields: '搜索欄位', @@ -3201,5 +3202,15 @@ export default { geometry: '地理信息', onlinemap: '在線地圖', empty_desc: '暫無在線地圖key' + }, + data_export:{ + export_center: '資料匯出中心', + export_info: '查看進度，進行下載', + exporting: '後台匯出中,可前往', + del_all: '全部刪除', + export_failed: '匯出失敗', + export_from: '匯出來源', + export_obj: '匯出對象', + export_time: '匯出時間' } } diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 28a11af7d1..53c827d039 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -1806,6 +1806,7 @@ export default { sub_axis_label: '副轴标签' }, dataset: { + goto:', 前往 ', scope_edit: '仅编辑时生效', scope_all: '数据集预览时全局生效', spend_time: '耗时', @@ -3202,5 +3203,15 @@ export default { geometry: '地理信息', onlinemap: '在线地图', empty_desc: '暂无在线地图key' + }, + data_export:{ + export_center: '数据导出中心', + export_info: '查看进度，进行下载', + exporting: '后台导出中,可前往', + del_all: '全部删除', + export_failed: '导出失败', + export_from: '导出来源', + export_obj: '导出对象', + export_time: '导出时间' } } diff --git a/core/frontend/src/views/dataset/data/ViewTable.vue b/core/frontend/src/views/dataset/data/ViewTable.vue index ca4b63bf24..c60521ea04 100644 --- a/core/frontend/src/views/dataset/data/ViewTable.vue +++ b/core/frontend/src/views/dataset/data/ViewTable.vue @@ -497,7 +497,7 @@ export default { const customClass = `de-message-loading de-message-export`; this.$message({ message: h("p", null, [ - "后台导出中,可前往", + this.$t('data_export.exporting'), h( Button, { @@ -512,9 +512,9 @@ export default { }, }, }, - "数据导出中心", + this.$t('data_export.export_center'), ), - "查看进度,进行下载、暂停等操作", + this.$t('data_export.export_info'), ]), iconClass, showClose: true, diff --git a/core/frontend/src/views/dataset/exportExcel/index.vue b/core/frontend/src/views/dataset/exportExcel/index.vue index 72ddb33155..c90e1284d3 100644 --- a/core/frontend/src/views/dataset/exportExcel/index.vue +++ b/core/frontend/src/views/dataset/exportExcel/index.vue @@ -1,7 +1,7 @@