Skip to content

Commit d8ca8fa

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #9 from TakayukiHoshi1984/modify_rfc3339_date_format
日付関連の値はRFC3339形式にするように修正
2 parents 75a0cd8 + dfc614e commit d8ca8fa

17 files changed

+140
-68
lines changed

‎api/atmosphericPressure.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"version": "1.0.0",
4040
"atmosphericPressure": 1016.12,
4141
"timeStamp": 1431856940275,
42-
"timeStampString": "20150517100220.000-0000"
42+
"timeStampString": "2015-05-17T10:02:20+09:00"
4343
}
4444
}
4545
}
@@ -57,9 +57,7 @@
5757
{
5858
"type": "object",
5959
"required": [
60-
"atmosphericPressure",
61-
"timeStamp",
62-
"timeStampString"
60+
"atmosphericPressure"
6361
],
6462
"properties": {
6563
"atmosphericPressure": {
@@ -74,9 +72,10 @@
7472
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
7573
},
7674
"timeStampString": {
77-
"type": "string",
75+
"type": "string",
76+
"format": "date-time",
7877
"title": "気圧のタイムスタンプ文字列",
79-
"description": "タイムスタンプと同じタイムスタンプを「YYYYMMDDHHMMSS.sss+/-HHMM」の形式で返す。"
78+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
8079
}
8180
}
8281
}

‎api/availability.json

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
},
4444
{
4545
"type": "object",
46-
"required": [
47-
],
4846
"properties": {
4947
"name": {
5048
"type": "string",

‎api/ecg.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"unit": "mVolt * milliSecond",
4646
"unitCode": 3328,
4747
"timeStamp": 1483241696789,
48-
"timeStampString": "20170101123456.789+0900"
48+
"timeStampString": "2015-05-17T10:02:20+09:00"
4949
}
5050
}
5151
}
@@ -106,7 +106,7 @@
106106
"unit": "mVolt * milliSecond",
107107
"unitCode": 3328,
108108
"timeStamp": 1483241696789,
109-
"timeStampString": "20170101123456.789+0900"
109+
"timeStampString": "2015-05-17T10:02:20+09:00"
110110
}
111111
}
112112
}
@@ -226,9 +226,10 @@
226226
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
227227
},
228228
"timeStampString": {
229-
"type": "string",
229+
"type": "string",
230+
"format": "date-time",
230231
"title": "ECGのタイムスタンプ文字列",
231-
"description": "タイムスタンプと同じタイムスタンプを「YYYYMMDDHHMMSS.sss+/-HHMM」の形式で返す。"
232+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
232233
}
233234
}
234235
}

‎api/file.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
"path" : "/test/file1.txt",
279279
"fileName" : "file1.txt",
280280
"mimeType": "text/plain",
281-
"updateDate":"2014-05-02 T10:32:10+0900",
281+
"updateDate":"2015-05-17T10:02:20+09:00",
282282
"fileSize": 123,
283283
"fileType": 0
284284
}
@@ -361,7 +361,7 @@
361361
"path" : "/test/file1.txt",
362362
"fileName" : "file1.txt",
363363
"mimeType": "text/plain",
364-
"updateDate":"2014-05-02 T10:32:10+0900",
364+
"updateDate":"2015-05-17T10:02:20+09:00",
365365
"fileSize": 123,
366366
"fileType": 0
367367
}
@@ -607,9 +607,10 @@
607607
"description": ""
608608
},
609609
"updateDate": {
610-
"type": "string",
610+
"type": "string",
611+
"format": "date-time",
611612
"title": "更新時間",
612-
"description": "RFC 3339"
613+
"description": "RFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
613614
},
614615
"fileSize": {
615616
"type": "integer",

‎api/fileDescriptor.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,13 @@
450450
},
451451
"curr": {
452452
"type": "string",
453-
"title": "現在の更新時間（RFC 3339）",
454-
"description": "例: 2014-01-01T00:00:00+0900"
453+
"title": "現在の更新時間（RFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す）。",
454+
"description": "例: 2015-05-17T10:02:20+09:00"
455455
},
456456
"prev": {
457457
"type": "string",
458-
"title": "以前の更新時間（RFC 3339）",
459-
"description": "例: 2014-01-01T00:00:00+0900"
458+
"title": "以前の更新時間（RFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す）。",
459+
"description": "例: 2015-05-17T10:02:20+09:00"
460460
}
461461

462462

