From 381490bbae8c397c805a36668b8b9c4b4bfe7a0c Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 28 Oct 2021 16:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=BD=A6=E5=9E=8B=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/Article.dao.go | 17 +++++++++ dao/base/implments/Article.dao.impl.go | 21 +++++++++++ services/base/Article.service.go | 19 ++++++++++ .../base/implments/Article.service.impl.go | 15 ++++++++ web/controllers/base/Article.rest.go | 35 +++++++++++++++++++ web/controllers/base/base.go | 2 ++ 6 files changed, 109 insertions(+) diff --git a/dao/base/Article.dao.go b/dao/base/Article.dao.go index beb5b03..cae239e 100644 --- a/dao/base/Article.dao.go +++ b/dao/base/Article.dao.go @@ -236,6 +236,23 @@ type ArticleDAO interface { * ******************************************************************************/ UpdateWhere([]grmi.Predicate, *model.Article, ...string) error + /****************************************************************************** + * + * @Function Name : SelectAllCarModel + *----------------------------------------------------------------------------- + * + * @Description : 搜索所有物料的车型 + * + * @Return Value : 所有车型 + * + * @Return Value : 执行时发生的错误 + * + * @Author : zhangxin + * + * @Date : 2021-10-28 + * + ******************************************************************************/ + SelectAllCarModel() (result []string, err error) } /****************************************************************************** diff --git a/dao/base/implments/Article.dao.impl.go b/dao/base/implments/Article.dao.impl.go index b9f3a47..a7e85ef 100644 --- a/dao/base/implments/Article.dao.impl.go +++ b/dao/base/implments/Article.dao.impl.go @@ -311,3 +311,24 @@ func (impl *ArticleDAOImplement) UpdateWhere(predicates []grmi.Predicate, entity } return nil } + +/****************************************************************************** + * + * @Reference LAPP_GAAS_GFrame_BACKEND/dao/base/ArticleDAO.SelectAllCarModel + * + ******************************************************************************/ +func (impl *ArticleDAOImplement) SelectAllCarModel() (result []string, err error) { + data := make([]interface{}, 0) + err = impl.session.Table(impl.meta.TableName).Cols(meta.Article_CarModel.ColumnName).Distinct(meta.Article_CarModel.ColumnName).Asc(meta.Article_CarModel.ColumnName).Find(&data) + if err != nil { + return nil, err + } + result = make([]string, 0) + for _, item := range data { + carModel, ok := item.(string) + if ok { + result = append(result, carModel) + } + } + return result, err +} \ No newline at end of file diff --git a/services/base/Article.service.go b/services/base/Article.service.go index 5f673ab..da16eee 100644 --- a/services/base/Article.service.go +++ b/services/base/Article.service.go @@ -173,6 +173,25 @@ type ArticleService interface { * ******************************************************************************/ Update(*models.Usertab, *[]model.Article) error + /****************************************************************************** + * + * @Function Name : SelectAllCarModel + *----------------------------------------------------------------------------- + * + * @Description : 搜索所有的车型 + * + * @Function Parameters : 当前访问人员信息 + * + * @Return Value : 所有的车型数据 + * + * @Return Value : 执行时发生的错误 + * + * @Author : zhangxin + * + * @Date : 2021-10-28 + * + ******************************************************************************/ + SelectAllCarModel(user *models.Usertab) ([]string, error) } /****************************************************************************** diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index 6f3ad32..1159cc0 100644 --- a/services/base/implments/Article.service.impl.go +++ b/services/base/implments/Article.service.impl.go @@ -441,3 +441,18 @@ func (impl *ArticleServiceImplement) Update(user *models.Usertab, entities *[]mo } return nil } + +/****************************************************************************** + * + * @Reference LAPP_GAAS_GFrame_BACKEND/services/base/ArticleService.SelectAllCarModel + * + ******************************************************************************/ +func (impl *ArticleServiceImplement) SelectAllCarModel(user *models.Usertab) ([]string, error) { + grmi.Log(user, "/services/base/implments/Article.service.impl.go", "SelectAllCarModel", "搜索所有的车型") + + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + dao := dal.NewArticleDAO(session, user.Pid, user.Userid) + return dao.SelectAllCarModel() +} \ No newline at end of file diff --git a/web/controllers/base/Article.rest.go b/web/controllers/base/Article.rest.go index 203ff48..b592e79 100644 --- a/web/controllers/base/Article.rest.go +++ b/web/controllers/base/Article.rest.go @@ -362,3 +362,38 @@ func RegisterUpdateArticle(party router.Party, path string, method func(*models. RegisterMultiArticle(party, "PUT", path, method) } + +/****************************************************************************** + * + * @Function Name : RegisterSelectAllCarModel + *----------------------------------------------------------------------------- + * + * @Description : 为一个查询所有的CarModel的方法注册路由 + * + * @Function Parameters : 路由分组 + * + * @Function Parameters : 路径 + * + * @Function Parameters : 实际处理请求的方法 + * + * @Author : zhangxin + * + * @Date : 2021-10-28 + * + ******************************************************************************/ +func RegisterSelectAllCarModel(party router.Party, path string, method func(*models.Usertab) ([]string, error)) { + + party.Get(path, func(ctx iris.Context) { + user, ok := jwts.ParseToken(ctx) + if !ok { + supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) + return + } + result, err := method(user) + if err != nil { + supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) + return + } + supports.Ok(ctx, supports.OptionSuccess, result) + }) +} \ No newline at end of file diff --git a/web/controllers/base/base.go b/web/controllers/base/base.go index ba874a8..1e8de47 100644 --- a/web/controllers/base/base.go +++ b/web/controllers/base/base.go @@ -793,6 +793,8 @@ func RegisterRoutes() { RegisterUpdateOneArticle(article, "/updateone", serviceOfArticle.UpdateOne) // Article修改多条 // RegisterUpdateArticle(article, "/update", serviceOfArticle.Update) + // Article所有所有的car model + RegisterSelectAllCarModel(article, "/selectallcarmodel", serviceOfArticle.SelectAllCarModel) // WorkLineWorkShiftLst的路由组 worklineworkshiftlst := party.Party("/worklineworkshiftlst")