From 069b1b84c6f76c4b3cdff008d463da46789e3f3d Mon Sep 17 00:00:00 2001 From: allanwei Date: Mon, 26 Jul 2021 15:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/ArtCheckRule.dao.go | 38 +++++++++++------- dao/base/implments/ArtCheckRule.dao.impl.go | 12 +++--- meta/base/ArtCheckRule.meta.go | 10 ++--- models/base/ArtCheckRule.model.go | 10 ++--- services/base/ArtCheckRule.service.go | 32 +++++++++------ .../implments/ArtCheckRule.service.impl.go | 32 +++++++-------- web/controllers/base/ArtCheckRule.rest.go | 40 ++++++++++--------- 7 files changed, 97 insertions(+), 77 deletions(-) diff --git a/dao/base/ArtCheckRule.dao.go b/dao/base/ArtCheckRule.dao.go index 679f046..d7eb1cf 100644 --- a/dao/base/ArtCheckRule.dao.go +++ b/dao/base/ArtCheckRule.dao.go @@ -18,7 +18,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ type ArtCheckRuleDAO interface { @@ -35,7 +35,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ InsertOne(*model.ArtCheckRule) error @@ -48,14 +48,18 @@ type ArtCheckRuleDAO interface { * * @Function Parameters : 主键 * + * @Function Parameters : 主键 + * + * @Function Parameters : 主键 + * * @Return Value : 执行时发生的错误 * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ - DeleteOne(int) error + DeleteOne(int, string, string) error /****************************************************************************** * * @Function Name : SelectOne @@ -65,16 +69,20 @@ type ArtCheckRuleDAO interface { * * @Function Parameters : 主键 * + * @Function Parameters : 主键 + * + * @Function Parameters : 主键 + * * @Return Value : 查找到的ArtCheckRule * * @Return Value : 执行时发生的错误 * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ - SelectOne(int) (*model.ArtCheckRule, error) + SelectOne(int, string, string) (*model.ArtCheckRule, error) /****************************************************************************** * * @Function Name : UpdateOne @@ -88,7 +96,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ UpdateOne(*model.ArtCheckRule) error @@ -105,7 +113,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Insert(*[]model.ArtCheckRule) error @@ -122,7 +130,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Delete(*[]model.ArtCheckRule) error @@ -137,7 +145,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ DeleteWhere([]grmi.Predicate) error @@ -158,7 +166,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Select([]grmi.Predicate, []grmi.Field) ([]model.ArtCheckRule, error) @@ -181,7 +189,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ SelectAndPaging(*grmi.Paging, []grmi.Predicate, []grmi.Field) (grmi.PagingResult, error) @@ -198,7 +206,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Update(*[]model.ArtCheckRule) error @@ -213,7 +221,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ UpdateWhere([]grmi.Predicate, *model.ArtCheckRule, ...string) error @@ -234,7 +242,7 @@ type ArtCheckRuleDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func NewArtCheckRuleDAO(session *xorm.Session, plantNr int, userid string) ArtCheckRuleDAO { diff --git a/dao/base/implments/ArtCheckRule.dao.impl.go b/dao/base/implments/ArtCheckRule.dao.impl.go index 809a0c0..d0875f5 100644 --- a/dao/base/implments/ArtCheckRule.dao.impl.go +++ b/dao/base/implments/ArtCheckRule.dao.impl.go @@ -20,7 +20,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ type ArtCheckRuleDAOImplement struct { @@ -45,7 +45,7 @@ type ArtCheckRuleDAOImplement struct { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func NewArtCheckRuleDAOImplement(session *xorm.Session, plantNr int, userid string) *ArtCheckRuleDAOImplement { @@ -72,8 +72,8 @@ func (impl *ArtCheckRuleDAOImplement) InsertOne(entity *model.ArtCheckRule) erro * @Reference LAPP_LF_MOM_BACKEND/dao/base/ArtCheckRuleDAO.DeleteOne * ******************************************************************************/ -func (impl *ArtCheckRuleDAOImplement) DeleteOne(attriCode int) error { - _, err := impl.session.Table(impl.meta.TableName).ID(core.PK{impl.plantNr, attriCode}).Delete(impl.meta.Indicator) +func (impl *ArtCheckRuleDAOImplement) DeleteOne(attriCode int, workLineId string, subObject string) error { + _, err := impl.session.Table(impl.meta.TableName).ID(core.PK{impl.plantNr, attriCode, workLineId, subObject}).Delete(impl.meta.Indicator) if err != nil { return grmi.NewDataBaseError(err) } @@ -86,9 +86,9 @@ func (impl *ArtCheckRuleDAOImplement) DeleteOne(attriCode int) error { * @Reference LAPP_LF_MOM_BACKEND/dao/base/ArtCheckRuleDAO.SelectOne * ******************************************************************************/ -func (impl *ArtCheckRuleDAOImplement) SelectOne(attriCode int) (*model.ArtCheckRule, error) { +func (impl *ArtCheckRuleDAOImplement) SelectOne(attriCode int, workLineId string, subObject string) (*model.ArtCheckRule, error) { var data model.ArtCheckRule - ok, err := impl.session.Table(impl.meta.TableName).ID(core.PK{impl.plantNr, attriCode}).Get(&data) + ok, err := impl.session.Table(impl.meta.TableName).ID(core.PK{impl.plantNr, attriCode, workLineId, subObject}).Get(&data) if err != nil { return nil, grmi.NewDataBaseError(err) } diff --git a/meta/base/ArtCheckRule.meta.go b/meta/base/ArtCheckRule.meta.go index 2c5f148..7edd00e 100644 --- a/meta/base/ArtCheckRule.meta.go +++ b/meta/base/ArtCheckRule.meta.go @@ -13,14 +13,14 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ var ArtCheckRule_PlantNr = grmi.NewField("PlantNr", "ArtCheckRule.PlantNr", "plantnr", grmi.TypeInt) var ArtCheckRule_AttriCode = grmi.NewField("AttriCode", "ArtCheckRule.AttriCode", "attricode", grmi.TypeInt) -var ArtCheckRule_AttriCodeDesc = grmi.NewField("AttriCodeDesc", "ArtCheckRule.AttriCodeDesc", "attricodedesc", grmi.TypeString) var ArtCheckRule_WorkLineId = grmi.NewField("WorkLineId", "ArtCheckRule.WorkLineId", "worklineid", grmi.TypeString) var ArtCheckRule_SubObject = grmi.NewField("SubObject", "ArtCheckRule.SubObject", "subobject", grmi.TypeString) +var ArtCheckRule_AttriCodeDesc = grmi.NewField("AttriCodeDesc", "ArtCheckRule.AttriCodeDesc", "attricodedesc", grmi.TypeString) var ArtCheckRule_CodeLength = grmi.NewField("CodeLength", "ArtCheckRule.CodeLength", "codelength", grmi.TypeString) var ArtCheckRule_CheckStartPos = grmi.NewField("CheckStartPos", "ArtCheckRule.CheckStartPos", "checkstartpos", grmi.TypeInt) var ArtCheckRule_CheckLength = grmi.NewField("CheckLength", "ArtCheckRule.CheckLength", "checklength", grmi.TypeInt) @@ -36,7 +36,7 @@ var ArtCheckRule_CreateTime = grmi.NewField("CreateTime", "ArtCheckRule.CreateTi * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ var ArtCheckRule = grmi.NewEntity( @@ -45,9 +45,9 @@ var ArtCheckRule = grmi.NewEntity( map[string]grmi.Field{ ArtCheckRule_PlantNr.Name: ArtCheckRule_PlantNr, ArtCheckRule_AttriCode.Name: ArtCheckRule_AttriCode, - ArtCheckRule_AttriCodeDesc.Name: ArtCheckRule_AttriCodeDesc, ArtCheckRule_WorkLineId.Name: ArtCheckRule_WorkLineId, ArtCheckRule_SubObject.Name: ArtCheckRule_SubObject, + ArtCheckRule_AttriCodeDesc.Name: ArtCheckRule_AttriCodeDesc, ArtCheckRule_CodeLength.Name: ArtCheckRule_CodeLength, ArtCheckRule_CheckStartPos.Name: ArtCheckRule_CheckStartPos, ArtCheckRule_CheckLength.Name: ArtCheckRule_CheckLength, @@ -58,4 +58,4 @@ var ArtCheckRule = grmi.NewEntity( ArtCheckRule_CreateTime.Name: ArtCheckRule_CreateTime, }, []string{"PlantNr"}, - []string{"AttriCodeDesc", "WorkLineId", "SubObject", "CodeLength", "CheckStartPos", "CheckLength", "CheckObject", "OnlyBarCodeFlag", "LastUser"}) + []string{"AttriCodeDesc", "CodeLength", "CheckStartPos", "CheckLength", "CheckObject", "OnlyBarCodeFlag", "LastUser"}) diff --git a/models/base/ArtCheckRule.model.go b/models/base/ArtCheckRule.model.go index e1f1130..33cd7f7 100644 --- a/models/base/ArtCheckRule.model.go +++ b/models/base/ArtCheckRule.model.go @@ -16,15 +16,15 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ type ArtCheckRule struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"ArtCheckRule-PlantNr"` AttriCode int `xorm:"pk int 'AttriCode'" json:"ArtCheckRule-AttriCode"` + WorkLineId string `xorm:"pk nvarchar(40) 'WorkLineId'" json:"ArtCheckRule-WorkLineId"` + SubObject string `xorm:"pk nvarchar(40) 'SubObject'" json:"ArtCheckRule-SubObject"` AttriCodeDesc string `xorm:"nvarchar(100) 'AttriCodeDesc' not null" json:"ArtCheckRule-AttriCodeDesc"` - WorkLineId string `xorm:"nvarchar(40) 'WorkLineId' not null" json:"ArtCheckRule-WorkLineId"` - SubObject string `xorm:"nvarchar(40) 'SubObject' not null" json:"ArtCheckRule-SubObject"` CodeLength string `xorm:"nvarchar(200) 'CodeLength' not null" json:"ArtCheckRule-CodeLength"` CheckStartPos int `xorm:"int 'CheckStartPos' not null" json:"ArtCheckRule-CheckStartPos"` CheckLength int `xorm:"int 'CheckLength' not null" json:"ArtCheckRule-CheckLength"` @@ -46,9 +46,9 @@ type ArtCheckRule struct { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func (self *ArtCheckRule) GetKey() core.PK { - return core.PK{self.PlantNr, self.AttriCode} + return core.PK{self.PlantNr, self.AttriCode, self.WorkLineId, self.SubObject} } diff --git a/services/base/ArtCheckRule.service.go b/services/base/ArtCheckRule.service.go index 0933829..69b0feb 100644 --- a/services/base/ArtCheckRule.service.go +++ b/services/base/ArtCheckRule.service.go @@ -17,7 +17,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ type ArtCheckRuleService interface { @@ -36,7 +36,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ InsertOne(*models.Usertab, *model.ArtCheckRule) error @@ -49,14 +49,18 @@ type ArtCheckRuleService interface { * * @Function Parameters : 主键 * + * @Function Parameters : 主键 + * + * @Function Parameters : 主键 + * * @Return Value : 执行时发生的错误 * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ - DeleteOne(*models.Usertab, int) error + DeleteOne(*models.Usertab, int, string, string) error /****************************************************************************** * * @Function Name : SelectOne @@ -66,16 +70,20 @@ type ArtCheckRuleService interface { * * @Function Parameters : 主键 * + * @Function Parameters : 主键 + * + * @Function Parameters : 主键 + * * @Return Value : 查找到的ArtCheckRule * * @Return Value : 执行时发生的错误 * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ - SelectOne(*models.Usertab, int) (*model.ArtCheckRule, error) + SelectOne(*models.Usertab, int, string, string) (*model.ArtCheckRule, error) /****************************************************************************** * * @Function Name : UpdateOne @@ -91,7 +99,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ UpdateOne(*models.Usertab, *model.ArtCheckRule) error @@ -110,7 +118,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Insert(*models.Usertab, *[]model.ArtCheckRule) error @@ -129,7 +137,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Delete(*models.Usertab, *[]model.ArtCheckRule) error @@ -150,7 +158,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Select(*models.Usertab, map[string]string) (interface{}, error) @@ -169,7 +177,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ Update(*models.Usertab, *[]model.ArtCheckRule) error @@ -186,7 +194,7 @@ type ArtCheckRuleService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func NewArtCheckRuleService() ArtCheckRuleService { diff --git a/services/base/implments/ArtCheckRule.service.impl.go b/services/base/implments/ArtCheckRule.service.impl.go index 5e4f27a..3454e66 100644 --- a/services/base/implments/ArtCheckRule.service.impl.go +++ b/services/base/implments/ArtCheckRule.service.impl.go @@ -17,15 +17,15 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ var DefaultConditionOfArtCheckRule = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.ArtCheckRule_AttriCode.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCode, grmi.Equal, true), + meta.ArtCheckRule_WorkLineId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_WorkLineId, grmi.Equal, true), + meta.ArtCheckRule_SubObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_SubObject, grmi.Equal, true), meta.ArtCheckRule_AttriCodeDesc.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCodeDesc, grmi.Equal, false), - meta.ArtCheckRule_WorkLineId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_WorkLineId, grmi.Equal, false), - meta.ArtCheckRule_SubObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_SubObject, grmi.Equal, false), meta.ArtCheckRule_CodeLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CodeLength, grmi.Equal, false), meta.ArtCheckRule_CheckStartPos.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckStartPos, grmi.Equal, false), meta.ArtCheckRule_CheckLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckLength, grmi.Equal, false), @@ -44,7 +44,7 @@ var DefaultConditionOfArtCheckRule = grmi.NewCondition( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ var DefaultConditionOfArtCheckRuleAndPaging = grmi.NewCondition( @@ -61,7 +61,7 @@ var DefaultConditionOfArtCheckRuleAndPaging = grmi.NewCondition( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ type ArtCheckRuleServiceImplement struct { @@ -78,7 +78,7 @@ type ArtCheckRuleServiceImplement struct { * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func NewArtCheckRuleServiceImplement() *ArtCheckRuleServiceImplement { @@ -98,7 +98,7 @@ func (impl *ArtCheckRuleServiceImplement) InsertOne(user *models.Usertab, entity session := engine.NewSession() defer session.Close() dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) - record, err := dao.SelectOne(entity.AttriCode) + record, err := dao.SelectOne(entity.AttriCode, entity.WorkLineId, entity.SubObject) if err != nil { return err } @@ -135,7 +135,7 @@ func (impl *ArtCheckRuleServiceImplement) InsertOne(user *models.Usertab, entity * @Reference LAPP_LF_MOM_BACKEND/services/base/ArtCheckRuleService.DeleteOne * ******************************************************************************/ -func (impl *ArtCheckRuleServiceImplement) DeleteOne(user *models.Usertab, attriCode int) error { +func (impl *ArtCheckRuleServiceImplement) DeleteOne(user *models.Usertab, attriCode int, workLineId string, subObject string) error { grmi.Log(user, "/services/base/implments/ArtCheckRule.service.impl.go", "DeleteOneArtCheckRule", "删除一个ArtCheckRule") @@ -143,14 +143,14 @@ func (impl *ArtCheckRuleServiceImplement) DeleteOne(user *models.Usertab, attriC session := engine.NewSession() defer session.Close() dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) - record, err := dao.SelectOne(attriCode) + record, err := dao.SelectOne(attriCode, workLineId, subObject) if err != nil { return err } if record == nil { return grmi.NewBusinessError("不存在指定记录!") } - err = dao.DeleteOne(attriCode) + err = dao.DeleteOne(attriCode, workLineId, subObject) if err != nil { return err } @@ -162,7 +162,7 @@ func (impl *ArtCheckRuleServiceImplement) DeleteOne(user *models.Usertab, attriC * @Reference LAPP_LF_MOM_BACKEND/services/base/ArtCheckRuleService.SelectOne * ******************************************************************************/ -func (impl *ArtCheckRuleServiceImplement) SelectOne(user *models.Usertab, attriCode int) (*model.ArtCheckRule, error) { +func (impl *ArtCheckRuleServiceImplement) SelectOne(user *models.Usertab, attriCode int, workLineId string, subObject string) (*model.ArtCheckRule, error) { grmi.Log(user, "/services/base/implments/ArtCheckRule.service.impl.go", "SelectOneArtCheckRule", "查询一个ArtCheckRule") @@ -170,7 +170,7 @@ func (impl *ArtCheckRuleServiceImplement) SelectOne(user *models.Usertab, attriC session := engine.NewSession() defer session.Close() dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) - result, err := dao.SelectOne(attriCode) + result, err := dao.SelectOne(attriCode, workLineId, subObject) if err != nil { return nil, err } @@ -190,7 +190,7 @@ func (impl *ArtCheckRuleServiceImplement) UpdateOne(user *models.Usertab, entity session := engine.NewSession() defer session.Close() dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) - record, err := dao.SelectOne(entity.AttriCode) + record, err := dao.SelectOne(entity.AttriCode, entity.WorkLineId, entity.SubObject) if err != nil { return err } @@ -237,7 +237,7 @@ func (impl *ArtCheckRuleServiceImplement) Insert(user *models.Usertab, entities dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) for _, entity := range *entities { - record, err := dao.SelectOne(entity.AttriCode) + record, err := dao.SelectOne(entity.AttriCode, entity.WorkLineId, entity.SubObject) if err != nil { return err } @@ -268,7 +268,7 @@ func (impl *ArtCheckRuleServiceImplement) Delete(user *models.Usertab, entities dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) for _, entity := range *entities { - record, err := dao.SelectOne(entity.AttriCode) + record, err := dao.SelectOne(entity.AttriCode, entity.WorkLineId, entity.SubObject) if err != nil { return err } @@ -332,7 +332,7 @@ func (impl *ArtCheckRuleServiceImplement) Update(user *models.Usertab, entities dao := dal.NewArtCheckRuleDAO(session, user.Pid, user.Userid) for _, entity := range *entities { - record, err := dao.SelectOne(entity.AttriCode) + record, err := dao.SelectOne(entity.AttriCode, entity.WorkLineId, entity.SubObject) if err != nil { return err } diff --git a/web/controllers/base/ArtCheckRule.rest.go b/web/controllers/base/ArtCheckRule.rest.go index 89cbfdb..c4547d8 100644 --- a/web/controllers/base/ArtCheckRule.rest.go +++ b/web/controllers/base/ArtCheckRule.rest.go @@ -28,7 +28,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterOneArtCheckRule(party router.Party, httpMethod string, path string, method func(*models.Usertab, *model.ArtCheckRule) error) { @@ -79,10 +79,10 @@ func RegisterOneArtCheckRule(party router.Party, httpMethod string, path string, * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ -func RegisterIDOfArtCheckRule(party router.Party, httpMethod string, path string, method func(*models.Usertab, int) error) { +func RegisterIDOfArtCheckRule(party router.Party, httpMethod string, path string, method func(*models.Usertab, int, string, string) error) { party.Handle(httpMethod, path, func(ctx iris.Context) { user, ok := jwts.ParseToken(ctx) @@ -97,8 +97,10 @@ func RegisterIDOfArtCheckRule(party router.Party, httpMethod string, path string supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) return } + workLineId := ctx.Params().GetString("workLineId") + subObject := ctx.Params().GetString("subObject") - err = method(user, attriCode) + err = method(user, attriCode, workLineId, subObject) if err != nil { supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) return @@ -122,7 +124,7 @@ func RegisterIDOfArtCheckRule(party router.Party, httpMethod string, path string * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterInsertOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, *model.ArtCheckRule) error) { @@ -145,12 +147,12 @@ func RegisterInsertOneArtCheckRule(party router.Party, path string, method func( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ -func RegisterDeleteOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, int) error) { +func RegisterDeleteOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, int, string, string) error) { - RegisterIDOfArtCheckRule(party, "DELETE", path+"/{attriCode:int}", method) + RegisterIDOfArtCheckRule(party, "DELETE", path+"/{attriCode:int}/{workLineId:string}/{subObject:string}", method) } /****************************************************************************** @@ -168,12 +170,12 @@ func RegisterDeleteOneArtCheckRule(party router.Party, path string, method func( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ -func RegisterSelectOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, int) (*model.ArtCheckRule, error)) { +func RegisterSelectOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, int, string, string) (*model.ArtCheckRule, error)) { - party.Get(path+"/{attriCode:int}", func(ctx iris.Context) { + party.Get(path+"/{attriCode:int}/{workLineId:string}/{subObject:string}", func(ctx iris.Context) { user, ok := jwts.ParseToken(ctx) if !ok { supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) @@ -185,7 +187,9 @@ func RegisterSelectOneArtCheckRule(party router.Party, path string, method func( supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) return } - result, err := method(user, attriCode) + workLineId := ctx.Params().GetString("workLineId") + subObject := ctx.Params().GetString("subObject") + result, err := method(user, attriCode, workLineId, subObject) if err != nil { supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil) return @@ -213,7 +217,7 @@ func RegisterSelectOneArtCheckRule(party router.Party, path string, method func( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterUpdateOneArtCheckRule(party router.Party, path string, method func(*models.Usertab, *model.ArtCheckRule) error) { @@ -238,7 +242,7 @@ func RegisterUpdateOneArtCheckRule(party router.Party, path string, method func( * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterMultiArtCheckRule(party router.Party, httpMethod string, path string, method func(*models.Usertab, *[]model.ArtCheckRule) error) { @@ -281,7 +285,7 @@ func RegisterMultiArtCheckRule(party router.Party, httpMethod string, path strin * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterInsertArtCheckRule(party router.Party, path string, method func(*models.Usertab, *[]model.ArtCheckRule) error) { @@ -304,7 +308,7 @@ func RegisterInsertArtCheckRule(party router.Party, path string, method func(*mo * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterDeleteArtCheckRule(party router.Party, path string, method func(*models.Usertab, *[]model.ArtCheckRule) error) { @@ -327,7 +331,7 @@ func RegisterDeleteArtCheckRule(party router.Party, path string, method func(*mo * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterSelectArtCheckRule(party router.Party, path string, method func(*models.Usertab, map[string]string) (interface{}, error)) { @@ -363,7 +367,7 @@ func RegisterSelectArtCheckRule(party router.Party, path string, method func(*mo * * @Author : 代码生成器创建 * - * @Date : 2021-07-14 14:51:48 + * @Date : 2021-07-26 15:47:07 * ******************************************************************************/ func RegisterUpdateArtCheckRule(party router.Party, path string, method func(*models.Usertab, *[]model.ArtCheckRule) error) {