init

pkg/biz/datamodel/biz_object_oam_params.go

@@ -8,7 +8,7 @@ type BizObjectOAMParams struct {
 	OamId           int64     `json:"oamId"            xorm:"'oam_id'           bigint      pk comment('OAM ID')           "`
 	ParamId         int64     `json:"paramId"          xorm:"'param_id'         bigint      pk comment('Param ID')        "`
 	LogicalOperator string    `json:"logicalOperator"  xorm:"'logical_operator' varchar(15)    comment('Logical Operator') "`
-	ParamName       string    `json:"paramName"        xorm:"'param_name'       varchar(127)   comment('Param Name')      "`
+	ParamTitle      string    `json:"paramTitle"       xorm:"'param_title'      varchar(127)   comment('Param Title')      "`
 	CompareOperator string    `json:"compareOperator"  xorm:"'compare_operator' varchar(15)    comment('Compare Operator') "`
 	ParamType       int64     `json:"paramType"        xorm:"'param_type'       bigint         comment('Param Type')      "`
 	ParamValue      string    `json:"paramValue"       xorm:"'param_value'      varchar(127)   comment('Param Value')     "`

pkg/biz/repository/biz_object_oam_mapping_repo.go

@@ -19,20 +19,20 @@ func NewBizObjectOAMMappingRepo(engine *xorm.Engine) *BizObjectOAMMappingRepo {
 }
 
 func (d *BizObjectOAMMappingRepo) GetList(m map[string]interface{}) ([]viewmodel.BizObjectOAMMappingInfo, error) {
-	sqlSelect := ` SELECT    A.* ,
-                              B.object_title,
-                              B.object_code,
-                              C.oam_title,
-                              C.oam_code,
-                              E.model_title  AS mapping_model_title,
-                              F.object_title AS mapping_object_title,
-                              F.object_code  AS mapping_object_code    `
-	sqlFrom := ` FROM      biz_object_oam_mapping AS A
-                    LEFT JOIN biz_object             AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT JOIN biz_object_oam         AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
-                    LEFT JOIN ds_model               AS E ON (A.mapping_model_id = E.model_id)
-                    LEFT JOIN ds_object              AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
-	sqlWhere := ` WHERE  1=1   `
+	sqlSelect 	:= ` 	SELECT    	A.* ,
+                             		B.object_title,
+                              		B.object_code,
+                              		C.oam_title,
+                              		C.oam_code,
+                              		E.model_title  AS mapping_model_title,
+                              		F.object_title AS mapping_object_title,
+                              		F.object_code  AS mapping_object_code    `
+	sqlFrom 	:= ` 	FROM      	biz_object_oam_mapping AS A
+                    	LEFT JOIN 	biz_object             AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
+                    	LEFT JOIN 	biz_object_oam         AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
+                    	LEFT JOIN 	ds_model               AS E ON (A.mapping_model_id = E.model_id)
+                    	LEFT JOIN 	ds_object              AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
+	sqlWhere 	:= ` 	WHERE  1 = 1   `
 	if bizId, ok := m["bizId"]; ok {
 		sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
 	}
@@ -54,20 +54,20 @@ func (d *BizObjectOAMMappingRepo) GetList(m map[string]interface{}) ([]viewmodel
 }
 
 func (d *BizObjectOAMMappingRepo) GetById(bizId, objectId, oamId, orId int64) (*viewmodel.BizObjectOAMMappingInfo, error) {
-	sqlSelect := ` SELECT    A.* ,
-                              B.object_title,
-                              B.object_code,
-                              C.oam_title,
-                              C.oam_code,
-                              E.model_title  AS mapping_model_title,
-                              F.object_title AS mapping_object_title,
-                              F.object_code  AS mapping_object_code    `
-	sqlFrom := ` FROM      biz_object_oam_mapping AS A
-                    LEFT JOIN biz_object             AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT JOIN biz_object_oam         AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
-                    LEFT JOIN ds_model               AS E ON (A.mapping_model_id = E.model_id)
-                    LEFT JOIN ds_object              AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
-	sqlWhere := ` WHERE 1 = 1    `
+	sqlSelect 	:= ` 	SELECT    	A.* ,
+                              		B.object_title,
+                              		B.object_code,
+                              		C.oam_title,
+                             		C.oam_code,
+                              		E.model_title  AS mapping_model_title,
+                              		F.object_title AS mapping_object_title,
+                              		F.object_code  AS mapping_object_code    `
+	sqlFrom 	:= ` 	FROM      	biz_object_oam_mapping AS A
+                    	LEFT JOIN 	biz_object             AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
+                    	LEFT JOIN 	biz_object_oam         AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
+                    	LEFT JOIN 	ds_model               AS E ON (A.mapping_model_id = E.model_id)
+                    	LEFT JOIN 	ds_object              AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
+	sqlWhere 	:= ` WHERE 1 = 1    `
 	sqlWhere += fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
 	sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
 	sqlWhere += fmt.Sprintf(" AND A.oam_id    = %d ", oamId)

pkg/biz/repository/biz_object_oam_params_repo.go

@@ -19,15 +19,15 @@ func NewBizObjectOAMParamsRepo(engine *xorm.Engine) *BizObjectOAMParamsRepo {
 }
 
 func (d *BizObjectOAMParamsRepo) GetList(m map[string]interface{}) ([]viewmodel.BizObjectOAMParamsInfo, error) {
-	sqlSelect := ` SELECT    A.* ,
-                              B.object_title,
-                              B.object_code,
-                              C.oam_title,
-                              C.oam_code   `
-	sqlFrom := ` FROM      biz_object_oam_params AS A
-                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
-	sqlWhere := ` WHERE  A.deleted_flag = 0    `
+	sqlSelect 	:= ` SELECT    A.* ,
+                               B.object_title,
+                               B.object_code,
+                               C.oam_title,
+                               C.oam_code   `
+	sqlFrom 	:= ` FROM      biz_object_oam_params AS A
+                     LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
+                     LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
+	sqlWhere 	:= ` WHERE  A.deleted_flag = 0    `
 	if bizId, ok := m["bizId"]; ok {
 		sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
 	}
@@ -49,19 +49,19 @@ func (d *BizObjectOAMParamsRepo) GetList(m map[string]interface{}) ([]viewmodel.
 }
 
 func (d *BizObjectOAMParamsRepo) GetById(bizId, objectId, oamId, paramId int64) (*viewmodel.BizObjectOAMParamsInfo, error) {
-	sqlSelect := ` SELECT    A.* ,
-                              B.object_title,
-                              B.object_code,
-                              C.oam_title,
-                              C.oam_code   `
-	sqlFrom := ` FROM      biz_object_oam_params AS A
-                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
-	sqlWhere := ` WHERE A.deleted_flag = 0    `
-	sqlWhere += fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
-	sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
-	sqlWhere += fmt.Sprintf(" AND A.oam_id    = %d ", oamId)
-	sqlWhere += fmt.Sprintf(" AND A.param_id  = %d ", paramId)
+	sqlSelect 	:= ` 	SELECT    A.* ,
+                              	  B.object_title,
+                              	  B.object_code,
+                              	  C.oam_title,
+                              	  C.oam_code   `
+	sqlFrom 	:= ` 	FROM      biz_object_oam_params AS A
+                    	LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
+                    	LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
+	sqlWhere 	:= ` WHERE A.deleted_flag = 0    `
+	sqlWhere 	+= fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
+	sqlWhere 	+= fmt.Sprintf(" AND A.object_id = %d ", objectId)
+	sqlWhere 	+= fmt.Sprintf(" AND A.oam_id    = %d ", oamId)
+	sqlWhere 	+= fmt.Sprintf(" AND A.param_id  = %d ", paramId)
 
 	data := &viewmodel.BizObjectOAMParamsInfo{}
 	has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
@@ -73,15 +73,15 @@ func (d *BizObjectOAMParamsRepo) GetById(bizId, objectId, oamId, paramId int64)
 }
 
 func (d *BizObjectOAMParamsRepo) GetListById(bizId, objectId, oamId int64) ([]viewmodel.BizObjectOAMParamsInfo, error) {
-	sqlSelect := ` SELECT    A.* ,
-                              B.object_title,
-                              B.object_code,
-                              C.oam_title,
-                              C.oam_code   `
-	sqlFrom := ` FROM      biz_object_oam_params AS A
-                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
-	sqlWhere := ` WHERE A.deleted_flag = 0    `
+	sqlSelect 	:= ` 	SELECT    A.* ,
+                              	  B.object_title,
+                              	  B.object_code,
+                              	  C.oam_title,
+                              	  C.oam_code   `
+	sqlFrom 	:= ` 	FROM      biz_object_oam_params AS A
+                    	LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
+                    	LEFT JOIN biz_object_oam        AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
+	sqlWhere 	:= ` 	WHERE A.deleted_flag = 0    `
 	sqlWhere += fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
 	sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
 	sqlWhere += fmt.Sprintf(" AND A.oam_id    = %d ", oamId)

pkg/biz/repository/biz_object_oam_repo.go

@@ -19,14 +19,13 @@ func NewBizObjectOAMRepo(engine *xorm.Engine) *BizObjectOAMRepo {
 }
 
 func (d *BizObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodel.BizObjectOAMInfo, error) {
-	sqlSelect := ` SELECT A.*,
-                           B.object_title,
-                           B.object_code,
-                           B.object_type `
-	sqlFrom := ` FROM      biz_object_oam AS A
-                    LEFT JOIN biz_object     AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id) `
-
-	sqlWhere := ` WHERE A.deleted_flag = 0    `
+	sqlSelect 	:= ` 	SELECT     	A.*,
+                           			B.object_title,
+                           			B.object_code,
+                           			B.object_type `
+	sqlFrom 	:= ` 	FROM    	biz_object_oam AS A
+                    	LEFT JOIN 	biz_object     AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id) `
+	sqlWhere 	:= ` 	WHERE A.deleted_flag = 0    `
 	if bizId, ok := m["bizId"]; ok {
 		sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
 	}

pkg/biz/repository/biz_object_oam_rule_repo.go

@@ -19,7 +19,7 @@ func NewBizObjectOAMRuleRepo(engine *xorm.Engine) *BizObjectOAMRuleRepo {
 }
 
 func (d *BizObjectOAMRuleRepo) GetList(m map[string]interface{}) ([]viewmodel.BizObjectOAMRuleInfo, error) {
-	sqlSelect := ` SELECT A.*,
+	sqlSelect := ` SELECT  A.*,
                            B.object_title,
                            B.object_code,
                            B.object_type,

pkg/biz/viewmodel/biz_object_oam_params_info.go

@@ -11,7 +11,7 @@ type BizObjectOAMParamsInfo struct {
 	OamCode         string `json:"oamCode"          xorm:"'oam_code'         varchar(127)   comment('OAM Code')        "`
 	ParamId         int64  `json:"paramId"          xorm:"'param_id'         bigint      pk comment('Param ID')        "`
 	LogicalOperator string `json:"logicalOperator"  xorm:"'logical_operator' varchar(15)    comment('Logical Operator') "`
-	ParamName       string `json:"paramName"        xorm:"'param_name'       varchar(127)   comment('Param Name')       "`
+	ParamTitle      string `json:"paramTitle"       xorm:"'param_title'      varchar(127)   comment('Param Title')      "`
 	CompareOperator string `json:"compareOperator"  xorm:"'compare_operator' varchar(15)    comment('Compare Operator') "`
 	ParamType       int64  `json:"paramType"        xorm:"'param_type'       bigint         comment('Param Type')       "`
 	ParamValue      string `json:"paramValue"       xorm:"'param_value'      varchar(127)   comment('Param Value')      "`