Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/opp into dev

 [dev]
 [dev]
 #数据库相关
 #数据库相关
 mysql_user = "${MYSQL_USER||root}"
 mysql_user = "${MYSQL_USER||root}"
-mysql_password = "${MYSQL_PASSWORD||123456}"
-mysql_host = "${MYSQL_HOST||192.168.100.102}"
+mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
+mysql_host = "${MYSQL_HOST||115.29.205.99}"
 mysql_port = "${MYSQL_PORT||3306}"
 mysql_port = "${MYSQL_PORT||3306}"
 mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
 mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
 
 

+package v1
+
+import (
+	"encoding/json"
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
+	"opp/controllers"
+	"opp/protocol"
+	"opp/services/commend"
+)
+
+type CommendController struct {
+	controllers.BaseController
+}
+
+//Commend
+// @router /company [post]
+func (this *CommendController) Company() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		this.Resp(msg)
+	}()
+	var request *protocol.CommendRequest
+	if err := json.Unmarshal(this.ByteBody, &request); err != nil {
+		log.Error(err)
+		msg = protocol.BadRequestParam(1)
+		return
+	}
+	if b, m := this.Valid(request); !b {
+		msg = m
+		return
+	}
+	header := controllers.GetRequestHeader(this.Ctx)
+	msg = protocol.NewReturnResponse(commend.Commend(header, request))
+}

