コミット: 3ee713ff1e3238f2c6dd83de05af0b2eca272696 - webapp_for_Farm_IOT (git)

コミットメタ情報

• リビジョン: 3ee713ff1e3238f2c6dd83de05af0b2eca272696 (tree)
• 日時: 2019-05-06 11:27:11
• 作者: kazuhiro_kondow <simauma.circus@gmai...>
• コミッター: kazuhiro_kondow

ログメッセージ

使用するサーバーをherokuに変更した関係でDBをPostgresqlに変更

変更サマリ

• modified: DataBaseContxtMngPostgres.py
• modified: appmain.py

差分

--- a/DataBaseContxtMngPostgres.py
+++ b/DataBaseContxtMngPostgres.py
@@ -4,23 +4,25 @@ import psycopg2
 class UseDataBase:
     """DataBaseの接続と切断を処理するコンテキストマネージャクラス"""
     def __init__(self) -> None:
-        self.DATABASE_URL = os.environ['DATABASE_URL']
-
+        self.database_url = os.environ['DATABASE_URL']
+        if os.getenv('APP_ENV',False) is False:
+            print('APP_ENV False')
+            self.conn = psycopg2.connect(self.database_url,sslmode='require')
+        else:
+            print('APP_ENV True')
+            self.conn = psycopg2.connect(self.database_url)
 
     def __enter__(self) -> 'cursor':
+        print('call UseDataBase enter')
         try:
-            if os.getenv('APP_ENV',False) is False:
-                self.conn = psycopg2.connect(self.DATABASE_URL,sslmode='require')
-            else:
-                self.conn = psycopg2.connect(self.DATABASE_URL)
-            self.cursor = self.conn.cursor(dictionary=True)
+            self.cursor = self.conn.cursor()
             return self.cursor
         except psycopg2.Error as err:
+            print('err.pgerror')
             print(err.pgerror)
         except Exception as err:
             print('Other errors')
 
-
     def __exit__(self, exc_type, exc_value, exc_trace) -> None:
         self.conn.commit()
         self.cursor.close()

--- a/appmain.py
+++ b/appmain.py
@@ -1,39 +1,34 @@
-import logging
-from logging.config import dictConfig
 from flask import Flask, request, render_template
-from DataBaseContxtMng import UseDataBase
-import json
-import ctypes2python
-
-logdict = json.load(open('LoggingConfigDict.json','r'))
-dbconfig = json.load(open('dbconfig.json','r'))
-dictConfig(logdict)
+from DataBaseContxtMngPostgres import UseDataBase
+import struct
 
 app = Flask(__name__)
 
 def do_dataentry(req: 'flask_request') -> str:
     """Iot端末からのデータをDBに追加する"""
     try:
-        app.logger.info("call do_dataentry")
-        rcv_data = ctypes2python.rcvdatacnv(req.form['data'])
-        app.logger.info(rcv_data)
-        with UseDataBase(dbconfig) as cursor:
-            insert_SQL = ("insert into ReceiveTest "
-                        "(nodeid,temperature,humidity,photosensitive,soilmoisture,humaninduct,soiltemperature)"
-                        "values (%(nodeid)s,%(temperature)s,%(humidity)s,%(photosensitive)s,%(soilmoisture)s,%(humaninduct)s,%(soiltemperature)s);")
-            cursor.execute(insert_SQL, rcv_data )
-            app.logger.info("finish do_dataentry")
-            return 'Success'
+        print("call do_dataentry")
+        print(req.form['data'])
+        rcv_data = cnv_rcvdata2dict(req.form['data'])
+        print(rcv_data)
+        insert_SQL = ("insert into ReceiveTest "
+                    "(nodeid,temperature,humidity,photosensitive,soilmoisture,humaninduct,soiltemperature)"
+                    "values (%(nodeid)s,%(temperature)s,%(humidity)s,%(photosensitive)s,%(soilmoisture)s,%(humaninduct)s,%(soiltemperature)s);")
+        print("insert_SQL:[%s]" % insert_SQL)
+        with UseDataBase() as cursor:
+            cursor.execute(insert_SQL, rcv_data)
+        print("finish do_dataentry")
+        return 'Success'
     except Exception as err:
-        app.logger.error(type(err))    # the exception instance
-        app.logger.error(err.args)     # arguments stored in .args
-        app.logger.error(err)          # __str__ allows args to be printed directly,
+        print(type(err))    # the exception instance
+        print(err.args)     # arguments stored in .args
+        print(err)          # __str__ allows args to be printed directly,
         return 'Failed'
 
 def do_selectdata() -> dict:
     """DataBaseからChartに表示するデータを抽出する"""
     try:
-        app.logger.info("call do_selectdata")
+        print("call do_selectdata")
         select_SQL = ("select DATE_FORMAT(ReceiveTime, '%m月-%d日 %H時') AS time, "\
             " round(AVG(temperature),2) AS temperature,"\
             " round(AVG(humidity),2) as  humidity,"\
@@ -43,17 +38,43 @@ def do_selectdata() -> dict:
             " round(AVG(humaninduct),2) as humaninduct"\
             " FROM ReceiveTest "\
             " GROUP BY DATE_FORMAT(ReceiveTime, '%m月-%d日 %H時');")
-        with UseDataBase(dbconfig) as cursor:
+        with UseDataBase() as cursor:
             cursor.execute(select_SQL)
             result = cursor.fetchall()
-            app.logger.info("finish do_selectdata")
+            print("select_SQL:[%s]" % select_SQL)
+            print("finish do_selectdata")
             return result
     except Exception as err:
-        app.logger.error(type(err))    # the exception instance
-        app.logger.error(err.args)     # arguments stored in .args
-        app.logger.error(err)          # __str__ allows args to be printed directly,
+        print(type(err))    # the exception instance
+        print(err.args)     # arguments stored in .args
+        print(err)          # __str__ allows args to be printed directly,
         return 'Failed'
 
+def cnv_rcvdata2dict(rcv: 'POST_Data') -> dict:
+    """Arduinoからのバイナリデータを復号して辞書として返す"""
+    try:
+        print("call cnv_rcvdata2dict")
+        if(rcv.isalnum()):
+            receive = struct.unpack('<BBBffHHfHH',bytes.fromhex(rcv))
+            rcv_data = {'nodeid':str(receive[0])+str(receive[1])+str(receive[2]),
+                'temperature':receive[3],
+                'humidity':receive[4],
+                'photosensitive':receive[5],
+                'soilmoisture':receive[6],
+                'soiltemperature':receive[7],
+                'humaninduct':receive[8],
+                'CRC':receive[9]
+                }
+            return rcv_data
+        else:
+            print("rcv.isalnum() False!")
+            return {}
+    except Exception as err:
+        print(type(err))    # the exception instance
+        print(err.args)     # arguments stored in .args
+        print(err)          # __str__ allows args to be printed directly,
+        return {}
+
 @app.route('/')
 def index() -> str:
     """誤ったHTTPaccessに対する案内"""
@@ -62,22 +83,23 @@ def index() -> str:
 @app.route('/dataentry', methods=['POST'])
 def node_request() -> str:
     """IOT機器からのデータ受信窓口"""
+    print(request)
     respons = do_dataentry(request)
-    app.logger.info(respons)
+    print(respons)
     return respons
 
 @app.route('/showdata')
 def show_data() -> str:
     """Show entry datas"""
     respons = do_selectdata()
-    app.logger.info('show_data')
+    print('show_data')
     return respons
     
 @app.route('/chart')
 def show_chart() -> str:
     """DBデータを元にチャートを表示する"""
     try:
-        app.logger.info("call show_chart")
+        print("call show_chart")
         respons = do_selectdata()
         if(respons == 'Failed'):
             return respons
@@ -100,10 +122,15 @@ def show_chart() -> str:
                     photosensitive = lst_photosensitive,soilmoisture = lst_soilmoisture, \
                     soiltemperature = lst_soiltemperature)
     except Exception as err:
-        app.logger.error(type(err))    # the exception instance
-        app.logger.error(err.args)     # arguments stored in .args
-        app.logger.error(err)          # __str__ allows args to be printed directly,
+        print(type(err))    # the exception instance
+        print(err.args)     # arguments stored in .args
+        print(err)          # __str__ allows args to be printed directly,
         return 'Failed'
 
[e-mail]('/testchart')
+def show_testchart() -> str:
+    """Display Demo Chart"""
+    return '<!DOCTYPE html><html><head><title>This is test Chart Dir</title></head><body><p><font size="6">This is test Chart Dir</font></p></body></html>'
+
 if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+    app.run(debug=True)