‎api/geolocation.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"speed": 0
6464
},
6565
"timeStamp": 1483241696789,
66-
"timeStampString": "20170101123456.789+0900"
66+
"timeStampString": "2015-05-17T10:02:20+09:00"
6767
}
6868
}
6969
}
@@ -123,7 +123,7 @@
123123
"speed": 0
124124
},
125125
"timeStamp": 1483241696789,
126-
"timeStampString": "20170101123456.789+0900"
126+
"timeStampString": "2015-05-17T10:02:20+09:00"
127127
}
128128
}
129129
}
@@ -194,7 +194,7 @@
194194
"speed": 0
195195
},
196196
"timeStamp": 1483241696789,
197-
"timeStampString": "20170101123456.789+0900"
197+
"timeStampString": "2015-05-17T10:02:20+09:00"
198198
}
199199
}
200200
}
@@ -330,9 +330,10 @@
330330
"description": "エポックからのミリ秒"
331331
},
332332
"timeStampString": {
333-
"type": "string",
333+
"type": "string",
334+
"format": "date-time",
334335
"title": "測位時刻 (文字列)",
335-
"description": "測位時刻を文字列表記<br>[YYYYMMDDHHMMSS.sss+/-HHMM]形式"
336+
"description": "測位時刻を文字列表記<br>RFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式"
336337
}
337338
}
338339
}

‎api/health.json

+21-18
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"unit": "beat per min",
4747
"unitCode": 264864,
4848
"timeStamp": 1483241696789,
49-
"timeStampString": "20170101123456.789+0900"
49+
"timeStampString": "2015-05-17T10:02:20+09:00"
5050
},
5151
"rr": {
5252
"value": 909.1796875,
@@ -56,7 +56,7 @@
5656
"unit": "ms",
5757
"unitCode": 264338,
5858
"timeStamp": 1483241696789,
59-
"timeStampString": "20170101123456.789+0900"
59+
"timeStampString": "2015-05-17T10:02:20+09:00"
6060
},
6161
"energy": {
6262
"value": 0,
@@ -66,7 +66,7 @@
6666
"unit": "Calories",
6767
"unitCode": 6784,
6868
"timeStamp": 1483241696789,
69-
"timeStampString": "20170101123456.789+0900"
69+
"timeStampString": "2015-05-17T10:02:20+09:00"
7070
},
7171
"device": {
7272
"productName": "DUMMY DEVICE",
@@ -142,7 +142,7 @@
142142
"unit": "beat per min",
143143
"unitCode": 264864,
144144
"timeStamp": 1483241696789,
145-
"timeStampString": "20170101123456.789+0900"
145+
"timeStampString": "2015-05-17T10:02:20+09:00"
146146
},
147147
"rr": {
148148
"value": 909.1796875,
@@ -152,7 +152,7 @@
152152
"unit": "ms",
153153
"unitCode": 264338,
154154
"timeStamp": 1483241696789,
155-
"timeStampString": "20170101123456.789+0900"
155+
"timeStampString": "2015-05-17T10:02:20+09:00"
156156
},
157157
"energy": {
158158
"value": 0,
@@ -162,7 +162,7 @@
162162
"unit": "Calories",
163163
"unitCode": 6784,
164164
"timeStamp": 1483241696789,
165-
"timeStampString": "20170101123456.789+0900"
165+
"timeStampString": "2015-05-17T10:02:20+09:00"
166166
},
167167
"device": {
168168
"productName": "DUMMY DEVICE",
@@ -248,7 +248,7 @@
248248
"unit": "beat per min",
249249
"unitCode": 264864,
250250
"timeStamp": 1483241696789,
251-
"timeStampString": "20170101123456.789+0900"
251+
"timeStampString": "2015-05-17T10:02:20+09:00"
252252
},
253253
"rr": {
254254
"value": 909.1796875,
@@ -258,7 +258,7 @@
258258
"unit": "ms",
259259
"unitCode": 264338,
260260
"timeStamp": 1483241696789,
261-
"timeStampString": "20170101123456.789+0900"
261+
"timeStampString": "2015-05-17T10:02:20+09:00"
262262
},
263263
"energy": {
264264
"value": 0,
@@ -268,7 +268,7 @@
268268
"unit": "Calories",
269269
"unitCode": 6784,
270270
"timeStamp": 1483241696789,
271-
"timeStampString": "20170101123456.789+0900"
271+
"timeStampString": "2015-05-17T10:02:20+09:00"
272272
},
273273
"device": {
274274
"productName": "DUMMY DEVICE",
@@ -344,7 +344,7 @@
344344
"unit": "beat per min",
345345
"unitCode": 264864,
346346
"timeStamp": 1483241696789,
347-
"timeStampString": "20170101123456.789+0900"
347+
"timeStampString": "2015-05-17T10:02:20+09:00"
348348
},
349349
"rr": {
350350
"value": 909.1796875,
@@ -354,7 +354,7 @@
354354
"unit": "ms",
355355
"unitCode": 264338,
356356
"timeStamp": 1483241696789,
357-
"timeStampString": "20170101123456.789+0900"
357+
"timeStampString": "2015-05-17T10:02:20+09:00"
358358
},
359359
"energy": {
360360
"value": 0,
@@ -364,7 +364,7 @@
364364
"unit": "Calories",
365365
"unitCode": 6784,
366366
"timeStamp": 1483241696789,
367-
"timeStampString": "20170101123456.789+0900"
367+
"timeStampString": "2015-05-17T10:02:20+09:00"
368368
},
369369
"device": {
370370
"productName": "DUMMY DEVICE",
@@ -658,9 +658,10 @@
658658
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
659659
},
660660
"timeStampString": {
661-
"type": "string",
661+
"type": "string",
662+
"format": "date-time",
662663
"title": "心拍数のタイムスタンプ文字列",
663-
"description": "タイムスタンプと同じタイムスタンプを「YYYYMMDDHHMMSS.sss+/-HHMM」の形式で返す。"
664+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
664665
}
665666
}
666667
},
@@ -706,9 +707,10 @@
706707
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
707708
},
708709
"timeStampString": {
709-
"type": "string",
710+
"type": "string",
711+
"format": "date-time",
710712
"title": "RR間隔のタイムスタンプ文字列",
711-
"description": "タイムスタンプと同じタイムスタンプを「YYYYMMDDHHMMSS.sss+/-HHMM」の形式で返す。"
713+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
712714
}
713715
}
714716
},
@@ -754,9 +756,10 @@
754756
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
755757
},
756758
"timeStampString": {
757-
"type": "string",
759+
"type": "string",
760+
"format": "date-time",
758761
"title": "消費エネルギーのタイムスタンプ文字列",
759-
"description": "タイムスタンプと同じタイムスタンプを「YYYYMMDDHHMMSS.sss+/-HHMM」の形式で返す。"
762+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
760763
}
761764
}
762765
},

