From 559a23ed6e567a661893d8d77ae0d5f086e5b885 Mon Sep 17 00:00:00 2001 From: Unknown <154940001@qq.com> Date: Thu, 15 Mar 2018 18:36:02 +0800 Subject: [PATCH] 修改byte ,short 字段为int --- new-wisfarm-platform/数据库/Wisfarm-Workspace.sws | 2 +- new-wisfarm-platform/数据库/WisfarmPlatform.pdm | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------- new-wisfarm-platform/数据库/iot_monitoring.sql | 74 +++++++++++++++++++++++++++++++++++++------------------------------------- new-wisfarm-platform/数据库/system.sql | 7 +++---- new-wisfarm-platform/数据库/wisfarm-platform.CDM | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- 5 files changed, 254 insertions(+), 256 deletions(-) diff --git a/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws b/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws index 5a434b0..0335879 100644 --- a/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws +++ b/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws @@ -5,7 +5,7 @@ - + diff --git a/new-wisfarm-platform/数据库/WisfarmPlatform.pdm b/new-wisfarm-platform/数据库/WisfarmPlatform.pdm index b036e2a..c361cd9 100644 --- a/new-wisfarm-platform/数据库/WisfarmPlatform.pdm +++ b/new-wisfarm-platform/数据库/WisfarmPlatform.pdm @@ -1,5 +1,5 @@ - + @@ -12,10 +12,9 @@ WisfarmPlatform 1516759773 Master -1520927137 +1521019123 Master -ORG {48086B01-C9E1-11D4-9552-0090277716A9} -ATT FOPT +ORG {48086B01-C9E1-11D4-9552-0090277716A9} [FolderOptions] [FolderOptions\Physical Objects] @@ -3687,9 +3686,9 @@ PhysOpts= 6A20EB30-ADE6-47A6-AED9-9C13605945F5 WisfarmPlatform WisfarmPlatform -1520926893 +1521019124 Master -1520926893 +1521019124 Master 48086B01-C9E1-11D4-9552-0090277716A9 @@ -4360,7 +4359,7 @@ Shadow=0 15 -1520926893 +1521019123 ((-42879,30786), (-33157,44505)) ((-33557,44105),(-33557,31411),(-42479,31411)) 1 @@ -4381,7 +4380,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-48503,31011), (-41854,44204)) ((-48103,43804),(-48103,39227),(-42479,39227),(-42479,31411)) 1 @@ -4402,7 +4401,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-42879,30786), (-16211,36345)) ((-16611,35945),(-16611,31411),(-42479,31411)) 1 @@ -4423,7 +4422,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-107294,32013), (-72674,33263)) ((-106894,32638),(-73074,32638)) 1 @@ -4444,7 +4443,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-47206,80021), (-23288,81271)) ((-23688,80646),(-46806,80646)) 1 @@ -4465,9 +4464,9 @@ DESTINATION 0 新宋体,8,N -1520926893 -((-72863,78821), (-60414,80071)) -((-72463,79446),(-60814,79446)) +1521019123 +((-73056,78821), (-60414,80071)) +((-72656,79446),(-60814,79446)) 1 1 11184640 @@ -4486,7 +4485,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-53235,85532), (-51985,92904)) ((-52610,92504),(-52610,85932)) 1 @@ -4507,7 +4506,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-47206,83069), (-36569,91320)) ((-36969,90920),(-36969,83694),(-46806,83694)) 1 @@ -4528,7 +4527,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-54210,66752), (-45406,80071)) ((-52901,77291),(-52901,67152),(-46753,67152),(-46753,79446),(-53810,79446)) 1 @@ -4549,7 +4548,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-80839,91569), (-79589,100748)) ((-80214,91969),(-80214,100348)) 1 @@ -4570,7 +4569,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-76054,85532), (-53185,90369)) ((-75654,89969),(-53810,89969),(-53810,85932)) 1 @@ -4591,7 +4590,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-80614,103733), (-17058,104983)) ((-17458,104358),(-80214,104358)) 1 @@ -4612,7 +4611,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-18082,92300), (-16832,104759)) ((-17457,104359),(-17457,92700)) 1 @@ -4633,7 +4632,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-43104,20082), (-38877,31811)) ((-39277,20482),(-39277,23703),(-42479,23703),(-42479,31411)) 1 @@ -4654,7 +4653,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-45146,3377), (-43896,18883)) ((-44521,18483),(-44521,3777)) 1 @@ -4675,7 +4674,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-67467,13562), (-66217,33038)) ((-66842,13962),(-66842,32638)) 1 @@ -4696,7 +4695,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-61399,3377), (-45835,14362)) ((-60999,13962),(-46460,13962),(-46460,3777)) 1 @@ -4717,7 +4716,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-19844,951), (-7296,2201)) ((-7696,1576),(-19444,1576)) 1 @@ -4738,7 +4737,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-91278,17548), (-66648,29677)) ((-90878,17948),(-79832,17948),(-79832,29052),(-67048,29052)) 1 @@ -4759,7 +4758,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019124 -1 ((-49483,24924), (-35475,37898)) 11184640 @@ -4783,7 +4782,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-30362,-1611), (-19444,4763)) 0 @@ -4808,7 +4807,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-54084,40556), (-42010,51053)) 0 @@ -4833,7 +4832,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-7696,910), (1470,7148)) 0 @@ -4859,7 +4858,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-22263,32346), (-10959,39544)) 0 @@ -4884,7 +4883,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-39683,40857), (-27609,51354)) 0 @@ -4909,7 +4908,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-98242,3796), (-85008,10994)) 11184640 @@ -4933,7 +4932,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-62972,57436), (-51284,64634)) 11184640 @@ -4957,7 +4956,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-73074,26564), (-60612,38712)) 0 @@ -4982,7 +4981,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-119742,27398), (-106894,34596)) 11184640 @@ -5006,7 +5005,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-60814,72960), (-46806,85932)) 11184640 @@ -5030,7 +5029,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-23688,73495), (-11226,93893)) 0 @@ -5055,7 +5054,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-52009,-1771), (-40911,3777)) 0 @@ -5080,9 +5079,9 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 -((-83767,76723), (-72463,81447)) +((-83574,76723), (-72656,81447)) 11184640 16777136 12632256 @@ -5104,7 +5103,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-87218,100348), (-73210,108370)) 11184640 @@ -5128,7 +5127,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-43393,90920), (-30545,102241)) 0 @@ -5153,7 +5152,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-62646,92504), (-49798,99702)) 0 @@ -5178,7 +5177,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-96143,15174), (-85613,20722)) 11184640 @@ -5202,7 +5201,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-85026,87970), (-75654,91969)) 11184640 @@ -5226,7 +5225,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-22530,102359), (-12386,106358)) 11184640 @@ -5250,7 +5249,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-45121,18483), (-33433,22482)) 11184640 @@ -5274,7 +5273,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-72689,11963), (-60999,15962)) 11184640 @@ -5949,7 +5948,7 @@ Shadow=0 15 -1520926893 +1521019123 ((-33454,14482), (-14545,15732)) ((-14945,15107),(-33054,15107)) 1 @@ -5970,7 +5969,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-10112,7523), (-8862,13937)) ((-9487,7923),(-9487,13537)) 1 @@ -5991,7 +5990,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-9829,-3401), (-8579,4324)) ((-9204,3924),(-9204,-3001)) 1 @@ -6012,7 +6011,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-39910,-7000), (-19120,1564)) ((-19520,-6600),(-39285,-6600),(-39285,1164)) 1 @@ -6033,7 +6032,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((7981,-6251), (25413,138)) ((8381,-5851),(24788,-5851),(24788,-262)) 1 @@ -6054,7 +6053,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((-15437,-6663), (4245,-5413)) ((3845,-6038),(-15037,-6038)) 1 @@ -6075,7 +6074,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019123 ((5188,2370), (25188,6511)) ((24788,2770),(5588,2770),(5588,5871),(14213,5871),(14213,5886),(24788,5886)) 1 @@ -6097,7 +6096,7 @@ DESTINATION 0 新宋体,8,N -1520926893 +1521019124 -1 ((-14945,13537), (-4029,23211)) 11184640 @@ -6121,7 +6120,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-19520,-10199), (-8604,-3001)) 11184640 @@ -6145,7 +6144,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((18557,-262), (31019,9410)) 11184640 @@ -6169,7 +6168,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019124 -1 ((-45516,1164), (-33054,15786)) 11184640 @@ -6193,7 +6192,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-11174,3924), (-1802,7923)) 11184640 @@ -6217,7 +6216,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((-991,-7851), (8381,-3852)) 11184640 @@ -6892,7 +6891,7 @@ Shadow=0 15 -1520926893 +1521019123 -1 ((-20025,6787), (-7949,13161)) 11184640 @@ -6916,7 +6915,7 @@ LABL 0 新宋体,8,N -1520926893 +1521019123 -1 ((6556,7725), (19018,13273)) 11184640 @@ -7027,12 +7026,12 @@ DAT 1516759777 current_state 1516759776 Master -1516776708 +1521019123 Master 10待执行，20执行中，30待恢复，40已触发，50 不可执行（使能关闭） ORG {2EB5042C-AA90-427B-B875-6EA731E3DB34} DAT 1516759777 -tinyint +int 70A1DDF2-396F-4B1B-96C1-0D84C7AED44B @@ -7040,12 +7039,12 @@ DAT 1516759777 trgger_type 1516759776 Master -1516759776 +1521019123 Master 1 时间触发，2条件触发 ORG {05BAC538-0CE9-4C98-801A-0E46426F1EA9} DAT 1516759777 -tinyint +int 8BBD7552-C299-4122-A605-9456CB85A7A4 @@ -7079,12 +7078,12 @@ DAT 1516759777 continued_minutes 1516759776 Master -1516776708 +1521019123 Master trgger_type=1时的触发后的持续分钟数，其他为空 ORG {9135C2EC-40FB-4986-AB25-43BD5E380666} DAT 1516759777 -smallint +int 8F8C5564-7B80-4D6E-BB6E-E63D3449E348 @@ -7277,12 +7276,12 @@ DAT 1516759777 msg_type 1516759776 Master -1516759776 +1521019123 Master 1 通知，2告警 ORG {558C3862-30BD-4DE9-AC92-E10012751A33} DAT 1516759777 -tinyint +int 627D0235-E592-43ED-ADA0-142741C46883 @@ -7290,12 +7289,12 @@ DAT 1516759777 msg_source 1516759776 Master -1516759776 +1521019123 Master 1触发器，2分组控制；3 人工推送，4第三方推送 ORG {8FF64C8E-1FB2-4A7D-97DD-C22D66B38088} DAT 1516759777 -tinyint +int 84EA720E-DCA1-48D9-8636-BE44B5CFBFBB @@ -7786,11 +7785,11 @@ DAT 1516759777 level_no 1516759776 Master -1516759776 +1521019123 Master ORG {B0FE3CF0-5DD6-476C-A977-735D25D490A3} DAT 1516759777 -tinyint +int D19EA375-99FD-491C-ABEC-AE7FB6076B25 @@ -7798,12 +7797,12 @@ DAT 1516759777 condition_relation 1516759776 Master -1516759776 +1521019123 Master 0表示无关系，1表示与前一个条件之间是且关系，2表示与前一个条件之间是或关系。 ORG {37EBA6A0-81F6-4893-B39C-82DA6680B7BA} DAT 1516759777 -tinyint +int 4A39331D-15E1-432B-B895-F42666573813 @@ -7811,12 +7810,12 @@ DAT 1516759777 condition_type 1516759776 Master -1516776708 +1521019123 Master 1 数值高于x ；2 数值低于y；3 开关开启；4 开关关闭；5 数值在x和y之间；6 数值低于X或者高于Y；7 数值高于x超过m分钟；8 数值低于x超过M分钟； ORG {98274AD6-EC3C-48F7-B770-C5A7B52D9033} DAT 1516759777 -tinyint +int @@ -8354,11 +8353,11 @@ DAT 1516759777 level_no 1516759776 Master -1516776708 +1521019123 Master ORG {572A99FD-7472-4B12-B26C-E7D5F4EE9595} DAT 1516759777 -tinyint +int CDF75407-BF62-40D6-AA92-EC9E18855093 @@ -8366,12 +8365,12 @@ DAT 1516759777 condition_relation 1516759776 Master -1516776708 +1521019123 Master 0表示无关系，1表示与前一个条件之间是且关系，2表示与前一个条件之间是或关系。 ORG {810449FB-5BAC-4EF4-AEBD-40929B3FF2D9} DAT 1516759777 -tinyint +int 1B7FB081-706D-48C6-9505-DDB8C3B3F642 @@ -8379,12 +8378,12 @@ DAT 1516759777 condition_type 1516759776 Master -1516776708 +1521019123 Master 1 数值高于x ；2 数值低于y；3 开关开启；4 开关关闭；5 数值在x和y之间；6 数值低于X或者高于Y；7 数值高于x超过m分钟；8 数值低于x超过M分钟； ORG {D9D0AAED-7986-4EF9-8F84-09DB464546F7} DAT 1516759777 -tinyint +int @@ -8527,12 +8526,12 @@ DAT 1516759777 record_type 1516759776 Master -1516759776 +1521019123 Master 1触发器执行记录，2分组执行记录 ORG {30ABA72A-E836-47CC-9EC9-5E647CC80495} DAT 1516759777 -tinyint +int E27CA2D1-F0BE-4D11-B0A7-18C68CE10F1A @@ -8540,12 +8539,12 @@ DAT 1516759777 record_result 1516759776 Master -1516776708 +1521019123 Master 1待定；2 成功；3失败 ORG {4A0199C3-A089-449F-ABCE-35A75DEAB5CF} DAT 1516759777 -tinyint +int D8486683-C020-4F7B-A92F-5E0E552AEAEF @@ -8661,12 +8660,12 @@ DAT 1516759777 event_type 1516759776 Master -1516759776 +1521019123 Master 1 手动；2策略自动触发 ORG {D443D2A1-4CD7-42DD-AAE1-F276182FFB6C} DAT 1516759777 -tinyint +int 23638C90-6AE9-47CA-8977-F3DCD15793E4 @@ -8688,12 +8687,12 @@ DAT 1516759777 event_result 1516759776 Master -1516759776 +1521019123 Master 1待定；2成功；3失败 ORG {2E3CDC3A-D159-41A7-9C92-1DBB2C8BBF83} DAT 1516759777 -tinyint +int 1D495CD5-2503-4ACD-80CB-5528C337FA6D @@ -8859,12 +8858,12 @@ DAT 1516759777 continued_minutes 1516759776 Master -1516776708 +1521019123 Master 半自动，自动类型填 ORG {FEA465A5-15F0-4180-9797-8724D4160ECA} DAT 1516759777 -smallint +int 5FAEDE98-719C-4CE2-91F4-45E30109AFF6 @@ -8885,12 +8884,12 @@ DAT 1516759777 current_state 1516759776 Master -1516860750 +1521019123 Master 10待执行，20执行中，30暂停中，31暂停， 40失败， 50 结束中，51结束，60执行完成，70 不可执行 ORG {24382CC9-8D85-4593-83ED-EF9AB2CBD5D0} DAT 1516759777 -tinyint +int 5AC10101-C433-4776-8E1E-5698D588472D @@ -8898,11 +8897,11 @@ DAT 1516759777 countdown_minutes 1517392469 Master -1517392478 +1521019123 Master ORG {BD394992-343B-4CDA-AD42-86EC9E31F7BF} DAT 1517392471 -smallint +int 27377309-8293-4210-9E84-0BAEF1A431DE @@ -9552,12 +9551,12 @@ DAT 1517392471 role_type 1517392469 Master -1517392478 +1521019123 Master 1 超级管理员，2管理员；3农场主，4 农户，5农技人员，6第三方游客 ORG {97181E3A-3BED-4E18-9335-9AAB63E4153F} DAT 1517392471 -tinyint +int @@ -9690,12 +9689,12 @@ DAT 1516759777 resources_type 1517993729 Master -1517993733 +1521019123 Master 1 目录；2菜单；3接口 ORG {8332110A-7323-400F-BE31-0F313FFF9262} DAT 1517993730 -tinyint +int 3FAB0323-0DAD-4743-A781-2814D6B56D9A @@ -9882,12 +9881,12 @@ DAT 1516776703 current_state 1516860743 Master -1516860750 +1521019123 Master 10待执行，20执行中，30暂停中，31暂停， 40失败， 50 结束中，51结束，60执行完成，70 不可执行 ORG {6789A724-AEA0-498B-9B51-D0D84761FEA0} DAT 1516860743 -tinyint +int 5131BE69-30E0-4D8D-8413-398F7DC82133 @@ -10429,13 +10428,13 @@ DAT 1516759777 device_password 1516759776 Master -1516776708 +1521019123 Master MQTT鉴权和访问控制时使用，SHA256加密 ORG {D3527773-2B32-4CBD-AF5B-6E5A747E26DE} DAT 1516759777 -varchar(100) -100 +varchar(500) +500 D5DA6559-CF44-4C81-8882-A986C3354F2D @@ -10469,12 +10468,12 @@ DAT 1516759777 device_type 1516759776 Master -1516759776 +1521019123 Master 1 网络设备；2单点设备；3本地设备 ORG {25016839-164F-4953-8127-E65A676162AC} DAT 1516759777 -tinyint +int 22B3641C-0206-43C2-81E8-E138E2A0BDA2 @@ -10494,12 +10493,12 @@ DAT 1516759777 device_protocol_type 1516759776 Master -1516759776 +1521019123 Master 1 联网协议；2本地协议 ORG {56BFE971-1402-45F1-B4A0-A9175328FE02} DAT 1516759777 -tinyint +int D91A9ED5-D84F-413D-A36F-CD0736550421 @@ -10719,12 +10718,12 @@ DAT 1516759777 sensor_type 1516759776 Master -1516759776 +1521019123 Master 1 只读数值型；2读写数值型；3只读开关型；4读写开关；5定位型 ORG {94AFB347-07F5-4CC0-AB0D-F547F52274F9} DAT 1516759777 -tinyint +int C8AE01F1-9028-4C3D-A8E6-779BFB283104 @@ -10732,12 +10731,12 @@ DAT 1516759777 sensor_value_type 1516759776 Master -1516759776 +1521019123 Master 1 bit；2 byte；3 short；4 integer；5 long；6 float；7double ORG {B1A57B49-4197-4E22-B772-6660BD41CED2} DAT 1516759777 -tinyint +int C9386296-33B7-4EF4-BA9E-D4A212C36BB8 @@ -10745,11 +10744,11 @@ DAT 1516759777 read_register_location 1516759776 Master -1516759776 +1521019123 Master ORG {9E585E1A-0F0C-4010-B03D-60F1053F9A7B} DAT 1516759777 -smallint +int 753CBBB7-2109-42B3-8708-63C963A52F7B @@ -10757,11 +10756,11 @@ DAT 1516759777 write_register_location 1516759776 Master -1516759776 +1521019123 Master ORG {AE4C3B11-361C-4FB4-A538-C0ECF9238ED8} DAT 1516759777 -smallint +int 9AE15395-D1B9-4E41-A40E-A9B464CCA72B @@ -10769,12 +10768,12 @@ DAT 1516759777 value_calc_way 1516759776 Master -1516759776 +1521019123 Master 1系数计算；2混合计算；3原始计算 ORG {263C7642-A121-4BEF-B02B-FD959C4BD6F3} DAT 1516759777 -tinyint +int 59066F46-23DF-44D4-9D6F-4F70CBA76D65 @@ -10860,12 +10859,12 @@ DAT 1516759777 value_decimal_places 1516759776 Master -1516759776 +1521019123 Master 0-4 ORG {8539B3D0-C02C-46A9-B8D3-7D01AF30B4DE} DAT 1516759777 -tinyint +int 1A53EFD0-853D-45A5-A8F4-2BB059714050 @@ -11229,12 +11228,12 @@ DAT 1516759777 device_state 1516759776 Master -1516759776 +1521019123 Master 1 在线；2离线 ORG {55A00A37-E0FF-4112-9B49-8E3BF2F0F3C7} DAT 1516759777 -tinyint +int 13909186-1622-4C24-B5AB-3A8A87DE3903 @@ -11561,12 +11560,12 @@ DAT 1516759777 port_type 1516759776 Master -1516759776 +1521019123 Master 1 串口；2网口 ORG {2589FEB4-2E37-4AD5-A834-733D3B5E0CB9} DAT 1516759777 -tinyint +int 023EB061-5464-405F-B013-E60AA6D8CE0A @@ -11588,12 +11587,12 @@ DAT 1516759777 verify_way 1516759776 Master -1516759776 +1521019123 Master 串口使用 ORG {9B49F2CF-88F0-4B35-8F0C-94B898443A65} DAT 1516759777 -tinyint +int 9CB80298-DBB6-468C-850E-24D9E7ED5BE2 @@ -11628,12 +11627,12 @@ DAT 1516759777 connect_port 1516759776 Master -1516776708 +1521019123 Master 网口使用 ORG {D207556D-DE43-47A2-BA0C-2245E2B17ACA} DAT 1516759777 -smallint +int C312E068-6D42-4CFB-B81C-3014548224E8 @@ -11654,11 +11653,11 @@ DAT 1516759777 acquisition_cycle 1516759776 Master -1516759776 +1521019123 Master ORG {12583E28-22B5-44C5-9147-A1429CB3258F} DAT 1516759777 -tinyint +int 82F19398-BA30-47BA-925D-AA54316D1772 @@ -11666,12 +11665,12 @@ DAT 1516759777 connect_protocol_type 1516759776 Master -1516776708 +1521019123 Master 1Modbus-TCP；2Modbus-RTU；3Wisfarm-lora ORG {89A32A57-807C-496A-A471-C43EC035372B} DAT 1516759777 -tinyint +int @@ -11840,12 +11839,12 @@ DAT 1516759777 connect_protocol_type 1516759776 Master -1516776708 +1521019123 Master 1 MQTT；2RPC；3HTTP；4RabbitMQ ORG {29502F8C-BEBC-4556-904C-0AA2A30B756D} DAT 1516759777 -tinyint +int @@ -13454,12 +13453,12 @@ DAT 1517394160 WisfarmPlatform 1516759777 Master -1520926909 +1521019090 Master -file:///D|/wisfarm/wisarm-project/project-document/wisfarm/wisfarm-platform.CDM +file:///D|/wisfarm/wisarm-project/project-document/new-wisfarm-platform/数据库/wisfarm-platform.CDM 48086B01-C9E1-11D4-9552-0090277716A9 1E597170-9350-11D1-AB3C-0020AF71E433 -1520926909 +1521019124 diff --git a/new-wisfarm-platform/数据库/iot_monitoring.sql b/new-wisfarm-platform/数据库/iot_monitoring.sql index 8e96a80..2968da7 100644 --- a/new-wisfarm-platform/数据库/iot_monitoring.sql +++ b/new-wisfarm-platform/数据库/iot_monitoring.sql @@ -1,9 +1,9 @@ /*==============================================================*/ /* DBMS name: MySQL 5.0 */ -/* Created on: 2018/3/13 15:32:37 */ +/* Created on: 2018/3/14 17:19:54 */ /*==============================================================*/ -SET FOREIGN_KEY_CHECKS=0; +SET FOREIGN_KEY_CHECKS=0; drop index farm_device_index on device; drop table if exists device; @@ -92,12 +92,12 @@ create table device device_name varchar(200), device_describe varchar(500), device_no char(16) comment '豸к16λ', - device_password varchar(100) comment 'MQTTȨͷʿʱʹãSHA256', + device_password varchar(500) comment 'MQTTȨͷʿʱʹãSHA256', device_long varchar(20), device_lat varchar(20), - device_type tinyint comment '1 豸2豸3豸', + device_type int comment '1 豸2豸3豸', farm_id bigint, - device_protocol_type tinyint comment '1 Э飻2Э', + device_protocol_type int comment '1 Э飻2Э', device_icon varchar(300), create_date_time bigint, modified_date_time bigint, @@ -119,7 +119,7 @@ create table device_state_record ( dsr_id bigint not null, device_id bigint, - device_state tinyint comment '1 ߣ2', + device_state int comment '1 ߣ2', record_date_time bigint, primary key (dsr_id) ); @@ -140,9 +140,9 @@ create table event_record event_record_id bigint not null auto_increment, event_name varchar(300), event_date_time bigint, - event_type tinyint comment '1 ֶ2Զ', + event_type int comment '1 ֶ2Զ', event_source varchar(300) comment 'operate_type=1ʱ¼operate_type=2ʱ¼', - event_result tinyint comment '12ɹ3ʧ', + event_result int comment '12ɹ3ʧ', farm_id bigint, primary key (event_record_id) ); @@ -164,10 +164,10 @@ create table group_control group_name varchar(200), group_type tinyint comment '1 ֶֶƶ/أ2 Զֶ򿪶ʱԶرն3 ԶʱԶ򿪶ʱԶرն', start_time varchar(8) comment 'Զ', - continued_minutes smallint comment 'ԶԶ', + continued_minutes int comment 'ԶԶ', is_sms bool comment '1 ֪ͨ0֪ͨ', - current_state tinyint comment '10ִУ20ִУ30ͣУ31ͣ 40ʧܣ 50 У5160ִɣ70 ִ', - countdown_minutes smallint, + current_state int comment '10ִУ20ִУ30ͣУ31ͣ 40ʧܣ 50 У5160ִɣ70 ִ', + countdown_minutes int, start_execute_date_time bigint, farm_id bigint, is_deleted bool default 0 comment '1ʾɾ 0ʾδɾ', @@ -216,7 +216,7 @@ create table group_control_cycle_week gccw_id bigint not null auto_increment, group_control_id bigint, cycle_week char(3) comment 'SUNMONTUEWEDTHUFRISAT', - current_state tinyint comment '10ִУ20ִУ30ͣУ31ͣ 40ʧܣ 50 У5160ִɣ70 ִ', + current_state int comment '10ִУ20ִУ30ͣУ31ͣ 40ʧܣ 50 У5160ִɣ70 ִ', is_cycle bool comment '1 ѭ0 һ', primary key (gccw_id) ); @@ -247,15 +247,15 @@ create table local_protocol_param lpp_id bigint not null auto_increment, device_id bigint, sub_connect_url varchar(300), - port_type tinyint comment '1 ڣ2', + port_type int comment '1 ڣ2', serial_port_no varchar(100) comment 'ʹ', - verify_way tinyint comment 'ʹ', + verify_way int comment 'ʹ', baud_rate float comment 'ʹ', connect_ip varchar(20) comment 'ʹ', - connect_port smallint comment 'ʹ', + connect_port int comment 'ʹ', connect_time_out int comment 'ʹ', - acquisition_cycle tinyint, - connect_protocol_type tinyint comment '1Modbus-TCP2Modbus-RTU3Wisfarm-lora', + acquisition_cycle int, + connect_protocol_type int comment '1Modbus-TCP2Modbus-RTU3Wisfarm-lora', primary key (lpp_id) ); @@ -275,8 +275,8 @@ create table message msg_id bigint not null auto_increment, msg_title varchar(200), msg_content varchar(500), - msg_type tinyint comment '1 ֪ͨ2澯', - msg_source tinyint comment '12ƣ3 ˹ͣ4', + msg_type int comment '1 ֪ͨ2澯', + msg_source int comment '12ƣ3 ˹ͣ4', create_date_time bigint, primary key (msg_id) ); @@ -365,7 +365,7 @@ create table networking_protocol_param communication_time_out int, connect_time_out int, api_token varchar(100), - connect_protocol_type tinyint comment '1 MQTT2RPC3HTTP4RabbitMQ', + connect_protocol_type int comment '1 MQTT2RPC3HTTP4RabbitMQ', primary key (npp_id) ); @@ -389,18 +389,18 @@ create table sensor sensor_icon varchar(300), sensor_long varchar(20), sensor_lat varchar(20), - sensor_type tinyint comment '1 ֵֻͣ2дֵͣ3ֻͣ4дأ5λ', - sensor_value_type tinyint comment '1 bit2 byte3 short4 integer5 long6 float7double', - read_register_location smallint, - write_register_location smallint, - value_calc_way tinyint comment '1ϵ㣻2ϼ㣻3ԭʼ', + sensor_type int comment '1 ֵֻͣ2дֵͣ3ֻͣ4дأ5λ', + sensor_value_type int comment '1 bit2 byte3 short4 integer5 long6 float7double', + read_register_location int, + write_register_location int, + value_calc_way int comment '1ϵ㣻2ϼ㣻3ԭʼ', coefficient_a float comment '㷽ʽΪϵͻϼʱЧ', coefficient_b float comment '㷽ʽΪϵͻϼʱЧ', high_range float comment 'һֵֵֵ㷽ʽΪϼʱڼABϵ', low_range float comment 'һֵֵֵ㷽ʽΪϼʱڼABϵ', max_code_value float comment 'ֵֵֵ㷽ʽΪϼʱڼABϵ', min_code_value float comment 'ֵֵֵ㷽ʽΪϼʱڼABϵ', - value_decimal_places tinyint comment '0-4', + value_decimal_places int comment '0-4', value_unit varchar(10), value_change_zone float comment 'ΪֵʱЧ', high_limit float comment 'ΪֵʱЧUIչʾʹ', @@ -450,8 +450,8 @@ create table strategy_execute_record record_date_time bigint, source_id bigint comment 'record_type=1ʱ ʾidrecord_type=2ʱ ʾid', record_name varchar(300), - record_type tinyint comment '1ִм¼2ִм¼', - record_result tinyint comment '12 ɹ3ʧ ', + record_type int comment '1ִм¼2ִм¼', + record_result int comment '12 ɹ3ʧ ', farm_id bigint, primary key (ser_id) ); @@ -494,9 +494,9 @@ create table trigger_condition_end sensor_no char(16), value1 float, value2 float, - level_no tinyint, - condition_relation tinyint comment '0ʾ޹ϵ1ʾǰһ֮ҹϵ2ʾǰһ֮ǻϵ', - condition_type tinyint comment '1 ֵx 2 ֵy3 ؿ4 عرգ5 ֵxy֮䣻6 ֵX߸Y7 ֵxmӣ8 ֵxMӣ', + level_no int, + condition_relation int comment '0ʾ޹ϵ1ʾǰһ֮ҹϵ2ʾǰһ֮ǻϵ', + condition_type int comment '1 ֵx 2 ֵy3 ؿ4 عرգ5 ֵxy֮䣻6 ֵX߸Y7 ֵxmӣ8 ֵxMӣ', primary key (condition_end_id) ); @@ -523,9 +523,9 @@ create table trigger_condition_start sensor_no char(16), value1 float, value2 float, - level_no tinyint, - condition_relation tinyint comment '0ʾ޹ϵ1ʾǰһ֮ҹϵ2ʾǰһ֮ǻϵ', - condition_type tinyint comment '1 ֵx 2 ֵy3 ؿ4 عرգ5 ֵxy֮䣻6 ֵX߸Y7 ֵxmӣ8 ֵxMӣ', + level_no int, + condition_relation int comment '0ʾ޹ϵ1ʾǰһ֮ҹϵ2ʾǰһ֮ǻϵ', + condition_type int comment '1 ֵx 2 ֵy3 ؿ4 عرգ5 ֵxy֮䣻6 ֵX߸Y7 ֵxmӣ8 ֵxMӣ', primary key (condition_start_id) ); @@ -548,11 +548,11 @@ create table triggers trgger_name varchar(200), is_deleted bool default 0 comment '1ʾɾ 0ʾδɾ', is_enable bool default 1 comment '1ʾʹܿ0ʾʹܹر', - current_state tinyint comment '10ִУ20ִУ30ָ40Ѵ50 ִУʹܹرգ', - trgger_type tinyint comment '1 ʱ䴥2', + current_state int comment '10ִУ20ִУ30ָ40Ѵ50 ִУʹܹرգ', + trgger_type int comment '1 ʱ䴥2', trigger_describe varchar(500), trigger_date_time bigint comment 'trgger_type=1ʱʱ䴥Ϊ', - continued_minutes smallint comment 'trgger_type=1ʱĴijΪ', + continued_minutes int comment 'trgger_type=1ʱĴijΪ', is_sms bool comment '1 ֪ͨ0֪ͨ', farm_id bigint, is_alarm bool comment '1 澯0澯', diff --git a/new-wisfarm-platform/数据库/system.sql b/new-wisfarm-platform/数据库/system.sql index c83bb6e..f855c6c 100644 --- a/new-wisfarm-platform/数据库/system.sql +++ b/new-wisfarm-platform/数据库/system.sql @@ -1,8 +1,7 @@ /*==============================================================*/ /* DBMS name: MySQL 5.0 */ -/* Created on: 2018/3/13 15:41:04 */ +/* Created on: 2018/3/14 17:22:08 */ /*==============================================================*/ - SET FOREIGN_KEY_CHECKS=0; drop table if exists farm; @@ -53,7 +52,7 @@ create table resources resources_id bigint not null auto_increment, res_resources_id bigint, resources_name varchar(100), - resources_type tinyint comment '1 Ŀ¼2˵3ӿ', + resources_type int comment '1 Ŀ¼2˵3ӿ', resources_url varchar(300), request_method varchar(20) comment 'postgetputdelete', is_enable bool comment '1 ã0ͣ', @@ -74,7 +73,7 @@ create table role is_enable bool comment '1 ã0ͣ', create_date_time bigint, modified_date_time bigint, - role_type tinyint comment '1 Ա2Ա3ũ4 ũ5ũԱ6ο', + role_type int comment '1 Ա2Ա3ũ4 ũ5ũԱ6ο', primary key (role_id) ); diff --git a/new-wisfarm-platform/数据库/wisfarm-platform.CDM b/new-wisfarm-platform/数据库/wisfarm-platform.CDM index d191e1f..426e248 100644 --- a/new-wisfarm-platform/数据库/wisfarm-platform.CDM +++ b/new-wisfarm-platform/数据库/wisfarm-platform.CDM @@ -1,5 +1,5 @@ - + @@ -6628,10 +6628,10 @@ LABL 0 新宋体,8,N current_state 1516343697 Master -1516765142 +1521018980 Master 10待执行，20执行中，30待恢复，40已触发，50 不可执行（使能关闭） -BT +I DBA36CF1-3174-4343-B7E1-112DD33B7269 @@ -6639,10 +6639,10 @@ LABL 0 新宋体,8,N trgger_type 1516343697 Master -1516586024 +1521018980 Master 1 时间触发，2条件触发 -BT +I 26761358-56BE-49CE-8354-3A35A52FF33D @@ -6672,10 +6672,10 @@ LABL 0 新宋体,8,N continued_minutes 1516346609 Master -1516774766 +1521018980 Master trgger_type=1时的触发后的持续分钟数，其他为空 -SI +I EC744681-B063-425A-BB65-78A52167E105 @@ -6716,10 +6716,10 @@ LABL 0 新宋体,8,N msg_type 1516348528 Master -1516348930 +1521019081 Master 1 通知，2告警 -BT +I 5EA7A4C2-6FFA-4022-9FB9-886E189A8361 @@ -6738,10 +6738,10 @@ LABL 0 新宋体,8,N msg_source 1516348540 Master -1516703254 +1521019081 Master 1触发器，2分组控制；3 人工推送，4第三方推送 -BT +I 1AAF136C-E0E4-4E70-8DF1-776365610DB5 @@ -6842,9 +6842,9 @@ LABL 0 新宋体,8,N level_no 1516350238 Master -1516766198 +1521018949 Master -BT +I B9C80CF4-B389-46D5-9375-BB7EB6F51E1A @@ -6852,10 +6852,10 @@ LABL 0 新宋体,8,N condition_relation 1516350238 Master -1516766198 +1521018949 Master 0表示无关系，1表示与前一个条件之间是且关系，2表示与前一个条件之间是或关系。 -BT +I BDDAD462-BD18-441F-A9FF-273372825A40 @@ -6957,10 +6957,10 @@ LABL 0 新宋体,8,N continued_minutes 1516355837 Master -1516775413 +1521019031 Master 半自动，自动类型填 -SI +I 6A1671C5-A485-467E-A33F-6A20E1D430A9 @@ -7021,10 +7021,10 @@ LABL 0 新宋体,8,N record_type 1516586896 Master -1516587065 +1521019066 Master 1触发器执行记录，2分组执行记录 -BT +I DCE62178-3128-488B-BCE7-E227DC0F7818 @@ -7054,10 +7054,10 @@ LABL 0 新宋体,8,N record_result 1516587326 Master -1516776187 +1521019066 Master 1待定；2 成功；3失败 -BT +I 9D43BFB1-33D7-4E45-BEC8-B50EACED162A @@ -7108,10 +7108,10 @@ LABL 0 新宋体,8,N event_result 1516587807 Master -1516699001 +1521018916 Master 1待定；2成功；3失败 -BT +I 5FB7408C-8AC3-4F9A-B1CA-E3E8E396CC52 @@ -7119,10 +7119,10 @@ LABL 0 新宋体,8,N current_state 1516588341 Master -1516849550 +1521019031 Master 10待执行，20执行中，30暂停中，31暂停， 40失败， 50 结束中，51结束，60执行完成，70 不可执行 -BT +I 84D9C0EB-FF41-4E9F-AA14-7F01E4092040 @@ -7130,10 +7130,10 @@ LABL 0 新宋体,8,N event_type 1516588833 Master -1516699001 +1521018916 Master 1 手动；2策略自动触发 -BT +I 7152FB73-A4FE-43D6-99A9-C1C7B7A7E3C8 @@ -7461,11 +7461,11 @@ LABL 0 新宋体,8,N device_password 1516606694 Master -1516762028 +1521009478 Master MQTT鉴权和访问控制时使用，SHA256加密 -VA100 -100 +VA500 +500 21F50151-FBEA-4183-941B-A0AB332A49DC @@ -7495,10 +7495,10 @@ LABL 0 新宋体,8,N device_type 1516606694 Master -1516697427 +1521018808 Master 1 网络设备；2单点设备；3本地设备 -BT +I EFAA67D8-2E3B-430F-8175-246509A92848 @@ -7613,10 +7613,10 @@ LABL 0 新宋体,8,N sensor_type 1516609078 Master -1516611933 +1521018891 Master 1 只读数值型；2读写数值型；3只读开关型；4读写开关；5定位型 -BT +I 48B28405-F87F-4837-8607-B16B94B161A1 @@ -7624,10 +7624,10 @@ LABL 0 新宋体,8,N sensor_value_type 1516609645 Master -1516611933 +1521018891 Master 1 bit；2 byte；3 short；4 integer；5 long；6 float；7double -BT +I FBD4F977-CE55-4EB2-B99D-37C1E00D7EE7 @@ -7635,9 +7635,9 @@ LABL 0 新宋体,8,N read_register_location 1516609645 Master -1516611933 +1521018891 Master -SI +I 404F6B0D-3403-45E5-8DEF-A7AC58958D3B @@ -7645,9 +7645,9 @@ LABL 0 新宋体,8,N write_register_location 1516609645 Master -1516611933 +1521018891 Master -SI +I 8DE36BE5-FA49-452F-8096-DEFAC563D276 @@ -7655,10 +7655,10 @@ LABL 0 新宋体,8,N value_calc_way 1516609645 Master -1516611933 +1521018891 Master 1系数计算；2混合计算；3原始计算 -BT +I A0FB96B2-37C2-4E56-B231-F6A3D6A32660 @@ -7732,10 +7732,10 @@ LABL 0 新宋体,8,N value_decimal_places 1516609645 Master -1516611933 +1521018891 Master 0-4 -BT +I D3BB9ABC-F4F7-44E6-9C23-BEA3720294FA @@ -7797,10 +7797,10 @@ LABL 0 新宋体,8,N device_state 1516612630 Master -1516612775 +1521018826 Master 1 在线；2离线 -BT +I AF408A4C-A9DB-4F86-91D8-E329A756A09C @@ -7872,10 +7872,10 @@ LABL 0 新宋体,8,N device_protocol_type 1516613414 Master -1516697556 +1521018808 Master 1 联网协议；2本地协议 -BT +I 48B78E3C-ED7E-4821-B471-E66A0B0EF0FA @@ -7956,10 +7956,10 @@ LABL 0 新宋体,8,N port_type 1516614136 Master -1516614932 +1521018760 Master 1 串口；2网口 -BT +I 5778057E-BB4F-43EF-A17E-C785808F6810 @@ -7979,10 +7979,10 @@ LABL 0 新宋体,8,N verify_way 1516614136 Master -1516614932 +1521018760 Master 串口使用 -BT +I 08BF176D-52D7-4E99-A272-82A41D5B191E @@ -8001,9 +8001,9 @@ LABL 0 新宋体,8,N acquisition_cycle 1516614136 Master -1516614932 +1521018760 Master -BT +I A4F3FF21-22BA-45E0-8FEA-F364F41B579A @@ -8023,10 +8023,10 @@ LABL 0 新宋体,8,N connect_port 1516614136 Master -1516762911 +1521018769 Master 网口使用 -SI +I 8FA93320-C96F-47A2-B71C-3DB9C96F5071 @@ -8045,10 +8045,10 @@ LABL 0 新宋体,8,N connect_protocol_type 1516697559 Master -1516762544 +1521018716 Master 1 MQTT；2RPC；3HTTP；4RabbitMQ -BT +I 2AB01111-B77C-4345-B3C7-D65623F94CEF @@ -8056,10 +8056,10 @@ LABL 0 新宋体,8,N connect_protocol_type 1516697661 Master -1516762966 +1521018760 Master 1Modbus-TCP；2Modbus-RTU；3Wisfarm-lora -BT +I BA787104-F433-4D78-B8C6-3B561473E4C8 @@ -8078,10 +8078,10 @@ LABL 0 新宋体,8,N condition_type 1516700273 Master -1516766198 +1521018949 Master 1 数值高于x ；2 数值低于y；3 开关开启；4 开关关闭；5 数值在x和y之间；6 数值低于X或者高于Y；7 数值高于x超过m分钟；8 数值低于x超过M分钟； -BT +I D16455A2-13EB-4CE1-ABBA-787891CA6C53 @@ -8164,9 +8164,9 @@ LABL 0 新宋体,8,N countdown_minutes 1516850202 Master -1517290558 +1521019031 Master -SI +I 2B45A77C-0086-4F5B-B70E-EE9CB79AB95B @@ -8311,10 +8311,10 @@ LABL 0 新宋体,8,N role_type 1517218810 Master -1517218963 +1521018686 Master 1 超级管理员，2管理员；3农场主，4 农户，5农技人员，6第三方游客 -BT +I 575F9FDA-ACD0-4930-B7B6-02BFD4EEBBC6 @@ -8333,10 +8333,10 @@ LABL 0 新宋体,8,N resources_type 1517993047 Master -1517993604 +1521018669 Master 1 目录；2菜单；3接口 -BT +I 44CCFC68-CE91-4EEF-ADE4-792D98E6303D @@ -8367,12 +8367,12 @@ LABL 0 新宋体,8,N WisfarmPlatform 1516759777 Master -1520926893 +1521019124 Master -file:///D|/wisfarm/wisarm-project/project-document/wisfarm/WisfarmPlatform.pdm +file:///D|/wisfarm/wisarm-project/project-document/new-wisfarm-platform/数据库/WisfarmPlatform.pdm 42E027AE-8285-4E96-AA68-8D69CA392A54 CDE44E21-9669-11D1-9914-006097355D9B -1520926909 +1521019433 -- libgit2 0.21.4