机柜已激活提示

myapps/sukang24h/api/tallyman_portal.py

@@ -11,7 +11,7 @@ from models.base_model import db
 from models.models import TallymanAccount, TallymanMachine, TallymanLoginRecord, Machine, Hatch, TallyRecord
 from models.models import TallymanAccount, TallymanMachine, TallymanLoginRecord, Machine, Hatch, TallyRecord
 from service.tallyman_service import TallymanService
 from service.tallyman_service import TallymanService
 from utils.error_code import TALLYMAN_ACCOUNT_EXIST, PHONE_NOT_VALID_ERROR, TOKEN_NOT_VALID_ERROR, PASSWORD_ERROR, \
 from utils.error_code import TALLYMAN_ACCOUNT_EXIST, PHONE_NOT_VALID_ERROR, TOKEN_NOT_VALID_ERROR, PASSWORD_ERROR, \
-    TALLYMAN_ACCOUNT_NOT_EXIST, MACHINE_NOT_EXIST_ERROR, HATCH_NOT_EXIST_ERROR
+    TALLYMAN_ACCOUNT_NOT_EXIST, MACHINE_NOT_EXIST_ERROR, HATCH_NOT_EXIST_ERROR, MACHINE_ACTIVATED_ERROR
 from utils.jwt_util import verify_jwt, generate_jwt
 from utils.jwt_util import verify_jwt, generate_jwt
 from utils.my_response import BaseResponse
 from utils.my_response import BaseResponse
 
 
@@ -350,8 +350,10 @@ def run_machine_activate():
     machine_no = json_data["machine_no"]
     machine_no = json_data["machine_no"]
     mac = json_data["mac"]
     mac = json_data["mac"]
 
 
-    machine = Machine.query.filter_by(qrcode_no=qrcode_no, status=0).first()
+    machine = Machine.query.filter_by(qrcode_no=qrcode_no).first()
     if machine and machine.machine_no == qrcode_no:
     if machine and machine.machine_no == qrcode_no:
+        if machine.status == 1:
+            return jsonify(MACHINE_ACTIVATED_ERROR)
         machine.status = 1
         machine.status = 1
         machine.mac = mac
         machine.mac = mac
         db.session.add(machine)
         db.session.add(machine)