0818PM

controllers/cases/area.go

@@ -0,0 +1,62 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetCaseArea 获取案场区域列表
+func (c *CaseController) GetCaseArea() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	areas, err := c.dao.GetCaseArea(caseids, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(areas)
+}
+
+// GetCaseAreaByID 根据ID获取案场区域
+func (c *CaseController) GetCaseAreaByID() {
+	areaid := c.GetString(":areaid")
+	area, err := c.dao.GetCaseAreaByID(areaid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(area)
+}
+
+// SaveCaseArea 保存案场区域
+func (c *CaseController) SaveCaseArea() {
+	area := model.SysCaseArea{}
+	if err := c.ParseForm(&area); err != nil {
+		c.ResponseError(err)
+	}
+	newinfo, err := c.dao.SaveCaseArea(area)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+// DelCaseArea 删除案场区域
+func (c *CaseController) DelCaseArea() {
+	areaid := c.GetString(":areaid")
+	err := c.dao.DelCaseArea(areaid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}
+
+// GetAreaByCase 根据案场获取区域信息
+func (c *CaseController) GetAreaByCase() {
+	caseid := c.GetString("caseid")
+	areas, err := c.dao.GetAreaByCase(caseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(areas)
+}

controllers/cases/key.go

@@ -0,0 +1,49 @@
+package cases
+
+// GetKeyList 获取钥匙列表
+func (c *CaseController) GetKeyList() {
+	caseid := c.GetString("caseid")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	num := c.GetString("num")
+
+	list, err := c.dao.GetKeysByCase(caseid, num, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// AddKeys 新增钥匙
+func (c *CaseController) AddKeys() {
+	caseid := c.GetString("caseid")
+	orgid := c.GetString("orgid")
+	beginnum, _ := c.GetInt("beginnum")
+	endnum, _ := c.GetInt("endnum")
+
+	err := c.dao.AddKeys(orgid, caseid, beginnum, endnum)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// UnLockKey 解锁
+func (c *CaseController) UnLockKey() {
+	keyid := c.GetString(":keyid")
+	err := c.dao.UnLockKey(keyid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("解锁成功！")
+}
+
+// DelKey 删除
+func (c *CaseController) DelKey() {
+	keyid := c.GetString(":keyid")
+	err := c.dao.DelKey(keyid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/cases/table.go

@@ -0,0 +1,52 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetCaseTable 获取案场桌位列表
+func (c *CaseController) GetCaseTable() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	tables, err := c.dao.GetCaseTable(caseids, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(tables)
+}
+
+// GetCaseTableByID 根据ID获取案场桌位
+func (c *CaseController) GetCaseTableByID() {
+	tableid := c.GetString(":tableid")
+	table, err := c.dao.GetCaseTableByID(tableid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(table)
+}
+
+// SaveCaseTable 保存案场桌位
+func (c *CaseController) SaveCaseTable() {
+	table := model.SysCaseTable{}
+	if err := c.ParseForm(&table); err != nil {
+		c.ResponseError(err)
+	}
+	newinfo, err := c.dao.SaveCaseTable(table)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+// DelCaseTable 删除案场桌位
+func (c *CaseController) DelCaseTable() {
+	tableid := c.GetString(":tableid")
+	err := c.dao.DelCaseTable(tableid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/system/role.go

@@ -0,0 +1,68 @@
+package system
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/system"
+)
+
+// RoleController 用户
+type RoleController struct {
+	dao *system.RoleServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *RoleController) Constructor() {
+	c.dao = system.NewRoleServ(c.Context)
+}
+
+// GetRoleList 获取角色列表
+func (c *RoleController) GetRoleList() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+
+	list, err := c.dao.GetRoleList(caseIDs, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetRoleByID 根据ID获取角色信息
+func (c *RoleController) GetRoleByID() {
+	roleid := c.GetString(":roleid")
+	info, err := c.dao.GetRoleByID(roleid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCaseRole 保存角色
+func (c *RoleController) SaveCaseRole() {
+	role := model.SysRole{}
+	if err := c.ParseForm(&role); err != nil {
+		c.ResponseError(err)
+	}
+	menuids := c.GetString("menuids")
+	newRole, err := c.dao.SaveRole(role, menuids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newRole)
+}
+
+// DelCaseRole 删除角色
+func (c *RoleController) DelCaseRole() {
+	roleid := c.GetString(":roleid")
+	err := c.dao.DelRole(roleid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

models/cases/area.go

@@ -0,0 +1,87 @@
+package cases
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// GetCaseAreaCount 获取案场区域总数
+func (m *CaseDAO) GetCaseAreaCount(caseids string) (int, error) {
+	var areas []model.SysCaseArea
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	err := dao.Find(&areas)
+	return len(areas), err
+}
+
+// GetCaseArea 根据案场获取案场区域
+func (m *CaseDAO) GetCaseArea(caseids string, page int, pageSize int) ([]model.SysCaseArea, error) {
+	var areas []model.SysCaseArea
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	err := dao.Limit(pageSize, page*pageSize).Find(&areas)
+	return areas, err
+}
+
+// AreaInfo 案场区域
+type AreaInfo struct {
+	model.SysCaseArea `xorm:"extends"`
+	Tables            []model.SysCaseTable
+}
+
+// GetCaseAreaByCase 根据案场获取案场区域
+func (m *CaseDAO) GetCaseAreaByCase(caseid string) ([]AreaInfo, error) {
+	var areas []AreaInfo
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id =?", caseid).Table("sys_case_area").Find(&areas)
+	return areas, err
+}
+
+// GetCaseAreaByID 根据ID获取案场区域
+func (m *CaseDAO) GetCaseAreaByID(specid string) (*model.SysCaseArea, error) {
+	var areas []model.SysCaseArea
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", specid).Find(&areas)
+	if err != nil {
+		return nil, err
+	}
+	if len(areas) > 0 {
+		return &areas[0], nil
+	}
+	return nil, nil
+}
+
+// AddCaseArea 新增案场区域
+func (m *CaseDAO) AddCaseArea(area *model.SysCaseArea) (*model.SysCaseArea, error) {
+	area.AreaId = utils.GetGUID()
+	area.Status = models.STATUS_NORMAL
+	area.CreateDate = time.Now()
+	user := m.ctx.Get("user").(*model.SysUser)
+	area.CreateUser = user.UserId
+	_, err := m.db.Insert(area)
+	return area, err
+}
+
+// UpdateCaseArea 修改案场区域
+func (m *CaseDAO) UpdateCaseArea(area model.SysCaseArea) error {
+	var cols = []string{
+		"area_name",
+		"area_icon",
+		"area_icon_white",
+	}
+	_, err := m.db.Cols(cols...).Where("area_id=?", area.AreaId).Update(area)
+	return err
+}
+
+// DelCaseArea 刪除案场区域
+func (m *CaseDAO) DelCaseArea(areaid string) error {
+	var area = model.SysCaseArea{
+		AreaId: areaid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("area_id=?", area.AreaId).Update(area)
+	return err
+}

models/cases/cases.go

@@ -41,13 +41,6 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 	}
 
 	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
-
-	// var cases []model.SysCase
-	// dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
-	// if casename != "" {
-	// 	dao = dao.And("case_name like '%" + casename + "%'")
-	// }
-	// err := dao.Limit(pageSize, page*pageSize).Find(&cases)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }

models/cases/key.go

@@ -3,14 +3,91 @@ package cases
 import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 )
 
+const (
+	STATUS_UNLOCK = 0
+)
+
+// CaseKeyInfo 案场钥匙信息
+type CaseKeyInfo struct {
+	model.TaCaseKey `xorm:"extends"`
+	CustomerId      string
+	CustomerName    string
+}
+
 // GetKeysByCase 根据案场获取钥匙信息
-func (m *CaseDAO) GetKeysByCase(caseid string, page, pageSize int) ([]model.TaCaseKey, error) {
+func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseKeyInfo, error) {
+	var keys []CaseKeyInfo
+	dao := m.db.Where("case_id=?", caseid).Table("ta_case_key").And("status>" + strconv.Itoa(models.STATUS_DEL))
+	if num != "" {
+		dao.And("lock_num like '%" + num + "%'")
+	}
+	err := dao.Limit(pageSize, page*pageSize).Find(&keys)
+	return keys, err
+}
+
+// GetKeysCountByCase 根据案场获取钥匙数量
+func (m *CaseDAO) GetKeysCountByCase(caseid string) (int, error) {
 	var keys []model.TaCaseKey
 	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&keys)
-	return keys, err
+	return len(keys), err
 }
 
 // GetCurrentKey 获取当前钥匙的占用人员
+func (m *CaseDAO) GetCurrentKey(keyid string) (*model.TaCaseKeyUse, error) {
+	var use []model.TaCaseKeyUse
+	err := m.db.Where("key_id=?", keyid).And("status=?", models.STATUS_NORMAL).Find(&use)
+	if err != nil {
+		return nil, err
+	}
+	if len(use) > 0 {
+		return &use[0], nil
+	}
+	return nil, nil
+}
+
+// GetKeyByID 根据ID获取钥匙信息
+func (m *CaseDAO) GetKeyByID(keyid string) (*model.TaCaseKey, error) {
+	var keys []model.TaCaseKey
+	err := m.db.Where("key_id=?", keyid).Find(&keys)
+	if err != nil {
+		return nil, err
+	}
+	if len(keys) > 0 {
+		return &keys[0], nil
+	}
+	return nil, nil
+}
+
+// AddKey 新增单个钥匙信息
+func (m *CaseDAO) AddKey(key model.TaCaseKey) (*model.TaCaseKey, error) {
+	key.KeyId = utils.GetGUID()
+	key.Status = models.STATUS_NORMAL
+	key.CreateDate = time.Now()
+	_, err := m.db.Insert(&key)
+	return &key, err
+}
+
+// DelKey 删除钥匙信息
+func (m *CaseDAO) DelKey(keyid string) error {
+	var keyinfo = model.TaCaseKey{
+		KeyId:  keyid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("key_id=?", keyid).Update(keyinfo)
+	return err
+}
+
+// UnLockKey 解绑钥匙信息
+func (m *CaseDAO) UnLockKey(keyid string) error {
+	sql := `update ta_case_key_use set status=` + strconv.Itoa(STATUS_UNLOCK) + ` where key_id= '` + keyid + `'`
+	_, err := m.db.Exec(sql)
+	return err
+}

models/cases/table.go

@@ -0,0 +1,93 @@
+package cases
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// GetCaseTableCount 获取桌位总数
+func (m *CaseDAO) GetCaseTableCount(caseids string) (int, error) {
+	var tables []model.SysCaseTable
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	err := dao.Find(&tables)
+	return len(tables), err
+}
+
+// CaseTableInfo 案场桌位
+type CaseTableInfo struct {
+	model.SysCaseTable `xorm:"extends"`
+	AreaName           string
+	CaseName           string
+}
+
+// GetCaseTable 根据案场获取桌位
+func (m *CaseDAO) GetCaseTable(caseids string, page int, pageSize int) ([]CaseTableInfo, error) {
+	var tables []CaseTableInfo
+	sql := `select a.*,b.area_name,c.case_name from sys_case_table a 
+	inner join sys_case_area b on a.area_id=b.area_id
+	inner join sys_case c on a.case_id=c.case_id
+	where status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` +
+		strings.Replace(caseids, ",", "','", -1) + `')`
+
+	err := m.db.Sql(sql).Find(&tables)
+	return tables, err
+}
+
+// GetCaseTableByAreaID 根据区域ID获取桌位信息
+func (m *CaseDAO) GetCaseTableByAreaID(areaid string) ([]model.SysCaseTable, error) {
+	var tables []model.SysCaseTable
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", areaid).Find(&tables)
+	return tables, err
+}
+
+// GetCaseTableByID 根据ID获取桌位
+func (m *CaseDAO) GetCaseTableByID(tableid string) (*model.SysCaseTable, error) {
+	var tables []model.SysCaseTable
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("table_id=?", tableid).Find(&tables)
+	if err != nil {
+		return nil, err
+	}
+	if len(tables) > 0 {
+		return &tables[0], nil
+	}
+	return nil, nil
+}
+
+// AddCaseTable 新增桌位
+func (m *CaseDAO) AddCaseTable(area *model.SysCaseTable) (*model.SysCaseTable, error) {
+	area.TableId = utils.GetGUID()
+	area.Status = models.STATUS_NORMAL
+	area.CreateDate = time.Now()
+	user := m.ctx.Get("user").(*model.SysUser)
+	area.CreateUser = user.UserId
+	_, err := m.db.Insert(area)
+	return area, err
+}
+
+// UpdateCaseTable 修改桌位
+func (m *CaseDAO) UpdateCaseTable(area model.SysCaseTable) error {
+	var cols = []string{
+		"table_no",
+		"order",
+		"remark",
+	}
+	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
+	return err
+}
+
+// DelCaseTable 刪除桌位
+func (m *CaseDAO) DelCaseTable(tableid string) error {
+	var area = model.SysCaseTable{
+		TableId: tableid,
+		Status:  models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
+	return err
+}

models/cases/tag.go

@@ -1,7 +1,7 @@
 package cases
 
 import (
-	"jcjy/demo/models"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"

models/system/role.go

@@ -0,0 +1,113 @@
+package system
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/go-xorm/xorm"
+)
+
+// RoleDAO 菜单
+type RoleDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewRoleDAO New Inst
+func NewRoleDAO(ctx *utils.Context) *RoleDAO {
+	return &RoleDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// GetRoleCount 获取角色总数
+func (m *RoleDAO) GetRoleCount(caseids string) (int, error) {
+	var roles []model.SysRole
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&roles)
+	return len(roles), err
+}
+
+// GetRoleList 根据案场获取角色
+func (m *RoleDAO) GetRoleList(caseids string, page int, pageSize int) ([]model.SysRole, error) {
+	var roles []model.SysRole
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&roles)
+	return roles, err
+}
+
+// Role 角色
+type Role struct {
+	model.TaCmsCase `xorm:"extends"`
+	RoleMenu        []model.SysMenu
+}
+
+// GetRoleByID 根据ID获取角色
+func (m *RoleDAO) GetRoleByID(roleid string) (*Role, error) {
+	var roles []Role
+	err := m.db.Table("sys_role").Where("role_id=?", roleid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&roles)
+	if err != nil {
+		return nil, err
+	}
+	if len(roles) > 0 {
+		return &roles[0], err
+	}
+	return nil, nil
+}
+
+// GetRoleMenuByRoleID 根据角色ID获取角色对应菜单
+func (m *RoleDAO) GetRoleMenuByRoleID(roleid string) ([]model.SysMenu, error) {
+	var menus []model.SysMenu
+	sql := `select a.* from sys_menu a inner join sys_role_menu b on a.menu_id=b.menu_id where b.role_id='` + roleid + `'`
+	err := m.db.Sql(sql).Find(&menus)
+	return menus, err
+}
+
+// AddRole 新增角色
+func (m *RoleDAO) AddRole(Role model.SysRole) (*model.SysRole, error) {
+	Role.RoleId = utils.GetGUID()
+	Role.Status = models.STATUS_NORMAL
+	Role.CreateDate = time.Now()
+	_, err := m.db.Insert(&Role)
+	return &Role, err
+}
+
+// UpdateRole 修改角色
+func (m *RoleDAO) UpdateRole(Role model.SysRole) error {
+	var cols = []string{
+		"role_name",
+		"remark",
+	}
+	_, err := m.db.Cols(cols...).Where("role_id=?", Role.RoleId).Update(Role)
+	return err
+}
+
+// DeleteRole 刪除角色
+func (m *RoleDAO) DeleteRole(roleid string) error {
+	var Role = model.SysRole{
+		RoleId: roleid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("role_id=?", Role.RoleId).Update(Role)
+	return err
+}
+
+// DelRoleMenu 删除角色对应的菜单
+func (m *RoleDAO) DelRoleMenu(roleid string) error {
+	sql := "delete from sys_role_menu where role_id='" + roleid + "'"
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// SaveRoleMenu 保存角色对应的菜单
+func (m *RoleDAO) SaveRoleMenu(roleid, caseids string) error {
+	sql := `insert into sys_role_menu(role_id,menu_id) select '` + roleid + `', menu_id from sys_menu where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Exec(sql)
+	return err
+}

routers/common.go

@@ -2,9 +2,11 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
+	"spaceofcheng/services/controllers/system"
 	"spaceofcheng/services/controllers/user"
 
 	"github.com/astaxie/beego"
@@ -70,24 +72,47 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
 
-		beego.NSRouter("/caseuser", &message.MessageController{}, "get:GetCaseUserByCase"),
-		beego.NSRouter("/caseuserbytype", &message.MessageController{}, "get:GetCaseUserByType"),
-		beego.NSRouter("/caseuser/:userid", &message.MessageController{}, "get:GetCaseUserByID"),
-		beego.NSRouter("/caseuser", &message.MessageController{}, "post:SaveCaseUser"),
-		beego.NSRouter("/caseuser", &message.MessageController{}, "put:SaveCaseUser"),
-		beego.NSRouter("/caseuser/:userid", &message.MessageController{}, "delete:DelCaseUser"),
-
-		beego.NSRouter("/equipment", &message.MessageController{}, "get:GetEquipmentList"),
-		beego.NSRouter("/equipment/:id", &message.MessageController{}, "get:GetEquipmentByID"),
-		beego.NSRouter("/equipment", &message.MessageController{}, "post:SaveCaseEquipment"),
-		beego.NSRouter("/equipment", &message.MessageController{}, "put:SaveCaseEquipment"),
-		beego.NSRouter("/equipment/:id", &message.MessageController{}, "delete:DelCaseEquipment"),
-
-		beego.NSRouter("/case", &message.MessageController{}, "get:GetCaseList"),
-		beego.NSRouter("/case/:id", &message.MessageController{}, "get:GetCaseByID"),
-		beego.NSRouter("/case", &message.MessageController{}, "post:SaveCase"),
-		beego.NSRouter("/case", &message.MessageController{}, "put:SaveCase"),
-		beego.NSRouter("/case/:id", &message.MessageController{}, "delete:DelCase"),
+		beego.NSRouter("/caseuser", &cases.CaseController{}, "get:GetCaseUserByCase"),
+		beego.NSRouter("/caseuserbytype", &cases.CaseController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/caseuser/:userid", &cases.CaseController{}, "get:GetCaseUserByID"),
+		beego.NSRouter("/caseuser", &cases.CaseController{}, "post:SaveCaseUser"),
+		beego.NSRouter("/caseuser", &cases.CaseController{}, "put:SaveCaseUser"),
+		beego.NSRouter("/caseuser/:userid", &cases.CaseController{}, "delete:DelCaseUser"),
+
+		beego.NSRouter("/equipment", &cases.CaseController{}, "get:GetEquipmentList"),
+		beego.NSRouter("/equipment/:id", &cases.CaseController{}, "get:GetEquipmentByID"),
+		beego.NSRouter("/equipment", &cases.CaseController{}, "post:SaveCaseEquipment"),
+		beego.NSRouter("/equipment", &cases.CaseController{}, "put:SaveCaseEquipment"),
+		beego.NSRouter("/equipment/:id", &cases.CaseController{}, "delete:DelCaseEquipment"),
+
+		beego.NSRouter("/case", &cases.CaseController{}, "get:GetCaseList"),
+		beego.NSRouter("/case/:id", &cases.CaseController{}, "get:GetCaseByID"),
+		beego.NSRouter("/case", &cases.CaseController{}, "post:SaveCase"),
+		beego.NSRouter("/case", &cases.CaseController{}, "put:SaveCase"),
+		beego.NSRouter("/case/:id", &cases.CaseController{}, "delete:DelCase"),
+
+		beego.NSRouter("/key", &cases.CaseController{}, "get:GetKeyList"),
+		beego.NSRouter("/key", &cases.CaseController{}, "post:AddKeys"),
+		beego.NSRouter("/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
+		beego.NSRouter("/key/:id", &cases.CaseController{}, "delete:DelKey"),
+
+		beego.NSRouter("/area", &cases.CaseController{}, "get:GetCaseArea"),
+		beego.NSRouter("/area/:areaid", &cases.CaseController{}, "get:GetCaseAreaByID"),
+		beego.NSRouter("/area", &cases.CaseController{}, "post:SaveCaseArea"),
+		beego.NSRouter("/area", &cases.CaseController{}, "put:SaveCaseArea"),
+		beego.NSRouter("/area/:areaid", &cases.CaseController{}, "delete:DelCaseArea"),
+
+		beego.NSRouter("/table", &cases.CaseController{}, "get:GetCaseTable"),
+		beego.NSRouter("/table/:tableid", &cases.CaseController{}, "get:GetCaseTableByID"),
+		beego.NSRouter("/table", &cases.CaseController{}, "post:SaveCaseTable"),
+		beego.NSRouter("/table", &cases.CaseController{}, "put:SaveCaseTable"),
+		beego.NSRouter("/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
+
+		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
+		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),
+		beego.NSRouter("/role", &system.RoleController{}, "post:SaveCaseRole"),
+		beego.NSRouter("/role", &system.RoleController{}, "put:SaveCaseRole"),
+		beego.NSRouter("/role/:roleid", &system.RoleController{}, "delete:DelCaseRole"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),

routers/guest.go

@@ -2,6 +2,7 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
@@ -17,7 +18,9 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),
 		beego.NSRouter("/cms/img", &message.MessageController{}, "get:GetImgByLocation"),
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
-		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
+
+		// 案场
+		beego.NSRouter("/case/area", &cases.CaseController{}, "get:GetAreaByCase"),
 
 		// 验证码 获取, 校验
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),

service/cases/area.go

@@ -0,0 +1,69 @@
+package cases
+
+import (
+	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// GetCaseArea 获取案场区域
+func (s *CaseServ) GetCaseArea(caseids string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	areas, err := s.dao.GetCaseArea(caseids, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetCaseAreaCount(caseids)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     areas,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCaseAreaByID 根据区域ID获取区域
+func (s *CaseServ) GetCaseAreaByID(areaid string) (*model.SysCaseArea, error) {
+	areas, err := s.dao.GetCaseAreaByID(areaid)
+	return areas, err
+}
+
+// SaveCaseArea 保存区域
+func (s *CaseServ) SaveCaseArea(area model.SysCaseArea) (*model.SysCaseArea, error) {
+	var err error
+	if area.AreaId == "" {
+		_, err = s.dao.AddCaseArea(&area)
+	} else {
+		err = s.dao.UpdateCaseArea(area)
+	}
+	return &area, err
+}
+
+// DelCaseArea 删除区域
+func (s *CaseServ) DelCaseArea(areaid string) error {
+	err := s.dao.DelCaseArea(areaid)
+	return err
+}
+
+// GetAreaByCase 根据案场获取区域信息
+func (s *CaseServ) GetAreaByCase(caseid string) ([]cases.AreaInfo, error) {
+	areas, err := s.dao.GetCaseAreaByCase(caseid)
+	if err != nil {
+		return nil, err
+	}
+	for index, area := range areas {
+		tables, err := s.dao.GetCaseTableByAreaID(area.AreaId)
+		if err != nil {
+			return nil, err
+		}
+		areas[index].Tables = tables
+	}
+
+	return areas, nil
+}

service/cases/key.go

@@ -0,0 +1,91 @@
+package cases
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
+
+// GetKeysByCase 根据案场获取钥匙信息
+func (s *CaseServ) GetKeysByCase(caseid, num string, page, pageSize int) (map[string]interface{}, error) {
+	cases := s.ctx.Get("cases").([]model.SysUserCase)
+	isdict := false
+	for _, value := range cases {
+		if caseid == value.CaseId {
+			isdict = true
+		}
+	}
+	if !isdict {
+		return nil, utils.LogError("您没有该案场的权限！")
+	}
+
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	keys, err := s.dao.GetKeysByCase(caseid, num, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetCaseCount(caseid, num)
+	if err != nil {
+		return nil, err
+	}
+
+	for index, key := range keys {
+		use, err := s.dao.GetCurrentKey(key.KeyId)
+		if err != nil {
+			return nil, err
+		}
+		keys[index].CustomerId = use.CustomerId
+		keys[index].CustomerName = use.CustomerName
+	}
+
+	return map[string]interface{}{
+		"list":     keys,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// AddKeys 保存钥匙
+func (s *CaseServ) AddKeys(orgid, caseid string, beginnum, endnum int) error {
+	if endnum <= beginnum {
+		return utils.LogError("锁柜编号起始不能大于截止时间！")
+	}
+
+	for i := beginnum; i <= endnum; i++ {
+		key := model.TaCaseKey{
+			OrgId:   orgid,
+			CaseId:  caseid,
+			LockNum: strconv.Itoa(i),
+		}
+		_, err := s.dao.AddKey(key)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// UnLockKey 解锁
+func (s *CaseServ) UnLockKey(keyid string) error {
+	err := s.dao.UnLockKey(keyid)
+	return err
+}
+
+// DelKey 刪除
+func (s *CaseServ) DelKey(keyid string) error {
+	use, err := s.dao.GetCurrentKey(keyid)
+	if err != nil {
+		return err
+	}
+
+	if use != nil {
+		return utils.LogError("当前锁柜未解锁！请先解锁再删除！")
+	}
+
+	err = s.dao.DelKey(keyid)
+	return err
+}

service/cases/table.go

@@ -0,0 +1,51 @@
+package cases
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// GetCaseTable 获取案场桌位
+func (s *CaseServ) GetCaseTable(caseids string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	areas, err := s.dao.GetCaseTable(caseids, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetCaseTableCount(caseids)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     areas,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCaseTableByID 根据桌位ID获取桌位
+func (s *CaseServ) GetCaseTableByID(tableid string) (*model.SysCaseTable, error) {
+	areas, err := s.dao.GetCaseTableByID(tableid)
+	return areas, err
+}
+
+// SaveCaseTable 保存桌位
+func (s *CaseServ) SaveCaseTable(table model.SysCaseTable) (*model.SysCaseTable, error) {
+	var err error
+	if table.TableId == "" {
+		_, err = s.dao.AddCaseTable(&table)
+	} else {
+		err = s.dao.UpdateCaseTable(table)
+	}
+	return &table, err
+}
+
+// DelCaseTable 删除桌位
+func (s *CaseServ) DelCaseTable(tableid string) error {
+	err := s.dao.DelCaseTable(tableid)
+	return err
+}

service/customer/customer.go

@@ -228,7 +228,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 		}
 
 		if user != nil && user.Status != models.STATUS_DEL {
-			cust.UserId = userID
+			cust.CustomerId = userID
 		}
 	}
 

service/system/role.go

@@ -0,0 +1,90 @@
+package system
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+)
+
+// RoleServ 系统处理
+type RoleServ struct {
+	ctx *utils.Context
+	dao *system.RoleDAO
+}
+
+// NewRoleServ 初始化
+func NewRoleServ(ctx *utils.Context) *RoleServ {
+	return &RoleServ{
+		ctx: ctx,
+		dao: system.NewRoleDAO(ctx),
+	}
+}
+
+// GetRoleList 获取Role列表
+func (s *RoleServ) GetRoleList(caseids string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	roles, err := s.dao.GetRoleList(caseids, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetRoleCount(caseids)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     roles,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetRoleByID 根据ID获取角色
+func (s *RoleServ) GetRoleByID(roleid string) (*system.Role, error) {
+	role, err := s.dao.GetRoleByID(roleid)
+	if err != nil {
+		return nil, err
+	}
+	if role != nil {
+		menus, err := s.dao.GetRoleMenuByRoleID(roleid)
+		if err != nil {
+			return nil, err
+		}
+		role.RoleMenu = menus
+	}
+	return role, err
+}
+
+// SaveRole 保存角色
+func (s *RoleServ) SaveRole(role model.SysRole, menuids string) (*model.SysRole, error) {
+	var newInfo *model.SysRole
+	var err error
+	if role.RoleId == "" {
+		newInfo, err = s.dao.AddRole(role)
+	} else {
+		err = s.dao.UpdateRole(role)
+		newInfo = &role
+	}
+	if err != nil {
+		return nil, err
+	}
+	err = s.dao.DelRoleMenu(newInfo.RoleId)
+	if err != nil {
+		return nil, err
+	}
+	err = s.dao.SaveRoleMenu(newInfo.RoleId, menuids)
+	if err != nil {
+		return nil, err
+	}
+	return newInfo, err
+}
+
+// DelRole 删除角色
+func (s *RoleServ) DelRole(Roleid string) error {
+	err := s.dao.DeleteRole(Roleid)
+	return err
+}