目录名称修改

Common/Utils.py

@@ -11,12 +11,7 @@ import platform
 import hashlib
 import uuid
 import psutil
-from dateutil import parser, relativedelta
-from sqlalchemy import and_
 from config.SystemConfig import SystemConfig
-from db_logic.client import BllClient
-from db_logic.humiture_record import BllHumitureRecord
-from models.humiture_models import EntityHumitureRecord
 
 # 判断当前系统是linux还是windows
 system_name = platform.system()

Common/auth.py

@@ -8,7 +8,7 @@ from flask import g
 from flask_httpauth import HTTPBasicAuth, HTTPTokenAuth
 from db_logic.user import BllUser
 from models.user_models import EntityUser
-from common.errors import error_response
+from Common.errors import error_response
 
 basic_auth = HTTPBasicAuth()
 token_auth = HTTPTokenAuth()

Common/errors.py

@@ -6,7 +6,7 @@
 from flask import jsonify
 from werkzeug.http import HTTP_STATUS_CODES
 
-from common.utils import Utils
+from Common.Utils import Utils
 
 def error_response(status_code, message=None):
     payload = Utils.except_return(

apps/drug/views.py

@@ -14,7 +14,7 @@ from models.medicament_models import EntityMedicament
 from db_logic.user import BllUser
 from models.user_models import EntityUser
 from models.client_models import EntityClient
-from common.utils import DrugStatus, PageParam, Utils
+from Common.Utils import DrugStatus, PageParam, Utils
 drug_router = Blueprint("drug", __name__)
 
 

apps/drug_template/views.py

@@ -10,9 +10,9 @@ import datetime
 import json
 from flask import jsonify, request, g
 from flask import Blueprint
-from common.read_excel import ReadExcel
+from Common.read_excel import ReadExcel
 
-from common.utils import Utils, PageParam
+from Common.Utils import Utils, PageParam
 from db_logic.client import BllClient
 from db_logic.medicament import BllMedicament
 from db_logic.user import BllUser

apps/home/views.py

@@ -11,7 +11,7 @@ from models.warning_models import EntityWarning
 
 from db_logic.medicament_record import BllMedicamentRecord
 from db_logic.warning import BllWarning
-from common.utils import PageParam, Utils
+from Common.Utils import PageParam, Utils
 
 from flask import Blueprint
 

config/system.conf

@@ -1,6 +1,6 @@
 [system]
 clientid = 000
-serverip = 127.0.0.1
+serverip = 0.0.0.0
 port = 9001
 # dbconntion = mysql+pymysql://root:123456@127.0.0.1/local_rms_db?charset=utf8
 dbconntion = mysql+pymysql://yanyi:tangyan86910282@111.231.67.55/yy_rms_multiple?charset=utf8

db_logic/client.py

@@ -1,10 +1,15 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 '''
-@Date:2022/07/18 16:32:26
+@Da
+te:2022/07/18 16:32:26
 '''
+import sys
+sys.path.append(".")
+import os
+print(os.getcwd())
 from sqlalchemy import asc
-from db_logic.db_base import Repository
+from .db_base import Repository
 from models.client_models import EntityClient
 
 

db_logic/db_base.py

@@ -13,7 +13,7 @@ from sqlalchemy.sql import func
 import paginate_sqlalchemy
 from config.SystemConfig import SystemConfig
 from models.models_base import Base
-from Common.Utils import logger
+from Common.log_utlis import logger
 
 
 """数据仓储类"""

db_logic/medicament_record.py

@@ -14,7 +14,7 @@ from db_logic.db_base import Repository
 
 from models.medicament_models import EntityMedicamentRecord
 
-from common.utils import Utils
+from Common.Utils import Utils
 # from common.utils import Utils
 
 #药剂流转记录业务逻辑类

db_logic/medicament_template.py

@@ -7,7 +7,7 @@ import sys
 
 sys.path.append(".")
 
-from common.utils import Utils
+from Common.Utils import Utils
 from sqlalchemy import desc, Table
 
 from db_logic.db_base import Repository

db_logic/meidcament_variety.py

@@ -6,7 +6,7 @@
 import sys
 sys.path.append(".")
 from sqlalchemy import or_, and_
-from common.utils import Utils
+from Common.Utils import Utils
 from db_logic.db_base import Repository
 from models.medicament_models import EntityMedicamentVariety
 

db_logic/warning.py

@@ -9,7 +9,7 @@ sys.path.append(".")
 
 import random
 from sqlalchemy import or_, desc
-from common.utils import Utils
+from Common.Utils import Utils
 from db_logic.db_base import Repository
 from models.warning_models import EntityWarning
 #预警信息业务逻辑类