|
|
@@ -2,12 +2,13 @@ package handler
|
|
|
|
|
|
import (
|
|
|
"context"
|
|
|
+
|
|
|
"dashoo.cn/common_definition/comm_def"
|
|
|
- "dashoo.cn/micro/app/model"
|
|
|
- "dashoo.cn/micro/app/service"
|
|
|
- "dashoo.cn/opms_libary/myerrors"
|
|
|
"github.com/gogf/gf/frame/g"
|
|
|
"github.com/gogf/gf/util/gvalid"
|
|
|
+
|
|
|
+ "dashoo.cn/micro/app/model"
|
|
|
+ "dashoo.cn/micro/app/service"
|
|
|
)
|
|
|
|
|
|
type DictHandler struct{}
|
|
|
@@ -16,12 +17,12 @@ type DictHandler struct{}
|
|
|
func (h *DictHandler) GetDictTypeList(ctx context.Context, req *model.ListSysDictTypeReq, rsp *comm_def.CommonMsg) error {
|
|
|
// 参数校验
|
|
|
dictService, err := service.NewDictTypeService(ctx)
|
|
|
- if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
|
|
|
total, list, err := dictService.GetList(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -36,12 +37,12 @@ func (h *DictHandler) GetDictTypeEntity(ctx context.Context, req *comm_def.IdReq
|
|
|
return NoParamsErr
|
|
|
}
|
|
|
dictService, err := service.NewDictTypeService(ctx)
|
|
|
- if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
|
|
|
data, err := dictService.GetDictById(req.Id)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+// _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -56,12 +57,12 @@ func (h *DictHandler) CreateDictType(ctx context.Context, req *model.SysDictType
|
|
|
return err
|
|
|
}
|
|
|
dictService, err := service.NewDictTypeService(ctx)
|
|
|
- if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
|
|
|
err = dictService.Create(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
@@ -72,12 +73,12 @@ func (h *DictHandler) UpdateDictType(ctx context.Context, req *model.SysDictType
|
|
|
return err
|
|
|
}
|
|
|
dictService, err := service.NewDictTypeService(ctx)
|
|
|
- if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //if flag, err, _, _ := myerrors.CheckError(err); flag {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
|
|
|
err = dictService.UpdateById(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
@@ -93,7 +94,7 @@ func (h *DictHandler) DeleteDictTypeByIds(ctx context.Context, req *comm_def.Ids
|
|
|
}
|
|
|
|
|
|
err = dictService.Delete(req.Ids)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
@@ -106,7 +107,7 @@ func (h *DictHandler) GetDictDataList(ctx context.Context, req *model.SelectDict
|
|
|
return err
|
|
|
}
|
|
|
total, list, err := dictService.GetDictDataList(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -126,7 +127,7 @@ func (h *DictHandler) GetDictDataEntity(ctx context.Context, req *comm_def.IdReq
|
|
|
}
|
|
|
|
|
|
data, err := dictService.GetDictDataById(req.Id)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -142,7 +143,7 @@ func (h *DictHandler) GetDictDataByType(ctx context.Context, req *model.GetDictR
|
|
|
}
|
|
|
|
|
|
list, err := dictService.GetDictWithDataByType(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -163,7 +164,7 @@ func (h *DictHandler) CreateDictData(ctx context.Context, req *model.DictDataAdd
|
|
|
}
|
|
|
|
|
|
_, err = dictService.Create(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+// _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
|
|
|
@@ -184,7 +185,7 @@ func (h *DictHandler) UpdateDictData(ctx context.Context, req *model.EditDictDat
|
|
|
}
|
|
|
|
|
|
err = dictService.UpdateByDict(req)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -203,7 +204,7 @@ func (h *DictHandler) DeleteDictDataByIds(ctx context.Context, req *comm_def.Ids
|
|
|
}
|
|
|
|
|
|
err = dictService.DeleteDictDataByIds(req.Ids)
|
|
|
- _, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
+ //_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|