0809AM

controllers/base.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"net/http"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
@@ -89,3 +90,15 @@ func (c *BaseController) initController() {
 		ctrl.Constructor()
 	}
 }
+
+// GetCaseIDs 获取案场IDs
+func (c *BaseController) GetCaseIDs(cases []model.SysUserCase) string {
+	caseIDs := ""
+	for _, value := range cases {
+		if caseIDs != "" {
+			caseIDs = caseIDs + ","
+		}
+		caseIDs = caseIDs + value.CaseId
+	}
+	return caseIDs
+}

controllers/user/user.go

@@ -0,0 +1,84 @@
+package user
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// UserController 用户
+type UserController struct {
+	dao *service.UserServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *UserController) Constructor() {
+	c.dao = service.NewUserServ(c.Context)
+}
+
+// UpdatePassword 更新用户密码
+func (c *UserController) UpdatePassword() {
+	oriPasswd := c.GetString("oriPasswd")
+	newPasswd := c.GetString("newPasswd")
+
+	user := c.Context.Get("user").(model.SysUser)
+	err := c.dao.UpdatePassword(oriPasswd, newPasswd, &user)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("ok")
+}
+
+// ResetPassword 重置用户密码
+func (c *UserController) ResetPassword() {
+	userid := c.GetString("userid")
+	err := c.dao.ResetPassword(userid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("OK")
+}
+
+// GetUserByID 获取用户信息
+func (c *UserController) GetUserByID() {
+	userid := c.GetString("userid")
+	user, err := c.dao.GetUserByID(userid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(user)
+}
+
+// GetUserList 获取用户列表
+func (c *UserController) GetUserList() {
+	userName := c.GetString("username")
+	typeID := c.GetString("typeid")
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	userList, err := c.dao.GetUserList(userName, typeID, caseIDs)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(userList)
+}
+
+// UserMapping 用户映射
+func (c *UserController) UserMapping() {
+	userid := ""
+	usertype := ""
+	openid := c.GetString("openid")
+	uuid := c.GetString("uuid")
+	accountType := c.GetString("type")
+	accountInfo := c.GetString("userinfo")
+	var userMapping = model.TaUserMapping{}
+	userMapping.UserId = userid
+	userMapping.UserType = usertype
+	userMapping.AccountInfo = accountInfo
+	userMapping.Openid = openid
+	userMapping.Uuid = uuid
+	userMapping.AccountType = accountType
+
+}

models/system/dict.go

@@ -0,0 +1,30 @@
+package system
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// DictDAO 当前数据库操作对象
+type DictDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewDictDAO New Inst
+func NewDictDAO(ctx *utils.Context) *DictDAO {
+	return &DictDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// GetUserType 获取用户类型
+func (m *DictDAO) GetUserType() ([]model.TdUserType, error) {
+	var usertype []model.TdUserType
+	err := m.db.Where("status>?", models.STATUS_DEL).Find(&usertype)
+	return usertype, err
+}

models/system/user.go

@@ -97,6 +97,7 @@ func (m *UserDAO) GetUserMenu(userid string) ([]model.SysMenu, error) {
 
 // AddUser 新增用户
 func (m *UserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
+	user.UserId = utils.GetGUID()
 	user.CreateDate = time.Now()
 	user.Status = models.STATUS_NOMAIL
 	_, err := m.db.Insert(&user)
@@ -218,3 +219,10 @@ func (m *UserDAO) UpdatePassword(userID, newPass string) error {
 
 	return nil
 }
+
+// SaveUserMapping 保存用户映射信息
+func (m *UserDAO) SaveUserMapping(usermapping *model.TaUserMapping) error {
+	usermapping.MappingId = utils.GetGUID()
+	_, err := m.db.Insert(&usermapping)
+	return err
+}

service/dict.go

@@ -0,0 +1,20 @@
+package service
+
+import (
+	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/utils"
+)
+
+// DictServ 系统处理
+type DictServ struct {
+	ctx *utils.Context
+	dao *system.DictDAO
+}
+
+// NewDictServ 初始化
+func NewDictServ(ctx *utils.Context) *DictServ {
+	return &DictServ{
+		ctx: ctx,
+		dao: system.NewDictDAO(ctx),
+	}
+}

service/user.go

@@ -1,9 +1,17 @@
 package service
 
 import (
+	"errors"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
+
+	"github.com/yl10/kit/encrypt"
+)
+
+const (
+	USERTYPE_USER     = "user"
+	USERTYPE_CUSTOMER = "customer"
 )
 
 // UserServ 系统处理
@@ -66,11 +74,46 @@ func (s *UserServ) GetUserByID(userid string) (*system.UserInfo, error) {
 }
 
 // SaveUser 用户保存
-func (s *UserServ) SaveUser() {
-
+func (s *UserServ) SaveUser() (*model.SysUser, error) {
+	return nil, nil
 }
 
 // UpdatePassword 密码修改
-func (s *UserServ) UpdatePassword(oriPasswd, newPasswd string) error {
+func (s *UserServ) UpdatePassword(oriPasswd, newPasswd string, user *model.SysUser) error {
+	if !s.dao.ValidatePassword(user, oriPasswd) {
+		return errors.New("密码错误！")
+	}
+
+	if err := s.dao.UpdatePassword(user.UserId, newPasswd); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ResetPassword 重设密码
+func (s *UserServ) ResetPassword(userid string) error {
+	newPasswd := encrypt.Md5("123456")
+	if err := s.dao.UpdatePassword(userid, newPasswd); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UserMapping 用户隐射
+func (s *UserServ) UserMapping(userMapping model.TaUserMapping) error {
+	err := s.dao.SaveUserMapping(&userMapping)
+	if err != nil {
+		return err
+	}
+	// 根据用户类型更新用户表中的数据
+
+	switch userMapping.UserType {
+	case USERTYPE_USER:
+		break
+	case USERTYPE_CUSTOMER:
+		break
+	}
 	return nil
 }

utils/guid.go

@@ -0,0 +1,10 @@
+package utils
+
+import (
+	"github.com/pborman/uuid"
+)
+
+// GetGUID 获取GUID
+func GetGUID() string {
+	return uuid.New()
+}