update

myapps/automat/api/machine_portal.py

@@ -5,6 +5,7 @@
 author:Aeolus
 author:Aeolus
 @file: hatch_portal.py
 @file: hatch_portal.py
 """
 """
+import datetime
 import logging
 import logging
 import time
 import time
 
 
@@ -106,12 +107,15 @@ def run_create_machine_no():
     if machine:
     if machine:
         return jsonify(MACHINE_MAC_DUPLICATE_ERROR)
         return jsonify(MACHINE_MAC_DUPLICATE_ERROR)
 
 
-    for i in range(3):
-        machine_no = int(time.time())
-        machine = Machine.query.filter_by(machine_no=machine_no).first()
-        if not machine:
-            break
-        return jsonify(MACHINE_NO_CREATE_ERROR)
+    date_str = datetime.datetime.now().date().strftime("%Y%m%d")[2:]
+    sql = "SELECT max(machine_no) as machine_no FROM machine where machine_no like '{}%'".format(date_str)
+    result = db.session.execute(sql).fetchone()
+    if result:
+        max_machine_no = int(result["machine_no"])
+        machine_no = str(max_machine_no + 1)
+    else:
+        machine_no = date_str + "0001"
+
     machine_model = Machine()
     machine_model = Machine()
     machine_model.machine_no = machine_no
     machine_model.machine_no = machine_no
     machine_model.mac = mac
     machine_model.mac = mac