Merge branch 'master' of https://gogs.tjp.com.cn/maoming/python-fastapi-mm-zhcs-yj-api

models/pattern_base.py

@@ -7,7 +7,7 @@ from datetime import datetime
 class TpPatternList(Base):
     __tablename__ = 'tp_pattern_list'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, autoincrement=True, primary_key=True)
     pattern_name = Column(String(255), nullable=True, comment='图案名称')
     content = Column(JSON, nullable=True, comment='图案json')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')

routers/api/pattern/__init__.py

@@ -41,8 +41,10 @@ async def update_pattern(
     body=Depends(remove_xss_json),
     db: Session = Depends(get_db)
 ):
-
-    update_pattern = db.query(TpPatternList).filter(TpPatternList.id == pattern_id).first()
+    query = db.query(TpPatternList)
+    query = query.filter(TpPatternList.id == pattern_id)
+    query = query.filter(TpPatternList.del_flag != '2')
+    update_pattern = query.first()
     if not update_pattern:
         raise HTTPException(status_code=404, detail="图案不存在")
 
@@ -57,7 +59,11 @@ async def get_pattern_info(
     pattern_id: int,
     db: Session = Depends(get_db)
 ):
-    pattern = db.query(TpPatternList).filter(TpPatternList.id == pattern_id).first()
+    query = db.query(TpPatternList)
+    query = query.filter(TpPatternList.id == pattern_id)
+    query = query.filter(TpPatternList.del_flag != '2')
+    pattern = query.first()
+    # pattern = db.query(TpPatternList).filter(TpPatternList.id == pattern_id).first()
     if not pattern:
         raise HTTPException(status_code=404, detail="图案不存在")
     return {"code": 200, "msg": "获取成功", "data": {"pattern_name": pattern.pattern_name, "content": pattern.content}}
@@ -69,9 +75,11 @@ async def get_pattern_list(
     pageSize: int = Query(5, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
+
     query = db.query(TpPatternList)
+    query = query.filter(TpPatternList.del_flag != '2')
     if pattern_name:
-        query = query.filter(TpPatternList.pattern_namelike(f'%{pattern_name}%'))
+        query = query.filter(TpPatternList.pattern_name.like(f'%{pattern_name}%'))
     total_items = query.count()
 
     # 排序
@@ -92,7 +100,10 @@ async def delete_pattern(
     db: Session = Depends(get_db)
 ):
     # 检查图案是否存在
-    pattern = db.query(TpPatternList).filter(TpPatternList.id == pattern_id).first()
+    query = db.query(TpPatternList)
+    query = query.filter(TpPatternList.id == pattern_id)
+    query = query.filter(TpPatternList.del_flag != '2')
+    pattern = query.first()
     if not pattern:
         raise HTTPException(status_code=404, detail="图案不存在")