@@ -7,6 +7,7 @@ require (
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/gorilla/websocket v1.4.1
 	github.com/gorilla/websocket v1.4.1
 	github.com/prometheus/client_golang v1.1.0
 	github.com/prometheus/client_golang v1.1.0
+	github.com/prometheus/common v0.6.0
 	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	gitlab.fjmaimaimai.com/mmm-go/gocomm v0.0.1
 	gitlab.fjmaimaimai.com/mmm-go/gocomm v0.0.1
 	google.golang.org/appengine v1.6.2 // indirect
 	google.golang.org/appengine v1.6.2 // indirect

+package repository
+
+import "opp/models"
+
+type ICommendRepository interface {
+	GetCommends(companyId int, llastId int, pageSize int) (v []*models.Commend, total int, err error)
+}
+
+var _ ICommendRepository = (*CommendRepository)(nil)
+
+type CommendRepository struct{}
+
+func (r *CommendRepository) GetCommends(companyId int, lastId int, pageSize int) (v []*models.Commend, total int, err error) {
+	return models.GetCommends(companyId, lastId, pageSize)
+}

+package repository
+
+import "opp/models"
+
+type ICompanyRepository interface {
+	GetCompanyById(companyId int64) (v *models.Company, err error)
+}
+
+var _ ICompanyRepository = (*CompanyRepository)(nil)
+
+type CompanyRepository struct{}
+
+func (r *CompanyRepository) GetCompanyById(companyId int64) (v *models.Company, err error) {
+	return models.GetCompanyById(companyId)
+}

+package repository
+
+import "opp/models"
+
+type IDepartmentRepository interface {
+	GetDepartmentById(companyId int) (v *models.Department, err error)
+}
+
+var _ IDepartmentRepository = (*DepartmentRepository)(nil)
+
+type DepartmentRepository struct{}
+
+func (r *DepartmentRepository) GetDepartmentById(id int) (v *models.Department, err error) {
+	return models.GetDepartmentById(id)
+}

+package repository
+
+import "opp/models"
+
+type IPositionRepository interface {
+	GetPositionById(companyId int) (v *models.Position, err error)
+}
+
+var _ IPositionRepository = (*PositionRepository)(nil)
+
+type PositionRepository struct{}
+
+func (r *PositionRepository) GetPositionById(id int) (v *models.Position, err error) {
+	return models.GetPositionById(id)
+}

@@ -4,9 +4,13 @@ import "sync"
 
 
 //全局
 //全局
 var (
 var (
-	once     sync.Once
-	User     IUserRepository
-	UserAuth IUserAuthRepository
+	once       sync.Once
+	User       IUserRepository
+	UserAuth   IUserAuthRepository
+	Commend    ICommendRepository
+	Company    ICompanyRepository
+	Department IDepartmentRepository
+	Position   IPositionRepository
 )
 )
 
 
 func init() {
 func init() {
@@ -16,6 +20,10 @@ func init() {
 func InitRepository() {
 func InitRepository() {
 	User = &UserRepository{}
 	User = &UserRepository{}
 	UserAuth = &UserAuthRepository{}
 	UserAuth = &UserAuthRepository{}
+	Commend = &CommendRepository{}
+	Company = &CompanyRepository{}
+	Department = &DepartmentRepository{}
+	Position = &PositionRepository{}
 }
 }
 
 
 func InitRepositoryMock() {
 func InitRepositoryMock() {

+package models
+
+import (
+	"errors"
+	"fmt"
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego/orm"
+)
+
+type Commend struct {
+	Id           int64       `orm:"column(id);auto" description:"表彰编号"`
+	Content      string    `orm:"column(content);size(255)" description:"表彰内容"`
+	CommendAt    time.Time `orm:"column(commend_at);type(timestamp)" description:"表彰时间"`
+	UserId       int64    `orm:"column(user_id)" description:"表user.id 表彰用户id"`
+	CompanyId    int64     `orm:"column(company_id)" description:"表company.id 公司id"`
+	CreateAt     time.Time `orm:"column(create_at);type(timestamp);auto_now_add" description:"创建时间"`
+	EnableStatus int8      `orm:"column(enable_status)" description:"状态 1可见 2不可见"`
+}
+
+func (t *Commend) TableName() string {
+	return "commend"
+}
+
+func init() {
+	orm.RegisterModel(new(Commend))
+}
+
+// AddCommend insert a new Commend into database and returns
+// last inserted Id on success.
+func AddCommend(m *Commend) (id int64, err error) {
+	o := orm.NewOrm()
+	id, err = o.Insert(m)
+	return
+}
+
+// GetCommendById retrieves Commend by Id. Returns error if
+// Id doesn't exist
+func GetCommendById(id int64) (v *Commend, err error) {
+	o := orm.NewOrm()
+	v = &Commend{Id: id}
+	if err = o.Read(v); err == nil {
+		return v, nil
+	}
+	return nil, err
+}
+
+// GetAllCommend retrieves all Commend matches certain condition. Returns empty list if
+// no records exist
+func GetAllCommend(query map[string]string, fields []string, sortby []string, order []string,
+	offset int64, limit int64) (ml []interface{}, err error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(Commend))
+	// query k=v
+	for k, v := range query {
+		// rewrite dot-notation to Object__Attribute
+		k = strings.Replace(k, ".", "__", -1)
+		if strings.Contains(k, "isnull") {
+			qs = qs.Filter(k, (v == "true" || v == "1"))
+		} else {
+			qs = qs.Filter(k, v)
+		}
+	}
+	// order by:
+	var sortFields []string
+	if len(sortby) != 0 {
+		if len(sortby) == len(order) {
+			// 1) for each sort field, there is an associated order
+			for i, v := range sortby {
+				orderby := ""
+				if order[i] == "desc" {
+					orderby = "-" + v
+				} else if order[i] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+			qs = qs.OrderBy(sortFields...)
+		} else if len(sortby) != len(order) && len(order) == 1 {
+			// 2) there is exactly one order, all the sorted fields will be sorted by this order
+			for _, v := range sortby {
+				orderby := ""
+				if order[0] == "desc" {
+					orderby = "-" + v
+				} else if order[0] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+		} else if len(sortby) != len(order) && len(order) != 1 {
+			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
+		}
+	} else {
+		if len(order) != 0 {
+			return nil, errors.New("Error: unused 'order' fields")
+		}
+	}
+
+	var l []Commend
+	qs = qs.OrderBy(sortFields...)
+	if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
+		if len(fields) == 0 {
+			for _, v := range l {
+				ml = append(ml, v)
+			}
+		} else {
+			// trim unused fields
+			for _, v := range l {
+				m := make(map[string]interface{})
+				val := reflect.ValueOf(v)
+				for _, fname := range fields {
+					m[fname] = val.FieldByName(fname).Interface()
+				}
+				ml = append(ml, m)
+			}
+		}
+		return ml, nil
+	}
+	return nil, err
+}
+
+// UpdateCommend updates Commend by Id and returns error if
+// the record to be updated doesn't exist
+func UpdateCommendById(m *Commend) (err error) {
+	o := orm.NewOrm()
+	v := Commend{Id: m.Id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Update(m); err == nil {
+			fmt.Println("Number of records updated in database:", num)
+		}
+	}
+	return
+}
+
+// DeleteCommend deletes Commend by Id and returns error if
+// the record to be deleted doesn't exist
+func DeleteCommend(id int64) (err error) {
+	o := orm.NewOrm()
+	v := Commend{Id: id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Delete(&Commend{Id: id}); err == nil {
+			fmt.Println("Number of records deleted in database:", num)
+		}
+	}
+	return
+}
+
+func GetCommends(companyId int,lastId int,pageSize int)(v []*Commend,total int, err error) {
+	sql :=mybeego.NewSqlExutor().Table("commend").Order("create_at desc")
+	sql.Where(fmt.Sprintf("company_id=%d",companyId))
+	if pageSize>0{
+		sql.Limit(0,pageSize)
+	}
+	if lastId>0{
+		sql.Where(fmt.Sprintf("id>%d",lastId))
+	}
+	if total, err = sql.Querys(&v); err == nil {
+		return
+	}
+	return
+}

+package models
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego/orm"
+)
+
+type Company struct {
+	Id       int64       `orm:"column(id);auto"`
+	Name     string    `orm:"column(name);size(40)"`
+	UserId   int64       `orm:"column(user_id)"`
+	CreateAt time.Time `orm:"column(create_at);type(timestamp);auto_now"`
+	UpdateAt time.Time `orm:"column(update_at);type(timestamp)"`
+	DeleteAt time.Time `orm:"column(delete_at);type(timestamp)"`
+	Logo     string    `orm:"column(logo);size(255)"`
+}
+
+func (t *Company) TableName() string {
+	return "company"
+}
+
+func init() {
+	orm.RegisterModel(new(Company))
+}
+
+// AddCompany insert a new Company into database and returns
+// last inserted Id on success.
+func AddCompany(m *Company) (id int64, err error) {
+	o := orm.NewOrm()
+	id, err = o.Insert(m)
+	return
+}
+
+// GetCompanyById retrieves Company by Id. Returns error if
+// Id doesn't exist
+func GetCompanyById(id int64) (v *Company, err error) {
+	o := orm.NewOrm()
+	v = &Company{Id: id}
+	if err = o.Read(v); err == nil {
+		return v, nil
+	}
+	return nil, err
+}
+
+// GetAllCompany retrieves all Company matches certain condition. Returns empty list if
+// no records exist
+func GetAllCompany(query map[string]string, fields []string, sortby []string, order []string,
+	offset int64, limit int64) (ml []interface{}, err error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(Company))
+	// query k=v
+	for k, v := range query {
+		// rewrite dot-notation to Object__Attribute
+		k = strings.Replace(k, ".", "__", -1)
+		if strings.Contains(k, "isnull") {
+			qs = qs.Filter(k, (v == "true" || v == "1"))
+		} else {
+			qs = qs.Filter(k, v)
+		}
+	}
+	// order by:
+	var sortFields []string
+	if len(sortby) != 0 {
+		if len(sortby) == len(order) {
+			// 1) for each sort field, there is an associated order
+			for i, v := range sortby {
+				orderby := ""
+				if order[i] == "desc" {
+					orderby = "-" + v
+				} else if order[i] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+			qs = qs.OrderBy(sortFields...)
+		} else if len(sortby) != len(order) && len(order) == 1 {
+			// 2) there is exactly one order, all the sorted fields will be sorted by this order
+			for _, v := range sortby {
+				orderby := ""
+				if order[0] == "desc" {
+					orderby = "-" + v
+				} else if order[0] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+		} else if len(sortby) != len(order) && len(order) != 1 {
+			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
+		}
+	} else {
+		if len(order) != 0 {
+			return nil, errors.New("Error: unused 'order' fields")
+		}
+	}
+
+	var l []Company
+	qs = qs.OrderBy(sortFields...)
+	if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
+		if len(fields) == 0 {
+			for _, v := range l {
+				ml = append(ml, v)
+			}
+		} else {
+			// trim unused fields
+			for _, v := range l {
+				m := make(map[string]interface{})
+				val := reflect.ValueOf(v)
+				for _, fname := range fields {
+					m[fname] = val.FieldByName(fname).Interface()
+				}
+				ml = append(ml, m)
+			}
+		}
+		return ml, nil
+	}
+	return nil, err
+}
+
+// UpdateCompany updates Company by Id and returns error if
+// the record to be updated doesn't exist
+func UpdateCompanyById(m *Company) (err error) {
+	o := orm.NewOrm()
+	v := Company{Id: m.Id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Update(m); err == nil {
+			fmt.Println("Number of records updated in database:", num)
+		}
+	}
+	return
+}
+
+// DeleteCompany deletes Company by Id and returns error if
+// the record to be deleted doesn't exist
+func DeleteCompany(id int64) (err error) {
+	o := orm.NewOrm()
+	v := Company{Id: id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Delete(&Company{Id: id}); err == nil {
+			fmt.Println("Number of records deleted in database:", num)
+		}
+	}
+	return
+}

+package models
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego/orm"
+)
+
+type Department struct {
+	Id        int       `orm:"column(id);auto"`
+	CompanyId int       `orm:"column(company_id)" description:"公司id"`
+	Name      string    `orm:"column(name);size(30)" description:"部门名称"`
+	CreateAt  time.Time `orm:"column(create_at);type(timestamp)" description:"创建时间"`
+	ParentId  int       `orm:"column(parent_id)" description:"父级id"`
+	Relation  string    `orm:"column(relation);size(400)" description:"父子级关系树"`
+	DeleteAt  time.Time `orm:"column(delete_at);type(timestamp)" description:"删除时间"`
+	UpdateAt  time.Time `orm:"column(update_at);type(timestamp)" description:"更新时间"`
+	Member    int       `orm:"column(member)" description:"成员数量"`
+	Admin     int       `orm:"column(admin);null" description:"部门负责人id"`
+}
+
+func (t *Department) TableName() string {
+	return "department"
+}
+
+func init() {
+	orm.RegisterModel(new(Department))
+}
+
+// AddDepartment insert a new Department into database and returns
+// last inserted Id on success.
+func AddDepartment(m *Department) (id int64, err error) {
+	o := orm.NewOrm()
+	id, err = o.Insert(m)
+	return
+}
+
+// GetDepartmentById retrieves Department by Id. Returns error if
+// Id doesn't exist
+func GetDepartmentById(id int) (v *Department, err error) {
+	o := orm.NewOrm()
+	v = &Department{Id: id}
+	if err = o.Read(v); err == nil {
+		return v, nil
+	}
+	return nil, err
+}
+
+// GetAllDepartment retrieves all Department matches certain condition. Returns empty list if
+// no records exist
+func GetAllDepartment(query map[string]string, fields []string, sortby []string, order []string,
+	offset int64, limit int64) (ml []interface{}, err error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(Department))
+	// query k=v
+	for k, v := range query {
+		// rewrite dot-notation to Object__Attribute
+		k = strings.Replace(k, ".", "__", -1)
+		if strings.Contains(k, "isnull") {
+			qs = qs.Filter(k, (v == "true" || v == "1"))
+		} else {
+			qs = qs.Filter(k, v)
+		}
+	}
+	// order by:
+	var sortFields []string
+	if len(sortby) != 0 {
+		if len(sortby) == len(order) {
+			// 1) for each sort field, there is an associated order
+			for i, v := range sortby {
+				orderby := ""
+				if order[i] == "desc" {
+					orderby = "-" + v
+				} else if order[i] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+			qs = qs.OrderBy(sortFields...)
+		} else if len(sortby) != len(order) && len(order) == 1 {
+			// 2) there is exactly one order, all the sorted fields will be sorted by this order
+			for _, v := range sortby {
+				orderby := ""
+				if order[0] == "desc" {
+					orderby = "-" + v
+				} else if order[0] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+		} else if len(sortby) != len(order) && len(order) != 1 {
+			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
+		}
+	} else {
+		if len(order) != 0 {
+			return nil, errors.New("Error: unused 'order' fields")
+		}
+	}
+
+	var l []Department
+	qs = qs.OrderBy(sortFields...)
+	if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
+		if len(fields) == 0 {
+			for _, v := range l {
+				ml = append(ml, v)
+			}
+		} else {
+			// trim unused fields
+			for _, v := range l {
+				m := make(map[string]interface{})
+				val := reflect.ValueOf(v)
+				for _, fname := range fields {
+					m[fname] = val.FieldByName(fname).Interface()
+				}
+				ml = append(ml, m)
+			}
+		}
+		return ml, nil
+	}
+	return nil, err
+}
+
+// UpdateDepartment updates Department by Id and returns error if
+// the record to be updated doesn't exist
+func UpdateDepartmentById(m *Department) (err error) {
+	o := orm.NewOrm()
+	v := Department{Id: m.Id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Update(m); err == nil {
+			fmt.Println("Number of records updated in database:", num)
+		}
+	}
+	return
+}
+
+// DeleteDepartment deletes Department by Id and returns error if
+// the record to be deleted doesn't exist
+func DeleteDepartment(id int) (err error) {
+	o := orm.NewOrm()
+	v := Department{Id: id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Delete(&Department{Id: id}); err == nil {
+			fmt.Println("Number of records deleted in database:", num)
+		}
+	}
+	return
+}

+package models
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego/orm"
+)
+
+type Position struct {
+	Id           int       `orm:"column(id);auto" description:"职位表id"`
+	CompanyId    int64     `orm:"column(company_id)" description:"表company.id 公司编号"`
+	Name         string    `orm:"column(name);size(100)" description:"职位名称"`
+	ParentId     int       `orm:"column(parent_id)" description:"父级id"`
+	Relation     string    `orm:"column(relation);size(400)" description:"父子级关系树"`
+	CreateAt     time.Time `orm:"column(create_at);type(timestamp)" description:"创建时间"`
+	UpdateAt     time.Time `orm:"column(update_at);type(timestamp)" description:"更新时间"`
+	EnableStatus string    `orm:"column(enable_status);size(255)" description:"有效状态 1:有效 0：无效"`
+}
+
+func (t *Position) TableName() string {
+	return "position"
+}
+
+func init() {
+	orm.RegisterModel(new(Position))
+}
+
+// AddPosition insert a new Position into database and returns
+// last inserted Id on success.
+func AddPosition(m *Position) (id int64, err error) {
+	o := orm.NewOrm()
+	id, err = o.Insert(m)
+	return
+}
+
+// GetPositionById retrieves Position by Id. Returns error if
+// Id doesn't exist
+func GetPositionById(id int) (v *Position, err error) {
+	o := orm.NewOrm()
+	v = &Position{Id: id}
+	if err = o.Read(v); err == nil {
+		return v, nil
+	}
+	return nil, err
+}
+
+// GetAllPosition retrieves all Position matches certain condition. Returns empty list if
+// no records exist
+func GetAllPosition(query map[string]string, fields []string, sortby []string, order []string,
+	offset int64, limit int64) (ml []interface{}, err error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(Position))
+	// query k=v
+	for k, v := range query {
+		// rewrite dot-notation to Object__Attribute
+		k = strings.Replace(k, ".", "__", -1)
+		if strings.Contains(k, "isnull") {
+			qs = qs.Filter(k, (v == "true" || v == "1"))
+		} else {
+			qs = qs.Filter(k, v)
+		}
+	}
+	// order by:
+	var sortFields []string
+	if len(sortby) != 0 {
+		if len(sortby) == len(order) {
+			// 1) for each sort field, there is an associated order
+			for i, v := range sortby {
+				orderby := ""
+				if order[i] == "desc" {
+					orderby = "-" + v
+				} else if order[i] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+			qs = qs.OrderBy(sortFields...)
+		} else if len(sortby) != len(order) && len(order) == 1 {
+			// 2) there is exactly one order, all the sorted fields will be sorted by this order
+			for _, v := range sortby {
+				orderby := ""
+				if order[0] == "desc" {
+					orderby = "-" + v
+				} else if order[0] == "asc" {
+					orderby = v
+				} else {
+					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
+				}
+				sortFields = append(sortFields, orderby)
+			}
+		} else if len(sortby) != len(order) && len(order) != 1 {
+			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
+		}
+	} else {
+		if len(order) != 0 {
+			return nil, errors.New("Error: unused 'order' fields")
+		}
+	}
+
+	var l []Position
+	qs = qs.OrderBy(sortFields...)
+	if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
+		if len(fields) == 0 {
+			for _, v := range l {
+				ml = append(ml, v)
+			}
+		} else {
+			// trim unused fields
+			for _, v := range l {
+				m := make(map[string]interface{})
+				val := reflect.ValueOf(v)
+				for _, fname := range fields {
+					m[fname] = val.FieldByName(fname).Interface()
+				}
+				ml = append(ml, m)
+			}
+		}
+		return ml, nil
+	}
+	return nil, err
+}
+
+// UpdatePosition updates Position by Id and returns error if
+// the record to be updated doesn't exist
+func UpdatePositionById(m *Position) (err error) {
+	o := orm.NewOrm()
+	v := Position{Id: m.Id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Update(m); err == nil {
+			fmt.Println("Number of records updated in database:", num)
+		}
+	}
+	return
+}
+
+// DeletePosition deletes Position by Id and returns error if
+// the record to be deleted doesn't exist
+func DeletePosition(id int) (err error) {
+	o := orm.NewOrm()
+	v := Position{Id: id}
+	// ascertain id exists in the database
+	if err = o.Read(&v); err == nil {
+		var num int64
+		if num, err = o.Delete(&Position{Id: id}); err == nil {
+			fmt.Println("Number of records deleted in database:", num)
+		}
+	}
+	return
+}

@@ -28,7 +28,7 @@ type User struct {
 }
 }
 
 
 func (t *User) TableName() string {
 func (t *User) TableName() string {
-	return "users"
+	return "user"
 }
 }
 
 
 func init() {
 func init() {

+package protocol
+
+import "opp/models"
+
+//聚合数据
+
+//用户基础聚合
+type UserBaseInfoAggregation struct {
+	User       *models.User
+	Company    *models.Company
+	Department *models.Department
+	Position   *models.Position
+}

+package protocol
+
+/*公司表彰*/
+type CommendRequest struct {
+	LastId   int `json:"lastId"`
+	PageSize int `json:"pageSize" valid:"Required"`
+}
+
+type CommendResponse struct {
+	Lists []CommendInfo `json:"lists"`
+	Total int           `json:"total"`
+}
+
+type CommendInfo struct {
+	Id        int64           `json:"cid"`     //表彰编号
+	Content   string          `json:"content"` //表彰内容
+	Company   string          `json:"company"` //公司名
+	CommendAt int64           `json:"getTime"` //表彰时间
+	Honored   HonoredUserInfo `json:"honored"` //证书获得者 信息
+}
+
+type HonoredUserInfo struct {
+	UserId     int64  `json:"uid"`        //用户id
+	NickName   string `json:"uname"`      //用户名
+	Department string `json:"department"` //部门
+	Position   string `json:"position"`   //岗位
+}

@@ -20,6 +20,7 @@ var errmessge ErrorMap = map[int]string{
 	4142: "Uuid已存在，请求失败",
 	4142: "Uuid已存在，请求失败",
 }
 }
 
 
+
 func InitMessageCode() {
 func InitMessageCode() {
 	// messages := []struct {
 	// messages := []struct {
 	// 	Code int
 	// 	Code int

@@ -47,6 +47,14 @@ func init() {
 			MethodParams: param.Make(),
 			MethodParams: param.Make(),
 			Params: nil})
 			Params: nil})
 
 
+	beego.GlobalControllerRouter["opp/controllers/v1:CommendController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:CommendController"],
+		beego.ControllerComments{
+			Method: "Company",
+			Router: `/company`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams: param.Make(),
+			Params: nil})
+
 	beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"],
 	beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"],
 		beego.ControllerComments{
 		beego.ControllerComments{
 			Method: "Image",
 			Method: "Image",

@@ -15,6 +15,7 @@ func init() {
 		beego.NSNamespace("auth", beego.NSInclude(&v1.AuthController{})),
 		beego.NSNamespace("auth", beego.NSInclude(&v1.AuthController{})),
 		beego.NSNamespace("upload", beego.NSInclude(&v1.UploadController{})),
 		beego.NSNamespace("upload", beego.NSInclude(&v1.UploadController{})),
 		beego.NSNamespace("version", beego.NSInclude(&v1.VersionController{})),
 		beego.NSNamespace("version", beego.NSInclude(&v1.VersionController{})),
+		beego.NSNamespace("commend", beego.NSInclude(&v1.CommendController{})),
 	)
 	)
 	beego.AddNamespace(nsV1)
 	beego.AddNamespace(nsV1)
 	beego.SetStaticPath("/file/ab", beego.AppConfig.String("source_path"))
 	beego.SetStaticPath("/file/ab", beego.AppConfig.String("source_path"))

+package agg
+
+import (
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
+	"opp/internal/repository"
+	"opp/protocol"
+	"sync"
+)
+
+func GetUserBaseInfo(uid int64) (v *protocol.UserBaseInfoAggregation, err error) {
+	v = &protocol.UserBaseInfoAggregation{}
+	var wg sync.WaitGroup
+	if v.User, err = repository.User.GetUsersById(uid); err != nil {
+		log.Error(err)
+		return
+	}
+	wg.Add(3)
+
+	go func() {
+		defer wg.Done()
+		if v.Company, err = repository.Company.GetCompanyById(int64(v.User.CompanyId)); err != nil {
+			log.Error(err)
+			return
+		}
+	}()
+
+	go func() {
+		defer wg.Done()
+		if v.Department, err = repository.Department.GetDepartmentById(v.User.DepartmentId); err != nil {
+			log.Error(err)
+			return
+		}
+	}()
+
+	go func() {
+		defer wg.Done()
+		if v.Position, err = repository.Position.GetPositionById(v.User.PositionId); err != nil {
+			log.Error(err)
+			return
+		}
+	}()
+	wg.Wait()
+	return
+}

+package commend
+
+import (
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/time"
+	"opp/internal/repository"
+	"opp/models"
+	"opp/protocol"
+	"opp/services/agg"
+)
+
+func Commend(header *protocol.RequestHeader, request *protocol.CommendRequest) (rsp *protocol.CommendResponse, err error) {
+	var (
+		userBaseInfo *protocol.UserBaseInfoAggregation
+		user         *models.User
+		commends     []*models.Commend
+	)
+	rsp = &protocol.CommendResponse{}
+	user, err = repository.User.GetUsersById(header.Uid)
+	if err != nil {
+		return
+	}
+	if commends, rsp.Total, err = repository.Commend.GetCommends(user.CompanyId, request.LastId, request.PageSize); err != nil {
+		return
+	}
+	for i := 0; i < len(commends); i++ {
+		c := commends[i]
+		userBaseInfo, err = agg.GetUserBaseInfo(c.UserId)
+		if err != nil {
+			continue
+		}
+		user = userBaseInfo.User
+		cInfo := protocol.CommendInfo{
+			Id:        c.Id,
+			Content:   c.Content,
+			Company:   userBaseInfo.Company.Name,
+			CommendAt: time.GetUnixTimeByNDayUnix(c.CommendAt.Unix(), 0),
+			Honored: protocol.HonoredUserInfo{
+				UserId:     c.UserId,
+				NickName:   user.NickName,
+				Department: userBaseInfo.Department.Name,
+				Position:   userBaseInfo.Position.Name,
+			},
+		}
+		rsp.Lists = append(rsp.Lists, cInfo)
+	}
+	return
+}