评估规则 优化

角色 优化

@@ -157,22 +157,22 @@ func (rs *EvaluationRuleService) Remove(in *command.DeleteRuleCommand) (interfac
 	return rule, nil
 }
 
-func (rs *EvaluationRuleService) List(in *command.QueryRuleCommand) (interface{}, error) {
-	transactionContext, err := factory.StartTransaction()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		transactionContext.RollbackTransaction()
-	}()
-	ruleRepository := factory.CreateEvaluationRuleRepository(map[string]interface{}{"transactionContext": transactionContext})
-
-	total, rules, err := ruleRepository.Find(tool_funs.SimpleStructToMap(in))
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	return tool_funs.SimpleWrapGridMap(total, rules), nil
-}
+//func (rs *EvaluationRuleService) List(in *command.QueryRuleCommand) (interface{}, error) {
+//	transactionContext, err := factory.StartTransaction()
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//	ruleRepository := factory.CreateEvaluationRuleRepository(map[string]interface{}{"transactionContext": transactionContext})
+//
+//	total, rules, err := ruleRepository.Find(tool_funs.SimpleStructToMap(in))
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	return tool_funs.SimpleWrapGridMap(total, rules), nil
+//}
 
 func (rs *EvaluationRuleService) ListRelCreator(in *command.QueryRuleCommand) (interface{}, error) {
 	transactionContext, err := factory.StartTransaction()

@@ -6,7 +6,6 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role/adapter"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role/command"
-	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 )
 
 type RoleService struct {
@@ -17,122 +16,122 @@ func NewRoleService() *RoleService {
 	return newRoleService
 }
 
-// Create 创建
-func (rs *RoleService) Create(in *command.CreateRoleCommand) (interface{}, error) {
-	transactionContext, err := factory.ValidateStartTransaction(in)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		transactionContext.RollbackTransaction()
-	}()
-	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
-
-	// 检测名称重复
-	count, err := roleRepository.Count(map[string]interface{}{"name": in.Name, "companyId": in.CompanyId})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	if count > 0 {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, "角色名称已存在")
-	}
-	newRole := &domain.Role{
-		Id:          0,
-		Name:        in.Name,
-		Type:        domain.RoleTypeCommon,
-		Description: in.Description,
-		CompanyId:   in.CompanyId,
-	}
-	role, err := roleRepository.Insert(newRole)
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	if err := transactionContext.CommitTransaction(); err != nil {
-		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-	}
-	return role, nil
-
-}
-
-func (rs *RoleService) Update(in *command.UpdateRoleCommand) (interface{}, error) {
-	transactionContext, err := factory.ValidateStartTransaction(in)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		transactionContext.RollbackTransaction()
-	}()
-
-	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
-
-	// 检测名称重复（排除自己）
-	count, err := roleRepository.Count(map[string]interface{}{"name": in.Name, "companyId": in.CompanyId, "notId": in.Id})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	if count > 0 {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, "角色名称已存在")
-	}
-
-	role, err := roleRepository.FindOne(map[string]interface{}{"id": in.Id})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-
-	role.Name = in.Name
-	role.Description = in.Description
-
-	role, err = roleRepository.Insert(role)
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	if err := transactionContext.CommitTransaction(); err != nil {
-		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-	}
-	return role, nil
-}
-
-func (rs *RoleService) Remove(in *command.DeleteRoleCommand) (interface{}, error) {
-	transactionContext, err := factory.ValidateStartTransaction(in)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		transactionContext.RollbackTransaction()
-	}()
-
-	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
-	roleUserRepository := factory.CreateRoleUserRepository(map[string]interface{}{"transactionContext": transactionContext})
-
-	role, err := roleRepository.FindOne(map[string]interface{}{"id": in.Id})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	if _, err := roleRepository.Remove(role); err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-
-	// 获取角色所有关联的用户，并删除
-	_, roleUsers, err := roleUserRepository.Find(map[string]interface{}{"roleId": in.Id, "companyId": in.CompanyId})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-	ids := make([]int64, 0)
-	for i := range roleUsers {
-		ids = append(ids, roleUsers[i].Id)
-	}
-	if len(ids) > 0 {
-		err := roleUserRepository.BatchDeleteById(ids)
-		if err != nil {
-			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-		}
-	}
-
-	if err := transactionContext.CommitTransaction(); err != nil {
-		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-	}
-	return role, nil
-}
+//// Create 创建
+//func (rs *RoleService) Create(in *command.CreateRoleCommand) (interface{}, error) {
+//	transactionContext, err := factory.ValidateStartTransaction(in)
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
+//
+//	// 检测名称重复
+//	count, err := roleRepository.Count(map[string]interface{}{"name": in.Name, "companyId": in.CompanyId})
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	if count > 0 {
+//		return nil, application.ThrowError(application.BUSINESS_ERROR, "角色名称已存在")
+//	}
+//	newRole := &domain.Role{
+//		Id:          0,
+//		Name:        in.Name,
+//		Type:        domain.RoleTypeCommon,
+//		Description: in.Description,
+//		CompanyId:   in.CompanyId,
+//	}
+//	role, err := roleRepository.Insert(newRole)
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	if err := transactionContext.CommitTransaction(); err != nil {
+//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+//	}
+//	return role, nil
+//
+//}
+//
+//func (rs *RoleService) Update(in *command.UpdateRoleCommand) (interface{}, error) {
+//	transactionContext, err := factory.ValidateStartTransaction(in)
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//
+//	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
+//
+//	// 检测名称重复（排除自己）
+//	count, err := roleRepository.Count(map[string]interface{}{"name": in.Name, "companyId": in.CompanyId, "notId": in.Id})
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	if count > 0 {
+//		return nil, application.ThrowError(application.BUSINESS_ERROR, "角色名称已存在")
+//	}
+//
+//	role, err := roleRepository.FindOne(map[string]interface{}{"id": in.Id})
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//
+//	role.Name = in.Name
+//	role.Description = in.Description
+//
+//	role, err = roleRepository.Insert(role)
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	if err := transactionContext.CommitTransaction(); err != nil {
+//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+//	}
+//	return role, nil
+//}
+//
+//func (rs *RoleService) Remove(in *command.DeleteRoleCommand) (interface{}, error) {
+//	transactionContext, err := factory.ValidateStartTransaction(in)
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//
+//	roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
+//	roleUserRepository := factory.CreateRoleUserRepository(map[string]interface{}{"transactionContext": transactionContext})
+//
+//	role, err := roleRepository.FindOne(map[string]interface{}{"id": in.Id})
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	if _, err := roleRepository.Remove(role); err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//
+//	// 获取角色所有关联的用户，并删除
+//	_, roleUsers, err := roleUserRepository.Find(map[string]interface{}{"roleId": in.Id, "companyId": in.CompanyId})
+//	if err != nil {
+//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	ids := make([]int64, 0)
+//	for i := range roleUsers {
+//		ids = append(ids, roleUsers[i].Id)
+//	}
+//	if len(ids) > 0 {
+//		err := roleUserRepository.BatchDeleteById(ids)
+//		if err != nil {
+//			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+//		}
+//	}
+//
+//	if err := transactionContext.CommitTransaction(); err != nil {
+//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+//	}
+//	return role, nil
+//}
 
 func (rs *RoleService) ListForUser(in *command.QueryRoleUserCommand) (interface{}, error) {
 	transactionContext, err := factory.StartTransaction()

@@ -57,7 +57,22 @@ func (controller *RuleController) RemoveRule() {
 	}
 }
 
-func (controller *RuleController) ListRule() {
+//func (controller *RuleController) ListRule() {
+//	ruService := service.NewEvaluationRuleService()
+//	in := &command.QueryRuleCommand{}
+//	in.Type = -1
+//	if err := controller.Unmarshal(in); err != nil {
+//		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+//	} else {
+//		if len(in.NameOrRemark) > 0 {
+//			in.NameOrRemark = "%" + in.NameOrRemark + "%"
+//		}
+//		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
+//		controller.Response(ruService.List(in))
+//	}
+//}
+
+func (controller *RuleController) ListRuleRelCreator() {
 	ruService := service.NewEvaluationRuleService()
 	in := &command.QueryRuleCommand{}
 	in.Type = -1
@@ -68,17 +83,6 @@ func (controller *RuleController) ListRule() {
 			in.NameOrRemark = "%" + in.NameOrRemark + "%"
 		}
 		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
-		controller.Response(ruService.List(in))
-	}
-}
-
-func (controller *RuleController) ListRuleRelCreator() {
-	ruService := service.NewEvaluationRuleService()
-	in := &command.QueryRuleCommand{}
-	if err := controller.Unmarshal(in); err != nil {
-		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
-	} else {
-		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
 		controller.Response(ruService.ListRelCreator(in))
 	}
 }

@@ -12,38 +12,38 @@ type RoleController struct {
 	beego.BaseController
 }
 
-func (controller *RoleController) CreateRole() {
-	ruService := service.NewRoleService()
-	in := &command.CreateRoleCommand{}
-	if err := controller.Unmarshal(in); err != nil {
-		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
-	} else {
-		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
-		controller.Response(ruService.Create(in))
-	}
-}
-
-func (controller *RoleController) UpdateRole() {
-	ruService := service.NewRoleService()
-	in := &command.UpdateRoleCommand{}
-	if err := controller.Unmarshal(in); err != nil {
-		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
-	} else {
-		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
-		controller.Response(ruService.Update(in))
-	}
-}
-
-func (controller *RoleController) RemoveRole() {
-	ruService := service.NewRoleService()
-	in := &command.DeleteRoleCommand{}
-	if err := controller.Unmarshal(in); err != nil {
-		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
-	} else {
-		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
-		controller.Response(ruService.Remove(in))
-	}
-}
+//func (controller *RoleController) CreateRole() {
+//	ruService := service.NewRoleService()
+//	in := &command.CreateRoleCommand{}
+//	if err := controller.Unmarshal(in); err != nil {
+//		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+//	} else {
+//		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
+//		controller.Response(ruService.Create(in))
+//	}
+//}
+//
+//func (controller *RoleController) UpdateRole() {
+//	ruService := service.NewRoleService()
+//	in := &command.UpdateRoleCommand{}
+//	if err := controller.Unmarshal(in); err != nil {
+//		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+//	} else {
+//		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
+//		controller.Response(ruService.Update(in))
+//	}
+//}
+//
+//func (controller *RoleController) RemoveRole() {
+//	ruService := service.NewRoleService()
+//	in := &command.DeleteRoleCommand{}
+//	if err := controller.Unmarshal(in); err != nil {
+//		controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+//	} else {
+//		in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
+//		controller.Response(ruService.Remove(in))
+//	}
+//}
 
 func (controller *RoleController) ListForUserRole() {
 	ruService := service.NewRoleService()

@@ -14,7 +14,7 @@ func init() {
 		web.NSRouter("/", &controllers.RuleController{}, "Put:UpdateRule"),
 		web.NSRouter("/", &controllers.RuleController{}, "Delete:RemoveRule"),
 		web.NSRouter("/:Id", &controllers.RuleController{}, "Get:GetRule"),
-		web.NSRouter("/list", &controllers.RuleController{}, "Post:ListRule"),
+		web.NSRouter("/list", &controllers.RuleController{}, "Post:ListRuleRelCreator"),
 	)
 	web.AddNamespace(ns)
 }