|
|
@@ -208,7 +208,7 @@ async def updata_dict_type(
|
|
|
raise HTTPException(status_code=404, detail="dict_type不存在")
|
|
|
|
|
|
dict_type.dict_name = form_data.dictName
|
|
|
- dict_type.dict_name = form_data.dictType
|
|
|
+ dict_type.dict_type = form_data.dictType
|
|
|
dict_type.remark = form_data.remark
|
|
|
dict_type.update_time = datetime.now()
|
|
|
|
|
|
@@ -317,6 +317,52 @@ async def get_dict_data_by_type(
|
|
|
# 处理异常
|
|
|
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
|
|
|
|
|
|
+@router.get('/data/{dictCode}')
|
|
|
+async def get_dict_data_by_type(
|
|
|
+ dictCode: str ,
|
|
|
+ db: Session = Depends(get_db),
|
|
|
+ body = Depends(remove_xss_json),
|
|
|
+ user_id = Depends(valid_access_token)
|
|
|
+):
|
|
|
+ try:
|
|
|
+ # 根据 dict_type 查询字典数据
|
|
|
+ # dict_data = db.query(SysDictData).filter_by(dict_type=dictType).all()
|
|
|
+ query = db.query(SysDictData)
|
|
|
+
|
|
|
+ # 添加查询条件
|
|
|
+ # if dictType:
|
|
|
+ query = query.filter(SysDictData.dict_code==dictCode)
|
|
|
+ query = query.filter(SysDictData.del_flag != '2')
|
|
|
+
|
|
|
+
|
|
|
+ d = query.first()
|
|
|
+
|
|
|
+ # 转换为字典
|
|
|
+ dict_data_list = {
|
|
|
+ "dictCode": d.dict_code,
|
|
|
+ "dictSort": d.dict_sort,
|
|
|
+ "dictLabel": d.dict_label,
|
|
|
+ "dictValue": d.dict_value,
|
|
|
+ "dictType": d.dict_type,
|
|
|
+ "cssClass": d.css_class,
|
|
|
+ "listClass": d.list_class,
|
|
|
+ "isDefault": d.is_default,
|
|
|
+ "remark": d.remark,
|
|
|
+ "createTime": d.create_time.strftime('%Y-%m-%d %H:%M:%S') if d.create_time else ''
|
|
|
+ }
|
|
|
+
|
|
|
+ # 构建返回结果
|
|
|
+ result = {
|
|
|
+ "data": dict_data_list,
|
|
|
+ "code": 200,
|
|
|
+ "msg": "查询成功"
|
|
|
+ }
|
|
|
+ return result
|
|
|
+
|
|
|
+ except Exception as e:
|
|
|
+ # 处理异常
|
|
|
+ raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
|
|
|
+
|
|
|
class DictDataCreateForm(BaseModel):
|
|
|
dictLabel:str
|
|
|
dictValue:str
|