‎api/humidity.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
"result": 0,
3838
"product": "Example System",
3939
"version": "1.0.0",
40-
"humidity": 0.1
40+
"humidity": 0.1,
41+
"timeStamp": 1431856940275,
42+
"timeStampString": "2015-05-17T10:02:20+09:00"
4143
}
4244
}
4345
}
@@ -65,6 +67,18 @@
6567
"description": "湿度センサーが検知した湿度を通知する。<br>範囲: 0.0 ~ 1.0",
6668
"minimum": 0.0,
6769
"maximum": 1.0
70+
},
71+
"timeStamp": {
72+
"type": "integer",
73+
"format": "int64",
74+
"title": "湿度のタイムスタンプ",
75+
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
76+
},
77+
"timeStampString": {
78+
"type": "string",
79+
"format": "date-time",
80+
"title": "湿度のタイムスタンプ文字列",
81+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
6882
}
6983
}
7084
}

‎api/illuminance.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
"result": 0,
3535
"product": "Example System",
3636
"version": "1.0.0",
37-
"illuminance": 240
37+
"illuminance": 240,
38+
"timeStamp": 1431856940275,
39+
"timeStampString": "2015-05-17T10:02:20+09:00"
3840
}
3941
}
4042
}
@@ -60,6 +62,18 @@
6062
"type": "number",
6163
"title": "照度",
6264
"description": "照度センサーが検知した照度。単位はルクス(lx)。"
65+
},
66+
"timeStamp": {
67+
"type": "integer",
68+
"format": "int64",
69+
"title": "照度のタイムスタンプ",
70+
"description": "測定が行われた測定時間。ミリ秒のUnixタイムスタンプで返す。"
71+
},
72+
"timeStampString": {
73+
"type": "string",
74+
"format": "date-time",
75+
"title": "照度のタイムスタンプ文字列",
76+
"description": "タイムスタンプと同じタイムスタンプをRFC3339「yyyy-MM-dd'T'HH:mm:ssZZZZZ」の形式で返す。"
6377
}
6478
}
6579
}

0 commit comments

Comments
 (0)