diff --git a/iti/applications/models/iot/iot_endpoint.py b/iti/applications/models/iot/iot_endpoint.py index 1976e19..faba33d 100644 --- a/iti/applications/models/iot/iot_endpoint.py +++ b/iti/applications/models/iot/iot_endpoint.py @@ -24,6 +24,7 @@ class IotEndpoint(db.Model, TimeModelMixin): port = db.Column(db.String(255), nullable=False, comment="采集端端口") brand_name = db.Column(db.String(255), nullable=False, comment="品牌名称") specification_model = db.Column(db.String(255), nullable=False, comment="规格型号") + is_online = db.Column(db.Integer, nullable=False, default=0, comment="在线状态 0:离线 1:在线") status = db.Column(db.Integer, nullable=False, default=0, comment="状态 0:停用 1:运行中 2:维修中") #关系 device = db.relationship( @@ -48,6 +49,7 @@ class IotEndpointSchema(BaseSchema): port = String() brand_name = String() specification_model = String() + is_online = Integer() status = Integer() created_at = DateTime(format="%Y-%m-%d %H:%M:%S") updated_at = DateTime(format="%Y-%m-%d %H:%M:%S") diff --git a/iti/applications/routes/iot/device_ctl.py b/iti/applications/routes/iot/device_ctl.py index d50db70..fd9e461 100644 --- a/iti/applications/routes/iot/device_ctl.py +++ b/iti/applications/routes/iot/device_ctl.py @@ -12,7 +12,7 @@ from .schemas.device import ( ) from iti.applications.common import ModelFilter from iti.applications.common.exceptions.biz_exp import BizException -from flask_jwt_extended import jwt_required, current_user +from flask_jwt_extended import jwt_required from sqlalchemy import select, delete, exists from sqlalchemy.orm import noload from iti.applications.common import permission diff --git a/iti/applications/routes/iot/endpoint_ctl.py b/iti/applications/routes/iot/endpoint_ctl.py index 91ee920..60e357f 100644 --- a/iti/applications/routes/iot/endpoint_ctl.py +++ b/iti/applications/routes/iot/endpoint_ctl.py @@ -12,7 +12,7 @@ from .schemas.endpoint import ( ) from iti.applications.common import ModelFilter from iti.applications.common.exceptions.biz_exp import BizException -from flask_jwt_extended import jwt_required, current_user +from flask_jwt_extended import jwt_required from sqlalchemy import select, delete, exists from sqlalchemy.orm import noload from iti.applications.common import permission diff --git a/iti/applications/routes/iot/node_ctl.py b/iti/applications/routes/iot/node_ctl.py index 4904dc1..2b8ffe6 100644 --- a/iti/applications/routes/iot/node_ctl.py +++ b/iti/applications/routes/iot/node_ctl.py @@ -12,7 +12,7 @@ from .schemas.node import ( ) from iti.applications.common import ModelFilter from iti.applications.common.exceptions.biz_exp import BizException -from flask_jwt_extended import jwt_required, current_user +from flask_jwt_extended import jwt_required from sqlalchemy import select, delete, exists from sqlalchemy.orm import noload from iti.applications.common import permission diff --git a/iti/applications/routes/iot/workshop_ctl.py b/iti/applications/routes/iot/workshop_ctl.py index e0638a8..1d83003 100644 --- a/iti/applications/routes/iot/workshop_ctl.py +++ b/iti/applications/routes/iot/workshop_ctl.py @@ -12,9 +12,8 @@ from .schemas.workshop import ( ) from iti.applications.common import ModelFilter from iti.applications.common.exceptions.biz_exp import BizException -from flask_jwt_extended import jwt_required, current_user -from sqlalchemy import select, delete, exists -from sqlalchemy.orm import noload +from flask_jwt_extended import jwt_required +from sqlalchemy import select from iti.applications.common import permission bp = APIBlueprint("iot_workshop", __name__, url_prefix="/workshop", tag="车间管理") @@ -88,7 +87,7 @@ def update_workshop(id: int, json_data: dict): @bp.delete("/") @jwt_required() @bp.doc(security="JWT") -@permission("iot:device:delete") +@permission("iot:workshop:delete") def delete_workshop(id: int): """ 删除车间信息