[server] デフォルトDBレコードの更新 / [sensor] ドアセンサー1号機の固有IDの更新

tissueMO · Jan 20, 2020 · 29ad72c · 29ad72c
1 parent 57ffdff
commit 29ad72c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/sensor/ESPrDoorSensor.ino → sensor/sensor.ino b/sensor/ESPrDoorSensor.ino → sensor/sensor.ino
@@ -17,8 +17,8 @@ const int port = PORT;
 WiFiClient client;
 
 // 機器固有設定
-const char* TOILET_ID = "11";
-// const char* TOILET_ID = "21";
+// const char* TOILET_ID = "11";
+const char* TOILET_ID = "21";
 // const char* TOILET_ID = "31";
 // const char* TOILET_ID = "32";
 // const char* TOILET_ID = "41";

diff --git a/server/.gitignore b/server/.gitignore
@@ -1,4 +1,5 @@
 .vscode
 __pycache__
+*.pyc
 db/*.db
 migrate/versions/*.py
diff --git a/server/model/main.py b/server/model/main.py
@@ -35,20 +35,20 @@
     ])
     # トイレマスター
     session.add_all([
-        Toilet(id=11, name="4F男性用トイレ", valid=True, is_closed=False, modified_time=now),
+        Toilet(id=11, name="4F男性用トイレ", valid=False, is_closed=False, modified_time=now),
         Toilet(id=21, name="6F男性用トイレ", valid=True, is_closed=False, modified_time=now),
         Toilet(id=31, name="4F女性用トイレ", valid=False, is_closed=False, modified_time=now),
         Toilet(id=32, name="4F女性用トイレ", valid=False, is_closed=False, modified_time=now),
         Toilet(id=41, name="6F女性用トイレ", valid=False, is_closed=False, modified_time=now),
         Toilet(id=42, name="6F女性用トイレ", valid=False, is_closed=False, modified_time=now)
     ])
-    # [デバッグ用] トイレ入退室トランザクションテーブル
-    import random
-    for toilet_id in [11, 21, 31, 32, 41, 42]:
-        count = random.randint(1, 10)
-        for i in range(count):
-            timedelta_minutes = random.randint(1, 10000)
-            session.add(ToiletStatus(toilet_id=toilet_id, is_closed=False, created_time=now-timedelta(minutes=timedelta_minutes)))
+    # # [デバッグ用] トイレ入退室トランザクションテーブル
+    # import random
+    # for toilet_id in [11, 21, 31, 32, 41, 42]:
+    #     count = random.randint(1, 10)
+    #     for i in range(count):
+    #         timedelta_minutes = random.randint(1, 10000)
+    #         session.add(ToiletStatus(toilet_id=toilet_id, is_closed=False, created_time=now-timedelta(minutes=timedelta_minutes)))
     # 初期状態で挿入しておきたいレコードの定義 ここまで <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
     # 変更をコミット