From df87a8fd658e7893a21f5fed01f1dd7b8c0576d1 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 6 Aug 2023 20:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/daily_out_temps.docx | Bin 19087 -> 19066 bytes Config/word_data_template.json | 3 +-- Crud/DailyCrud.py | 4 ++-- Mods/Notice/Utils.py | 7 ++++--- Router/UserRouter.py | 2 +- Utils/SqlAlchemyUtils.py | 7 ++++++- requirements.txt | 3 ++- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Config/daily_out_temps.docx b/Config/daily_out_temps.docx index c3adc2dd4d4281bad71c42fc42c9717a694596fd..fd8da4283b3f485fc0cfb3d727d42d891b4f9422 100644 GIT binary patch delta 5671 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 RLeYQ0?KL=Y6qWzB{s&}Pia`JX delta 5883 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 diff --git a/Config/word_data_template.json b/Config/word_data_template.json index f1891be..0ec0e5e 100644 --- a/Config/word_data_template.json +++ b/Config/word_data_template.json @@ -60,8 +60,7 @@ "分支机构": [ "浙江分公司", "湖南子公司", - "鼎信团队", - "四川远东" + "鼎信团队" ] }, "监管和同业动态": [ diff --git a/Crud/DailyCrud.py b/Crud/DailyCrud.py index 3787567..0d764d1 100644 --- a/Crud/DailyCrud.py +++ b/Crud/DailyCrud.py @@ -63,7 +63,7 @@ def replace_words(content): def daily_add(db: Session, data): daily = Daily(**data) if daily.content: - daily.content = replace_word(daily.content) + daily.content = replace_words(daily.content) db.add(daily) db.commit() db.refresh(daily) @@ -73,7 +73,7 @@ def daily_add(db: Session, data): def daily_change(db: Session, item_id, data): content = data.get('content') if content: - data['content'] = replace_word(content) + data['content'] = replace_words(content) db.query(Daily).filter_by(id=item_id).update(data) db.commit() item = db.query(Daily).filter_by(id=item_id).first() diff --git a/Mods/Notice/Utils.py b/Mods/Notice/Utils.py index 5930532..e35e083 100644 --- a/Mods/Notice/Utils.py +++ b/Mods/Notice/Utils.py @@ -63,7 +63,7 @@ def get_user_not_fill_daily(): filled_user_list = {item.fill_user for item in daily_list} notice_user_list = [item for item in db.query(User).filter(User.email.not_in(filled_user_list)) if - item.name not in ['邢军']] + item.name not in ['邢军'] and item.daily_fill_notice is True] email_list = [user.email for user in notice_user_list] name_list = [user.name for user in notice_user_list] # print(name_list) @@ -140,11 +140,12 @@ class DailyNotice: while True: time.sleep(15) now = datetime.now() - if is_workday() and now.hour == 15 and (35<= now.minute < 35 + 3) and not sended: + if is_workday() and now.hour == 15 and (35 <= now.minute < 35 + 3) and not sended: sended = True try: user_list = get_user_not_fill_daily() - args_list = [['日报填报提醒', user.email, daily_fill_send] for user in user_list if user.daily_fill_notice] + args_list = [['日报填报提醒', user.email, daily_fill_send] for user in user_list if + user.daily_fill_notice] # args_list = [['日报填报提醒', user.email, daily_fill_send] for user in user_list if user.name in ['王思川','伍春全','李凯','彭森','徐聿成','陈世杰']] self.email_send_thread(args_list) # send_email('日报填报提醒', "fecribd@fecr.com.cn", daily_fill_send) diff --git a/Router/UserRouter.py b/Router/UserRouter.py index 7c9e860..d911701 100644 --- a/Router/UserRouter.py +++ b/Router/UserRouter.py @@ -270,7 +270,7 @@ def set_user_openid(body: UserSchemas.SetUserOpenidReq, @router.post("/get_user_can_watch_department", tags=["获取用户可查看部门列表"], summary=['查询']) def get_user_can_watch_department(token_data: TokenData = Depends(token_data_depend), db: Session = Depends(get_db)): print(token_data) - department_list = [item.to_dict() for item in UserCrud.get_department_list(db) if item.id not in [1, 2, 3]] + department_list = [item.to_dict() for item in UserCrud.get_department_list(db) if item.id not in [1, 2, 3] and item.name not in ["四川远东"]] department_dict = {item['id']: item for item in department_list} # 所有部门动态查看 if check_auth(token_data.auth_data, [2]): diff --git a/Utils/SqlAlchemyUtils.py b/Utils/SqlAlchemyUtils.py index 9c4a984..ee0035f 100644 --- a/Utils/SqlAlchemyUtils.py +++ b/Utils/SqlAlchemyUtils.py @@ -5,6 +5,7 @@ from sqlalchemy import create_engine, Column, and_, asc, desc, func, cast, DATE, from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker, Session, DeclarativeMeta, Query from typing import Literal, List, Any, Optional +from sqlalchemy_utils import database_exists, create_database Base = declarative_base() @@ -13,6 +14,7 @@ password = "123456" host = "127.0.0.1" db = 'daily' + # user = "root" # password = "jntm2.5" # host = "192.168.0.89:13306" @@ -58,6 +60,9 @@ def get_db_i() -> Session: # yield db # finally: # db.close() +def create_db(engine): + if not database_exists(engine.url): + create_database(engine.url) def init_database(): @@ -67,7 +72,7 @@ def init_database(): # 通用查询接口 -QueryType = Literal['=',"!=", '==', '>', '>=', '<', '<=', 'in', 'like', 'range', 'find_in_set', "date=="] +QueryType = Literal['=', "!=", '==', '>', '>=', '<', '<=', 'in', 'like', 'range', 'find_in_set', "date=="] class QueryParam(BaseModel): diff --git a/requirements.txt b/requirements.txt index 73d8d41..5d2a981 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,5 @@ redis==4.5.1 pandas==1.5.3 openpyxl==3.1.2 docxtpl -pyahocorasick \ No newline at end of file +pyahocorasick +sqlalchemy_utils==0.41.1 \ No newline at end of file