diff --git a/internel/dao/secFilings.go b/internel/dao/secFilings.go index 38e3636..f472f41 100644 --- a/internel/dao/secFilings.go +++ b/internel/dao/secFilings.go @@ -30,7 +30,7 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi } j, err := json.Marshal(dataFiles) if err != nil { - return nil, errors.New("datafiles文件json转换失败: " + err.Error()) + return nil, errors.New("文件转换失败") } filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FileLink) var count int64 @@ -38,7 +38,7 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi return nil, err } if count != 0 { - return nil, errors.New("filing_key已存在") + return nil, errors.New("key已存在,创建失败") } if err := db.DocDB.Model(&model.SecFilings{}).Create(&model.SecFilings{ FilingKey: filingKey, @@ -57,7 +57,6 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi return nil, err } resp.FilingKey = filingKey - resp.Msg = "create success" return resp, nil } func (secFilingsDao) UpdateSecFiling(query map[string]string, column map[string]interface{}) (*secFilings.CommonResp, error) { @@ -65,7 +64,6 @@ func (secFilingsDao) UpdateSecFiling(query map[string]string, column map[string] if err := db.DocDB.Model(&model.SecFilings{}).Where("filing_key = ?", query["filing_key"]).Updates(column).Error; err != nil { return nil, err } - resp.Msg = "update success" return resp, nil } func (secFilingsDao) ListSecFiling(req *secFilings.ListSecFilingReq) (res []*model.SecFilings, total int64, err error) { @@ -75,7 +73,7 @@ func (secFilingsDao) ListSecFiling(req *secFilings.ListSecFilingReq) (res []*mod query = query.Where("form LIKE ?", "%"+form+"%") } if req.FilingDateBegin != "" && req.FilingDateEnd != "" && req.FilingDateBegin > req.FilingDateEnd { - return nil, 0, errors.New("开始日期不能大于结束日期") + return nil, 0, errors.New("开始日期超过结束日期") } @@ -143,7 +141,6 @@ func (secFilingsDao) UpdateSecFilingStatus(query map[string]string, column map[s return nil, err } resp.FilingKey = query["filing_key"] - resp.Msg = "update status success" return resp, nil } func (secFilingsDao) ListFormType(req *secFilings.ListFormTypeReq) (res []*model.FormType, total int64, err error) { diff --git a/internel/logic/secFilings.go b/internel/logic/secFilings.go index a13dda8..2b8f1aa 100644 --- a/internel/logic/secFilings.go +++ b/internel/logic/secFilings.go @@ -16,14 +16,13 @@ var SecFilingsLogic = new(secFilingsLogic) func (secFilingsLogic) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFilings.CommonResp, error) { resp, err := dao.SecFilingsDao.CreateSecFiling(req) if err != nil { - return nil, errors.New("创建失败:" + err.Error()) + return nil, errors.New("创建失败") } - resp.Msg = "创建成功" return resp, nil } func (secFilingsLogic) UpdateSecFiling(req *secFilings.UpdateSecFilingReq) (*secFilings.CommonResp, error) { if req.FilingKey == "" { - return nil, errors.New("filing_key is empty") + return nil, errors.New("参数缺失") } filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FileLink) column := map[string]interface{}{ @@ -44,10 +43,9 @@ func (secFilingsLogic) UpdateSecFiling(req *secFilings.UpdateSecFilingReq) (*sec } resp, err := dao.SecFilingsDao.UpdateSecFiling(query, column) if err != nil { - return nil, errors.New("更新失败:" + err.Error()) + return nil, errors.New("更新失败") } resp.FilingKey = filingKey - resp.Msg = "更新成功" return resp, nil } func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFilings.SecFilingListResp, error) { @@ -55,13 +53,13 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili datas := []*secFilings.SecFiling{} list, total, err := dao.SecFilingsDao.ListSecFiling(req) if err != nil { - return nil, errors.New("查询失败:" + err.Error()) + return nil, errors.New("查询失败") } for _, item := range list { dataFiles := []*secFilings.DataFiles{} if item.DataFiles != nil && len(item.DataFiles) != 0 { if err := json.Unmarshal(item.DataFiles, &dataFiles); err != nil { - return nil, errors.New("datafiles文件json转换失败: " + err.Error()) + return nil, errors.New("文件转换失败") } } datas = append(datas, &secFilings.SecFiling{ @@ -84,7 +82,6 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili }) } resp.Total = uint32(total) - resp.Msg = "查询成功" resp.Data = datas return resp, nil @@ -92,15 +89,15 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili func (secFilingsLogic) DetailSecFiling(req *secFilings.DetailSecFilingReq) (*secFilings.SecFilingDetailResp, error) { resp := &secFilings.SecFilingDetailResp{} if req.FilingKey == "" { - return nil, errors.New("filing_key is empty") + return nil, errors.New("参数缺失") } detail, err := dao.SecFilingsDao.DetailSecFiling(req) if err != nil { - return nil, errors.New("查询失败:" + err.Error()) + return nil, errors.New("查询失败") } var dataFiles []*secFilings.DataFiles if err := json.Unmarshal(detail.DataFiles, &dataFiles); err != nil { - return nil, errors.New("datafiles文件json转换失败: " + err.Error()) + return nil, errors.New("文件转换失败") } data := &secFilings.SecFiling{ FilingKey: detail.FilingKey, @@ -119,41 +116,39 @@ func (secFilingsLogic) DetailSecFiling(req *secFilings.DetailSecFilingReq) (*sec CreatedAt: time.Unix(detail.CreatedAt, 0).Format("2006-01-02 15:04:05"), UpdatedAt: time.Unix(detail.UpdatedAt, 0).Format("2006-01-02 15:04:05"), } - resp.Msg = "查询成功" resp.Data = data return resp, nil } func (secFilingsLogic) DeleteSecFiling(req *secFilings.DeleteSecFilingReq) (*secFilings.CommonResp, error) { resp := &secFilings.CommonResp{} if req.FilingKey == "" { - return nil, errors.New("filing_key is empty") + return nil, errors.New("参数缺失") } if err := dao.SecFilingsDao.DeleteSecFiling(req); err != nil { - return nil, errors.New("删除失败:" + err.Error()) + return nil, errors.New("删除失败") } - resp.Msg = "删除成功" return resp, nil } func (secFilingsLogic) IsSecFilingExist(req *secFilings.IsSecFilingExistReq) (*secFilings.IsSecFilingExistResp, error) { resp := &secFilings.IsSecFilingExistResp{} if req.FilingDate == "" || req.Form == "" || req.FinalLink == "" { - return nil, errors.New("filing_date or form_type or final_link is empty") + return nil, errors.New("参数缺失") } filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FinalLink) exist, err := dao.SecFilingsDao.IsSecFilingExist(filingKey, req.FilingDate) if err != nil { - return nil, errors.New("查询失败:" + err.Error()) + return nil, errors.New("查询失败") } resp.Exist = exist return resp, nil } func (secFilingsLogic) UpdateSecFilingStatus(req *secFilings.UpdateSecFilingStatusReq) (*secFilings.CommonResp, error) { if req.FilingKey == "" { - return nil, errors.New("filing_key is empty") + return nil, errors.New("参数缺失") } if req.Status != 1 && req.Status != 2 { - return nil, errors.New("invalid status value") + return nil, errors.New("状态值无效") } column := map[string]interface{}{ "status": req.Status, @@ -165,16 +160,15 @@ func (secFilingsLogic) UpdateSecFilingStatus(req *secFilings.UpdateSecFilingStat } resp, err := dao.SecFilingsDao.UpdateSecFilingStatus(query, column) if err != nil { - return nil, errors.New("更新状态失败:" + err.Error()) + return nil, errors.New("更新状态失败") } - resp.Msg = "状态更新成功" return resp, nil } func (secFilingsLogic) ListFormType(req *secFilings.ListFormTypeReq) (*secFilings.FormTypeListResp, error) { resp := &secFilings.FormTypeListResp{} list, total, err := dao.SecFilingsDao.ListFormType(req) if err != nil { - return nil, errors.New("查询失败:" + err.Error()) + return nil, errors.New("查询失败") } for _, item := range list { resp.FormType = append(resp.FormType, &secFilings.FormType{ @@ -190,13 +184,13 @@ func (secFilingsLogic) WebListSecFiling(req *secFilings.WebListSecFilingReq) (*s datas := []*secFilings.SecFiling{} list, total, err := dao.SecFilingsDao.WebListSecFiling(req) if err != nil { - return nil, errors.New("查询失败:" + err.Error()) + return nil, errors.New("查询失败") } for _, item := range list { dataFiles := []*secFilings.DataFiles{} if item.DataFiles != nil && len(item.DataFiles) != 0 { if err := json.Unmarshal(item.DataFiles, &dataFiles); err != nil { - return nil, errors.New("datafiles文件json转换失败: " + err.Error()) + return nil, errors.New("文件转换失败") } } datas = append(datas, &secFilings.SecFiling{ @@ -219,7 +213,6 @@ func (secFilingsLogic) WebListSecFiling(req *secFilings.WebListSecFilingReq) (*s }) } resp.Total = uint32(total) - resp.Msg = "查询成功" resp.Data = datas return resp, nil }