From 3800abdf93f28657beda529802f8f95d44c06bd1 Mon Sep 17 00:00:00 2001 From: Unknown <154940001@qq.com> Date: Tue, 3 Apr 2018 14:07:34 +0800 Subject: [PATCH] 修改监控平台数据库 --- new-wisfarm-platform/数据库/Wisfarm-Workspace.sws | 2 +- new-wisfarm-platform/数据库/WisfarmPlatform.pdm | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- new-wisfarm-platform/数据库/iot_monitoring.sql | 2 +- new-wisfarm-platform/数据库/wisfarm-platform.CDM | 20 +++++++++++--------- 4 files changed, 88 insertions(+), 82 deletions(-) diff --git a/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws b/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws index a0bc90a..0335879 100644 --- a/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws +++ b/new-wisfarm-platform/数据库/Wisfarm-Workspace.sws @@ -4,7 +4,7 @@ - + diff --git a/new-wisfarm-platform/数据库/WisfarmPlatform.pdm b/new-wisfarm-platform/数据库/WisfarmPlatform.pdm index 82ce484..838edd6 100644 --- a/new-wisfarm-platform/数据库/WisfarmPlatform.pdm +++ b/new-wisfarm-platform/数据库/WisfarmPlatform.pdm @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ WisfarmPlatform 1516759773 Master -1522206645 +1522732261 Master ORG {48086B01-C9E1-11D4-9552-0090277716A9} [FolderOptions] @@ -3686,9 +3686,9 @@ PhysOpts= 6A20EB30-ADE6-47A6-AED9-9C13605945F5 WisfarmPlatform WisfarmPlatform -1522206646 +1522732262 Master -1522206646 +1522732262 Master 48086B01-C9E1-11D4-9552-0090277716A9 @@ -4359,7 +4359,7 @@ Shadow=0 15 -1522206645 +1522732261 ((-36700,37498), (-35450,41332)) ((-36075,40932),(-36075,37898)) 1 @@ -4380,7 +4380,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-49508,37498), (-48258,42381)) ((-48883,41981),(-48883,37898)) 1 @@ -4401,7 +4401,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-35875,30786), (-17363,32036)) ((-17763,31411),(-35475,31411)) 1 @@ -4422,7 +4422,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-107126,35673), (-72674,36923)) ((-106726,36298),(-73074,36298)) 1 @@ -4443,7 +4443,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-47206,80021), (-23288,81271)) ((-23688,80646),(-46806,80646)) 1 @@ -4464,7 +4464,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-73056,78821), (-60414,80071)) ((-72656,79446),(-60814,79446)) 1 @@ -4485,7 +4485,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-53235,85532), (-51985,92904)) ((-52610,92504),(-52610,85932)) 1 @@ -4506,7 +4506,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-47206,83069), (-36569,91320)) ((-36969,90920),(-36969,83694),(-46806,83694)) 1 @@ -4527,7 +4527,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-54210,66752), (-41328,80071)) ((-52901,77291),(-52901,67152),(-41728,67152),(-41728,79446),(-53810,79446)) 1 @@ -4549,7 +4549,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-80839,91569), (-79589,100748)) ((-80214,91969),(-80214,100348)) 1 @@ -4570,7 +4570,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-76054,85532), (-53185,90369)) ((-75654,89969),(-53810,89969),(-53810,85932)) 1 @@ -4591,7 +4591,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-80614,103733), (-17058,104983)) ((-17458,104358),(-80214,104358)) 1 @@ -4612,7 +4612,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-18082,92300), (-16832,104760)) ((-17457,104360),(-17457,92700)) 1 @@ -4633,7 +4633,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-43104,21381), (-41854,25324)) ((-42479,21781),(-42479,24924)) 1 @@ -4654,7 +4654,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-48176,10182), (-46926,18182)) ((-47551,17782),(-47551,10582)) 1 @@ -4675,7 +4675,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-67468,18712), (-66218,26964)) ((-66843,19112),(-66843,26564)) 1 @@ -4696,7 +4696,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-59449,10182), (-48285,17512)) ((-59049,17112),(-48910,17112),(-48910,10582)) 1 @@ -4717,9 +4717,9 @@ DESTINATION 0 新宋体,8,N -1522206645 -((-19746,13015), (-10596,14265)) -((-10996,13640),(-19346,13640)) +1522732261 +((-13521,12115), (-4446,13365)) +((-4846,12740),(-13121,12740)) 1 1 11184640 @@ -4738,7 +4738,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 ((-97504,21416), (-72674,32724)) ((-97104,21816),(-97104,32099),(-73074,32099)) 1 @@ -4759,7 +4759,7 @@ DESTINATION 0 新宋体,8,N -1522206645 +1522732261 -1 ((-49483,24924), (-35475,37898)) 11184640 @@ -4783,9 +4783,9 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 -((-30264,10453), (-19346,16827)) +((-24039,9553), (-13121,15927)) 0 11184640 16777136 @@ -4808,7 +4808,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-56109,41981), (-44035,52478)) 0 @@ -4833,9 +4833,9 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 -((-10996,10735), (-1830,16973)) +((-4846,8560), (4320,14798)) 0 11184640 16777136 @@ -4859,7 +4859,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-17763,27096), (-6459,34294)) 0 @@ -4884,7 +4884,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-36608,40932), (-24534,51429)) 0 @@ -4909,7 +4909,7 @@ LABL 0 新宋体,8,N -1522287957 +1522732261 -1 ((-76417,2071), (-63183,9269)) 11184640 @@ -4933,7 +4933,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-62972,57436), (-51284,64634)) 11184640 @@ -4957,7 +4957,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-73074,26564), (-60612,38712)) 0 @@ -4982,7 +4982,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-119574,32287), (-106726,40309)) 11184640 @@ -5006,7 +5006,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-60814,72960), (-46806,85932)) 11184640 @@ -5030,7 +5030,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-23688,73495), (-11226,93893)) 0 @@ -5055,7 +5055,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-53259,5034), (-42161,10582)) 0 @@ -5080,7 +5080,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-83574,76723), (-72656,81447)) 11184640 @@ -5104,7 +5104,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-87218,100348), (-73210,108370)) 11184640 @@ -5128,7 +5128,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-43393,90920), (-30545,102241)) 0 @@ -5153,7 +5153,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-62646,92504), (-49798,99702)) 0 @@ -5178,7 +5178,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-102369,16268), (-91839,21816)) 11184640 @@ -5202,7 +5202,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-85026,87970), (-75654,91969)) 11184640 @@ -5226,7 +5226,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-23882,101586), (-11034,107134)) 11184640 @@ -5250,7 +5250,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-48151,17782), (-36463,21781)) 11184640 @@ -5274,7 +5274,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((-70739,15113), (-59049,19112)) 11184640 @@ -5949,7 +5949,7 @@ Shadow=0 15 -1522287965 +1522732261 ((-21904,13061), (-14545,14311)) ((-14945,13686),(-21504,13686)) 1 @@ -5970,7 +5970,7 @@ DESTINATION 0 新宋体,8,N -1522287988 +1522732261 ((-10112,7448), (-8862,12362)) ((-9487,7848),(-9487,11962)) 1 @@ -5991,7 +5991,7 @@ DESTINATION 0 新宋体,8,N -1522287991 +1522732261 ((-8929,-3326), (-7679,4249)) ((-8304,3849),(-8304,-2926)) 1 @@ -6012,7 +6012,7 @@ DESTINATION 0 新宋体,8,N -1522287991 +1522732261 ((-28360,-6925), (-18220,64)) ((-18620,-6525),(-27735,-6525),(-27735,-336)) 1 @@ -6033,7 +6033,7 @@ DESTINATION 0 新宋体,8,N -1522287987 +1522732261 ((9013,-4477), (10263,9738)) ((9638,-4077),(9638,9338)) 1 @@ -6054,7 +6054,7 @@ DESTINATION 0 新宋体,8,N -1522287991 +1522732261 ((-8104,-7150), (3084,-5900)) ((2684,-6525),(-7704,-6525)) 1 @@ -6075,7 +6075,7 @@ DESTINATION 0 新宋体,8,N -1522287987 +1522732261 ((-1337,11970), (10038,16111)) ((9638,12370),(-937,12370),(-937,15486),(9638,15486)) 1 @@ -6097,7 +6097,7 @@ DESTINATION 0 新宋体,8,N -1522287963 +1522732261 -1 ((-14945,11962), (-4029,21636)) 11184640 @@ -6121,7 +6121,7 @@ LABL 0 新宋体,8,N -1522287991 +1522732261 -1 ((-18620,-10124), (-7704,-2926)) 11184640 @@ -6145,7 +6145,7 @@ LABL 0 新宋体,8,N -1522287987 +1522732261 -1 ((3407,9338), (15869,19010)) 11184640 @@ -6169,7 +6169,7 @@ LABL 0 新宋体,8,N -1522287965 +1522732261 -1 ((-33966,-336), (-21504,14286)) 11184640 @@ -6193,7 +6193,7 @@ LABL 0 新宋体,8,N -1522287994 +1522732261 -1 ((-30140,28129), (-17678,32129)) 0 @@ -6218,7 +6218,7 @@ LABL 0 新宋体,8,N -1522287988 +1522732261 -1 ((-12299,3849), (-2927,7848)) 11184640 @@ -6242,7 +6242,7 @@ LABL 0 新宋体,8,N -1522287986 +1522732261 -1 ((2684,-8076), (12056,-4077)) 11184640 @@ -6917,7 +6917,7 @@ Shadow=0 15 -1522206645 +1522732261 -1 ((-20025,6787), (-7949,13161)) 11184640 @@ -6941,7 +6941,7 @@ LABL 0 新宋体,8,N -1522206645 +1522732261 -1 ((6556,7725), (19018,13273)) 11184640 @@ -11313,11 +11313,13 @@ DAT 1516759777 dsr_id 1516759776 Master -1516759776 +1522735233 Master ORG {757039DE-7EC0-4FF1-869A-FA4E0FD77D78} -DAT 1516759777 +DAT 1516759777 +ATT IDNT bigint +1 1 @@ -11338,9 +11340,11 @@ DAT 1516759777 device_state 1516759776 Master -1521019123 +1522732261 Master -1 在线；2离线 +0：离线，1：在线 +0：离线，1：在线 +0：离线，1：在线 ORG {55A00A37-E0FF-4112-9B49-8E3BF2F0F3C7} DAT 1516759777 int @@ -13737,12 +13741,12 @@ DAT 1517394160 WisfarmPlatform 1516759777 Master -1522287933 +1522377098 Master file:///D|/wisfarm/wisarm-project/project-document/new-wisfarm-platform/数据库/wisfarm-platform.CDM 48086B01-C9E1-11D4-9552-0090277716A9 1E597170-9350-11D1-AB3C-0020AF71E433 -1522287948 +1522735237 diff --git a/new-wisfarm-platform/数据库/iot_monitoring.sql b/new-wisfarm-platform/数据库/iot_monitoring.sql index 55b0980..cc24e16 100644 --- a/new-wisfarm-platform/数据库/iot_monitoring.sql +++ b/new-wisfarm-platform/数据库/iot_monitoring.sql @@ -119,7 +119,7 @@ create table device_state_record ( dsr_id bigint not null, device_id bigint, - device_state int comment '1 ߣ2', + device_state int comment '0ߣ1', record_date_time bigint, primary key (dsr_id) ); diff --git a/new-wisfarm-platform/数据库/wisfarm-platform.CDM b/new-wisfarm-platform/数据库/wisfarm-platform.CDM index caa63bb..7bd26be 100644 --- a/new-wisfarm-platform/数据库/wisfarm-platform.CDM +++ b/new-wisfarm-platform/数据库/wisfarm-platform.CDM @@ -1,5 +1,5 @@ - + @@ -2767,7 +2767,7 @@ DESTINATION 0 新宋体,8,N 1516688361 1517394838 -((-16912,-4026), (-13162,14637)) +((-17024,-4026), (-13050,14637)) ((-15037,13237),(-15037,-2626)) 1 4883 @@ -2789,7 +2789,7 @@ DESTINATION 0 新宋体,8,N 1517137179 1517394838 -((-42657,-6519), (-22494,9351)) +((-42769,-6519), (-22494,9351)) ((-40782,8951),(-40782,-5319),(-23728,-5319)) 1 4371 @@ -2812,7 +2812,7 @@ DESTINATION 0 新宋体,8,N 1517394813 1517394845 -((-8157,-7051), (5526,6864)) +((-8157,-7051), (5638,6864)) ((3695,5497),(3651,-5851),(-7757,-5851)) 1 4883 @@ -2835,7 +2835,7 @@ DESTINATION 0 新宋体,8,N 1517993643 1517993643 -((12029,8208), (19580,17384)) +((12029,8208), (19692,17384)) ((14363,8870),(17330,8870),(17330,16821),(13309,16821),(13163,12549)) 1 4371 @@ -7939,9 +7939,11 @@ LABL 0 新宋体,8,N device_state 1516612630 Master -1521018826 +1522732208 Master -1 在线；2离线 +0：离线，1：在线 +0：离线，1：在线 +0：离线，1：在线 I @@ -8555,12 +8557,12 @@ LABL 0 新宋体,8,N WisfarmPlatform 1516759777 Master -1522287933 +1522732262 Master file:///D|/wisfarm/wisarm-project/project-document/new-wisfarm-platform/数据库/WisfarmPlatform.pdm 42E027AE-8285-4E96-AA68-8D69CA392A54 CDE44E21-9669-11D1-9914-006097355D9B -1522306292 +1522735233 -- libgit2 0.21.4