update

models/models.py

@@ -69,7 +69,7 @@ class AdminPlace(Base):
     user_id = Column(INTEGER(11), nullable=False)
     user_no = Column(String(25, 'utf8mb4_unicode_ci'), nullable=False)
     place_id = Column(INTEGER(11), nullable=False)
-    status = Column(INTEGER(1), nullable=False)
+    status = Column(INTEGER(1), nullable=False, server_default=text("'1'"))
     created_at = Column(DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"))
     updated_at = Column(DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"))
 
@@ -208,14 +208,16 @@ class Place(Base):
     __tablename__ = 'place'
 
     id = Column(INTEGER(10), primary_key=True)
+    parent_id = Column(INTEGER(10), server_default=FetchedValue(), nullable=False)
     place_name = Column(VARCHAR(191), nullable=False, index=True, comment='场所名')
     img = Column(VARCHAR(191), comment='展示界面的图片')
-    logo = Column(VARCHAR(191), nullable=False, comment='微型头像')
-    address = Column(VARCHAR(255), nullable=False, server_default=text("''"))
+    logo = Column(VARCHAR(191), comment='微型头像')
+    address = Column(VARCHAR(255), server_default=text("''"))
     position = Column(String(20, 'utf8mb4_unicode_ci'))
-    open_time = Column(VARCHAR(191), nullable=False, comment='开始时间')
-    close_time = Column(VARCHAR(191), nullable=False, comment='结束时间')
-    open_week = Column(VARCHAR(255), nullable=False, server_default=text("''"))
+    open_time = Column(VARCHAR(191), comment='开始时间')
+    close_time = Column(VARCHAR(191), comment='结束时间')
+    open_week = Column(VARCHAR(255), server_default=text("''"))
+    status = Column(INTEGER(1), nullable=False, server_default=text("'1'"))
     created_at = Column(TIMESTAMP, server_default=text("CURRENT_TIMESTAMP"))
     updated_at = Column(TIMESTAMP, server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"))
 

myapps/pc_management/api/__init__.py

@@ -12,8 +12,12 @@ author:Aeolus
 from flask import Flask
 
 from myapps.pc_management.api.admin_portal import admin_route
+from myapps.pc_management.api.place_portal import place_route
+from myapps.pc_management.api.machine_portal import machine_route
 
 
 def register_sukang_blueprint(app: Flask):
     prefix = "/pc_management"
     app.register_blueprint(admin_route, url_prefix=prefix + "/admin")
+    app.register_blueprint(place_route, url_prefix=prefix + "/place")
+    app.register_blueprint(machine_route, url_prefix=prefix + "/machine")

myapps/pc_management/api/machine_portal.py

+#!usr/bin/env python
+# -*- coding:utf-8 _*-
+"""
+@version:
+author:Aeolus
+@time: 2022/01/12
+@file: machine_portal.py
+@function:
+@modify:
+"""
+import logging
+
+from flask import Blueprint, g, request, jsonify
+
+from models.base_model import db
+from models.models import AdminMachine, Machine
+from utils.error_code import NO_PLACE_ERROR
+from utils.my_response import BaseResponse
+
+logger = logging.getLogger(__name__)
+
+machine_route = Blueprint('machine', __name__)
+
+
+@machine_route.route("machine_list", methods=["GET"])
+def run_machine_list():
+    """
+
+    :return:
+    """
+    admin = g.user
+    admin_machine_list = AdminMachine.query.filter_by(admin_no=admin.id, status=1).all()
+    if admin_machine_list:
+        machine_no_list = [i.machine_no for i in admin_machine_list]
+    else:
+        return BaseResponse(data=[])
+
+    machine_list = db.session.query(Machine).filter(Machine.id.in_(machine_no_list)).all()
+
+    if machine_list:
+        machine_data_list = [
+            {"machine_name": i.machine_name, "machine_id": i.id, "address": i.address, "parent_id": i.parent_id} for i in
+            machine_list]
+        return BaseResponse(data=machine_data_list)
+    else:
+        return BaseResponse(data=[])
+
+
+@machine_route.route("add_machine", methods=["GET"])
+def run_add_machine():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    machine_name = json_data["machine_name"]
+    address = json_data.get("address", "")
+    parent_id = json_data.get("parent_id", 0)
+
+    machine_model = Machine()
+    machine_model.machine_name = machine_name
+    machine_model.address = address
+    machine_model.parent_id = parent_id
+    db.session.add(machine_model)
+
+    db.session.commit()
+    return BaseResponse()
+
+
+@machine_route.route("edit_machine", methods=["GET"])
+def run_edit_machine():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    id = json_data["id"]
+    machine_name = json_data.get("machine_name", "")
+    address = json_data.get("address", "")
+    parent_id = json_data.get("parent_id", 0)
+    status = json_data.get("status", None)
+
+    machine_model = Machine.query.filter_by(id=id).first()
+    machine_model.machine_name = machine_name
+    machine_model.address = address
+    machine_model.parent_id = parent_id
+    machine_model.status = status
+    db.session.add(machine_model)
+    db.session.commit()
+    return BaseResponse()
+
+
+@machine_route.route("machine_detail", methods=["GET"])
+def get_machine_detail():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    id = json_data["id"]
+
+    machine_model = Machine.query.filter_by(id=id).first()
+    if machine_model:
+        return jsonify({"machine_name": machine_model.machine_name,
+                        "address": machine_model.address,
+                        "parent_id": machine_model.parent_id,
+                        "status": machine_model.status, })
+    else:
+        return jsonify(NO_PLACE_ERROR)

myapps/pc_management/api/place_portal.py

 #!usr/bin/env python
-#-*- coding:utf-8 _*-
+# -*- coding:utf-8 _*-
 """
 @version:
 author:Aeolus
@@ -7,4 +7,109 @@ author:Aeolus
 @file: place_portal.py
 @function:
 @modify:
-"""
\ No newline at end of file
+"""
+import logging
+
+from flask import Blueprint, g, request, jsonify
+
+from models.base_model import db
+from models.models import AdminPlace, Place
+from utils.error_code import NO_PLACE_ERROR
+from utils.my_response import BaseResponse
+
+logger = logging.getLogger(__name__)
+
+place_route = Blueprint('place', __name__)
+
+
+@place_route.route("place_list", methods=["POST"])
+def run_place_list():
+    """
+
+    :return:
+    """
+    admin = g.user
+    admin_place_list = AdminPlace.query.filter_by(user_id=admin.id, status=1).all()
+    if admin_place_list:
+        place_id_list = [i.place_id for i in admin_place_list]
+    else:
+        return BaseResponse(data=[])
+
+    place_list = db.session.query(Place).filter(Place.id.in_(place_id_list)).all()
+
+    if place_list:
+        place_data_list = [
+            {"place_name": i.place_name, "place_id": i.id, "address": i.address, "parent_id": i.parent_id} for i in
+            place_list]
+        return BaseResponse(data=place_data_list)
+    else:
+        return BaseResponse(data=[])
+
+
+@place_route.route("add_place", methods=["POST"])
+def run_add_place():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    place_name = json_data["place_name"]
+    address = json_data.get("address", "")
+    parent_id = json_data.get("parent_id", 0)
+
+    place_model = Place()
+    place_model.place_name = place_name
+    place_model.address = address
+    place_model.parent_id = parent_id
+    db.session.add(place_model)
+    db.session.commit()
+    admin_place = AdminPlace()
+    admin_place.user_id = g.user.id
+    admin_place.user_no = g.user.user_no
+    admin_place.place_id = place_model.id
+    admin_place.place_id = place_model.id
+    db.session.add(admin_place)
+    db.session.commit()
+    return BaseResponse()
+
+
+@place_route.route("edit_place", methods=["POST"])
+def run_edit_place():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    id = json_data["id"]
+    place_name = json_data.get("place_name", "")
+    address = json_data.get("address", "")
+    parent_id = json_data.get("parent_id", 0)
+    status = json_data.get("status", None)
+
+    place_model = Place.query.filter_by(id=id).first()
+    place_model.place_name = place_name
+    place_model.address = address
+    place_model.parent_id = parent_id
+    place_model.status = status
+    db.session.add(place_model)
+    db.session.commit()
+    return BaseResponse()
+
+
+@place_route.route("place_detail", methods=["POST"])
+def get_place_detail():
+    """
+
+    :return:
+    """
+    json_data = request.get_json()
+    id = json_data["id"]
+
+    place_model = Place.query.filter_by(id=id).first()
+    if place_model:
+        return jsonify({"place_name": place_model.place_name,
+                        "address": place_model.address,
+                        "parent_id": place_model.parent_id,
+                        "status": place_model.status, })
+    else:
+        return jsonify(NO_PLACE_ERROR)