Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

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/case.go

@@ -2,6 +2,7 @@ package cases
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
 )
 
@@ -17,3 +18,51 @@ type CaseController struct {
 func (c *CaseController) Constructor() {
 	c.dao = cases.NewCaseServ(c.Context)
 }
+
+// GetCaseList 获取案场列表
+func (c *CaseController) GetCaseList() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	casename := c.GetString("name")
+
+	list, err := c.dao.GetCases(caseIDs, casename, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetCaseByID 根据ID获取案场信息
+func (c *CaseController) GetCaseByID() {
+	caseid := c.GetString(":caseid")
+	info, err := c.dao.GetCaseByID(caseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCase 保存案场信息
+func (c *CaseController) SaveCase() {
+	info := model.SysCase{}
+	if err := c.ParseForm(&info); err != nil {
+		c.ResponseError(err)
+	}
+	newinfo, err := c.dao.SaveCase(info)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+//DelCase 删除案场信息
+func (c *CaseController) DelCase() {
+	caseid := c.GetString(":caseid")
+	err := c.dao.DelCase(caseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/cases/caseuser.go

@@ -0,0 +1,59 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetCaseUserByCase 根据案场获取用户信息
+func (c *CaseController) GetCaseUserByCase() {
+	caseid := c.GetString("caseid")
+
+	list, err := c.dao.GetCaseUserByCase(caseid)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetCaseUserByType 根据类型获取用户信息
+func (c *CaseController) GetCaseUserByType() {
+	usertype := c.GetString("usertype")
+	caseid := c.GetString("caseid")
+	caseuser, err := c.dao.GetCaseUserByType(caseid, usertype)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(caseuser)
+}
+
+// GetCaseUserByID 根据ID获取用户
+func (c *CaseController) GetCaseUserByID() {
+	userid := c.GetString(":userid")
+	info, err := c.dao.GetCaseUserByID(userid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCaseUser 保存案场人员
+func (c *CaseController) SaveCaseUser() {
+	user := model.SysCaseUser{}
+	if err := c.ParseForm(&user); err != nil {
+		c.ResponseError(err)
+	}
+	newUser, err := c.dao.SaveCaseUser(user)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newUser)
+}
+
+// DelCaseUser 删除案场人员
+func (c *CaseController) DelCaseUser() {
+	tagid := c.GetString(":userid")
+	err := c.dao.DelCaseUser(tagid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/cases/equipment.go

@@ -0,0 +1,50 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetEquipmentList 获取体检设备列表
+func (c *CaseController) GetEquipmentList() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+
+	list, err := c.dao.GetCaseEquipment(caseIDs, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetEquipmentByID 根据ID获取体检设备信息
+func (c *CaseController) GetEquipmentByID() {
+	id := c.GetString(":id")
+	info, err := c.dao.GetCaseEquipmentByID(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCaseEquipment 保存体检设备
+func (c *CaseController) SaveCaseEquipment() {
+	info := model.SysCaseEquipment{}
+	if err := c.ParseForm(&info); err != nil {
+		c.ResponseError(err)
+	}
+	newinfo, err := c.dao.SaveCaseEquipment(info)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+// DelCaseEquipment 删除体检设备
+func (c *CaseController) DelCaseEquipment() {
+	id := c.GetString(":id")
+	err := c.dao.DelCaseEquipment(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

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/cases/tag.go

@@ -23,5 +23,29 @@ func (c *CaseController) GetTagByID() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-	c.ResponseJSON(list)
+	c.ResponseJSON(info)
+}
+
+// SaveCaseTag 保存标签
+func (c *CaseController) SaveCaseTag() {
+	tag := model.SysTag{}
+	if err := c.ParseForm(&tag); err != nil {
+		c.ResponseError(err)
+	}
+	caseids := c.GetString("caseids")
+	newTag, err := c.dao.SaveTag(tag, caseids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newTag)
+}
+
+// DelCaseTag 删除标签
+func (c *CaseController) DelCaseTag() {
+	tagid := c.GetString(":tagid")
+	err := c.dao.DelTag(tagid)
+	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

@@ -1,7 +1,12 @@
 package cases
 
 import (
+	"jcjy/demo/models"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -19,3 +24,84 @@ func NewCaseDAO(ctx *utils.Context) *CaseDAO {
 		db:  ctx.DB,
 	}
 }
+
+// CaseInfo 案场
+type CaseInfo struct {
+	model.TaCmsCase `xorm:"extends"`
+	CreateUserName  string
+}
+
+// GetCaseList 获取案场列表
+func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]CaseInfo, error) {
+	var cases []CaseInfo
+	sql := `select a.*,b.user_name as create_user_name from sys_case a inner join sys_user b on a.create_user = b.user_id
+	 where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
+	if casename != "" {
+		sql = sql + ` and  a.case_name like '%` + casename + `%'`
+	}
+
+	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	err := m.db.Sql(sql).Find(&cases)
+	return cases, err
+}
+
+// GetCaseCount 获取案场数量
+func (m *CaseDAO) GetCaseCount(caseids, casename string) (int, error) {
+	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.Find(&cases)
+	return len(cases), err
+}
+
+// GetCaseByID 根据ID获取案场信息
+func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
+	var cases []model.SysCase
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id=?", caseid).Find(&cases)
+	if err != nil {
+		return nil, err
+	}
+	if len(cases) > 0 {
+		return &cases[0], nil
+	}
+	return nil, nil
+}
+
+// AddCase 新增案场信息
+func (m *CaseDAO) AddCase(caseinfo model.SysCase) (*model.SysCase, error) {
+	caseinfo.CreateDate = time.Now()
+	caseinfo.Status = models.STATUS_NORMAL
+	user := m.ctx.Get("user").(*model.SysUser)
+	caseinfo.CreateUser = user.UserId
+	_, err := m.db.Insert(&caseinfo)
+	return &caseinfo, err
+}
+
+// UpdateCase 修改案场信息
+func (m *CaseDAO) UpdateCase(caseinfo model.SysCase) error {
+	var cols = []string{
+		"case_name",
+		"case_desc",
+		"case_icon",
+		"case_address",
+		"case_tel",
+		"coordinate",
+	}
+	_, err := m.db.Cols(cols...).Where("case_id=?", caseinfo.CaseId).Update(caseinfo)
+	return err
+}
+
+// DelCase 删除案场信息
+func (m *CaseDAO) DelCase(caseid string) error {
+	var caseinfo = model.SysCaseUser{
+		CaseId: caseid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("case_id=?", caseid).Update(caseinfo)
+	return err
+}

models/cases/caseuser.go

@@ -0,0 +1,69 @@
+package cases
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"time"
+)
+
+// GetCaseUserByCase 根据案场id获取案场相关人员
+func (m *CaseDAO) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
+	var caseusers []model.SysCaseUser
+	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
+	return caseusers, err
+}
+
+// GetCaseUserByID 根据id获取相关人员
+func (m *CaseDAO) GetCaseUserByID(userid string) (*model.SysCaseUser, error) {
+	var caseusers []model.SysCaseUser
+	err := m.db.Where("case_user_id=?", userid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
+	if err != nil {
+		return nil, err
+	}
+	if len(caseusers) > 0 {
+		return &caseusers[0], nil
+	}
+	return nil, nil
+}
+
+// GetCaseUserByUserType 根据用户类型获取相关人员
+func (m *CaseDAO) GetCaseUserByUserType(caseid, usertype string) ([]model.SysCaseUser, error) {
+	var caseusers []model.SysCaseUser
+	err := m.db.Where("case_id=?", caseid).And("user_type=?", usertype).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
+	return caseusers, err
+}
+
+// AddCaseUser 新增案场相关人员
+func (m *CaseDAO) AddCaseUser(caseuser model.SysCaseUser) (*model.SysCaseUser, error) {
+	caseuser.CreateDate = time.Now()
+	caseuser.Status = models.STATUS_NORMAL
+	caseuser.CaseUserId = utils.GetGUID()
+	_, err := m.db.Insert(&caseuser)
+	return &caseuser, err
+}
+
+// UpdateCaseUser 修改案场相关人员
+func (m *CaseDAO) UpdateCaseUser(caseuser model.SysCaseUser) error {
+	var cols = []string{
+		"user_name",
+		"tel",
+		"user_type",
+	}
+	_, err := m.db.Cols(cols...).Where("case_user_id=?", caseuser.CaseUserId).Update(caseuser)
+	return err
+}
+
+// DelCaseUser 删除案场相关人员
+func (m *CaseDAO) DelCaseUser(caseuserid string) error {
+	var caseuser = model.SysCaseUser{
+		CaseUserId: caseuserid,
+		Status:     models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("case_user_id=?", caseuserid).Update(caseuser)
+	return err
+}

models/cases/equipment.go

@@ -0,0 +1,66 @@
+package cases
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+)
+
+// GetEquipmentList 获取体检设备
+func (m *CaseDAO) GetEquipmentList(caseids string, page, pageSize int) ([]model.SysCaseEquipment, error) {
+	var equipments []model.SysCaseEquipment
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&equipments)
+	return equipments, err
+}
+
+// GetEquipmentCount 获取体检设备总数
+func (m *CaseDAO) GetEquipmentCount(caseids string) (int, error) {
+	var caseEquipment []model.SysCaseEquipment
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&caseEquipment)
+	return len(caseEquipment), err
+}
+
+// GetCaseEquipmentByID 根据ID获取体检设备
+func (m *CaseDAO) GetCaseEquipmentByID(equipmentid string) (*model.SysCaseEquipment, error) {
+	var caseEquipment []model.SysCaseEquipment
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("spec_id=?", equipmentid).Find(&caseEquipment)
+	if err != nil {
+		return nil, err
+	}
+	if len(caseEquipment) > 0 {
+		return &caseEquipment[0], nil
+	}
+	return nil, nil
+}
+
+// AddCaseEquipment 新增体检设备
+func (m *CaseDAO) AddCaseEquipment(caseEquipment *model.SysCaseEquipment) (*model.SysCaseEquipment, error) {
+	caseEquipment.EquipmentId = utils.GetGUID()
+	caseEquipment.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(caseEquipment)
+	return caseEquipment, err
+}
+
+// UpdateCaseEquipment 修改体检设备
+func (m *CaseDAO) UpdateCaseEquipment(caseEquipment model.SysCaseEquipment) error {
+	var cols = []string{
+		"spec_name",
+	}
+	_, err := m.db.Cols(cols...).Where("spec_id=?", caseEquipment.EquipmentId).Update(caseEquipment)
+	return err
+}
+
+// DelCaseEquipment 刪除体检设备
+func (m *CaseDAO) DelCaseEquipment(equipmentid string) error {
+	var caseEquipment = model.SysCaseEquipment{
+		EquipmentId: equipmentid,
+		Status:      models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("spec_id=?", caseEquipment.EquipmentId).Update(caseEquipment)
+	return err
+}

models/cases/key.go

@@ -0,0 +1,93 @@
+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, 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 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,16 +1,18 @@
 package cases
 
 import (
-	"jcjy/demo/models"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // GetTagCount 获取标签总数
 func (m *CaseDAO) GetTagCount(caseids string) (int, error) {
 	var tags []model.SysTag
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&tags)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&tags)
 	return len(tags), err
 }
 
@@ -24,7 +26,7 @@ type TagInfo struct {
 func (m *CaseDAO) GetTagList(caseids string, page int, pageSize int) ([]TagInfo, error) {
 	var tags []TagInfo
 	sql := `select tag.*,c.case_names from sys_tag tag inner join (
-	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status= ` + strconv.Itoa(models.STATUS_NORMAL) + `
+	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
 		strings.Replace(caseids, ",", "','", -1) + `'))
 	group by b.tag_id ) c on tag.tag_id = c.tag_id`
@@ -58,3 +60,48 @@ func (m *CaseDAO) GetTagCaseByTagID(tagid string) ([]model.SysTagCase, error) {
 	err := m.db.Where("tag_id=?", tagid).Find(&tagcase)
 	return tagcase, err
 }
+
+// AddTag 新增标签
+func (m *CaseDAO) AddTag(tag model.SysTag) (*model.SysTag, error) {
+	tag.TagId = utils.GetGUID()
+	tag.Status = models.STATUS_NORMAL
+	tag.CreateDate = time.Now()
+	_, err := m.db.Insert(&tag)
+	return &tag, err
+}
+
+// UpdateTag 修改标签
+func (m *CaseDAO) UpdateTag(tag model.SysTag) error {
+	var cols = []string{
+		"tag_name",
+	}
+	_, err := m.db.Cols(cols...).Where("tag_id=?", tag.TagId).Update(tag)
+	return err
+}
+
+// DeleteTag 刪除标签
+func (m *CaseDAO) DeleteTag(tagid string) error {
+	var tag = model.SysTag{
+		TagId:  tagid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("tag_id=?", tag.TagId).Update(tag)
+	return err
+}
+
+// DelTagCase 删除标签对应的案场
+func (m *CaseDAO) DelTagCase(tagid string) error {
+	sql := "delete from sys_tag_case where tag_id='" + tagid + "'"
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// SaveTagCase 保存标签对应的案场
+func (m *CaseDAO) SaveTagCase(tagid, caseids string) error {
+	sql := `insert into sys_tag_case(tag_id,case_id) select '` + tagid + `', case_id from sys_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Exec(sql)
+	return err
+}

models/customer/customer.go

@@ -129,23 +129,23 @@ func (m *CustomerDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []str
 }
 
 // GetCaseByID 获取案场
-func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
-	if caseID == "" {
-		return nil, errors.New("获取案场信息失败")
-	}
-
-	cs := model.SysCase{}
-	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
-	if err != nil {
-		return nil, err
-	}
-
-	if !has {
-		return nil, nil
-	}
-
-	return &cs, nil
-}
+// func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
+// 	if caseID == "" {
+// 		return nil, errors.New("获取案场信息失败")
+// 	}
+
+// 	cs := model.SysCase{}
+// 	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	if !has {
+// 		return nil, nil
+// 	}
+
+// 	return &cs, nil
+// }
 
 // GetUserByID 获取系统用户
 func (m *CustomerDAO) GetUserByID(userID string) (*model.SysUser, error) {

models/goods/spec.go

@@ -4,27 +4,28 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 )
 
 // GetGoodsSpecCount 获取商品规格总数
 func (m *GoodsDAO) GetGoodsSpecCount(caseids string) (int, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
 	return len(goodsSpec), err
 }
 
 // GetGoodsSpec 根据案场获取商品规格
 func (m *GoodsDAO) GetGoodsSpec(caseids string, page int, pageSize int) ([]model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
 	return goodsSpec, err
 }
 
 // GetGoodsSpecByID 根据ID获取商品规格
 func (m *GoodsDAO) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("spec_id=?", specid).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("spec_id=?", specid).Find(&goodsSpec)
 	if err != nil {
 		return nil, err
 	}

models/goods/type.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -11,21 +12,21 @@ import (
 // GetGoodsTypeCount 获取商品类型总数
 func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
 	return len(goodstype), err
 }
 
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
+	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(&goodstype)
 	return goodstype, err
 }
 
 // GetGoodsTypeByID 根据ID获取商品类型
 func (m *GoodsDAO) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("type_id=?", typeid).Find(&goodstype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("type_id=?", typeid).Find(&goodstype)
 	if err != nil {
 		return nil, err
 	}
@@ -40,7 +41,9 @@ func (m *GoodsDAO) AddGoodsType(goodsType *model.TdGoodsType) (*model.TdGoodsTyp
 	goodsType.TypeId = utils.GetGUID()
 	goodsType.CreateDate = time.Now()
 	goodsType.Status = models.STATUS_NORMAL
-	_, err := m.db.Insert(goodsType)
+	user := m.ctx.Get("user").(*model.SysUser)
+	goodsType.CreateUser = user.UserId
+	_, err := m.db.Insert(&goodsType)
 	return goodsType, err
 }
 

models/message/cmscase.go

@@ -80,7 +80,7 @@ func (m *MessageDAO) GetCoursesByCmsCase(cmscaseid string) ([]model.TaCourse, er
 // GetCmsCaseImgs 根据项目专题ID获取课程图片
 func (m *MessageDAO) GetCmsCaseImgs(cmscaseid string) ([]model.TaCmsCaseImage, error) {
 	var imgs []model.TaCmsCaseImage
-	err := m.db.Where("cms_case_id=?", cmscaseid).And("status=?", models.STATUS_NORMAL).Find(&imgs)
+	err := m.db.Where("cms_case_id=?", cmscaseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&imgs)
 	return imgs, err
 }
 
@@ -95,6 +95,8 @@ func (m *MessageDAO) GetCourseByCaseID(caseid string) ([]model.TaCourse, error)
 func (m *MessageDAO) AddCmsCase(cmscase model.TaCmsCase) (*model.TaCmsCase, error) {
 	cmscase.CreateDate = time.Now()
 	cmscase.CmsCaseId = utils.GetGUID()
+	user := m.ctx.Get("user").(model.SysUser)
+	cmscase.CreateUser = user.UserId
 	_, err := m.db.Insert(cmscase)
 	return &cmscase, err
 }
@@ -134,7 +136,7 @@ func (m *MessageDAO) DelCmsCaseCourse(cmscaseid string) error {
 
 // SaveCmsCaseCourse 保存项目对应的课程
 func (m *MessageDAO) SaveCmsCaseCourse(cmscaseid, courseids string) error {
-	sql := `insert into ta_cms_case_course(cms_case_id,course_id) select '` + cmscaseid + `', course_id from ta_course where course_id in ('` + strings.Replace(courseids, ",", "','", -1) + `') and status = ` + strconv.Itoa(models.STATUS_NORMAL)
+	sql := `insert into ta_cms_case_course(cms_case_id,course_id) select '` + cmscaseid + `', course_id from ta_course where course_id in ('` + strings.Replace(courseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/message/image.go

@@ -4,20 +4,21 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 )
 
 // GetImgList 获取轮播图列表
 func (m *MessageDAO) GetImgList(orgid string, page int, pageSize int) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
 	return imgs, err
 }
 
 // GetImgListCount 获取轮播图count
 func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Find(&imgs)
 	if err != nil {
 		return 0, err
 	}
@@ -27,7 +28,7 @@ func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 // GetImgByLocation 根据位置获取轮播图信息
 func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
 	return imgs, err
 }
 
@@ -35,7 +36,7 @@ func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsIm
 func (m *MessageDAO) GetImgByID(imgid string) (*model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
 
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("image_id=?", imgid).Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("image_id=?", imgid).Find(&imgs)
 	if err != nil {
 		return nil, err
 	}
@@ -50,6 +51,8 @@ func (m *MessageDAO) AddCmsImg(info model.TaCmsImages) (*model.TaCmsImages, erro
 	info.ImageId = utils.GetGUID()
 	info.Status = models.STATUS_NORMAL
 	info.CreateDate = time.Now()
+	user := m.ctx.Get("user").(model.SysUser)
+	info.CreateUser = user.UserId
 	_, err := m.db.Insert(&info)
 	return &info, err
 }

models/message/location.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 )
 
 const (
@@ -13,7 +14,7 @@ const (
 // GetLocationList 获取位置字典
 func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLocation, error) {
 	var locations []model.TdCmsImageLocation
-	s := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", org_id)
+	s := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", org_id)
 	if issys != "" {
 		s = s.And("is_sys=?", issys)
 	}
@@ -24,7 +25,7 @@ func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLo
 // GetLocationById 根据ID获取明细
 func (m *MessageDAO) GetLocationById(id string) (*model.TdCmsImageLocation, error) {
 	var location []model.TdCmsImageLocation
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("location_id=?", id).Find(&location)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("location_id=?", id).Find(&location)
 	if err != nil {
 		return nil, err
 	}

models/message/message.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 
 	"github.com/go-xorm/xorm"
@@ -27,7 +28,7 @@ func NewMessageDAO(ctx *utils.Context) *MessageDAO {
 func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int) ([]model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if title != "" {
 		dao.And("info_name like '%" + title + "%'")
 	}
@@ -40,7 +41,7 @@ func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int)
 func (m *MessageDAO) GetCmsInfoListCount(title, orgid string) (int, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if title != "" {
 		dao.And("info_name like '%" + title + "%'")
 	}
@@ -56,14 +57,14 @@ func (m *MessageDAO) GetCmsInfoListCount(title, orgid string) (int, error) {
 func (m *MessageDAO) GetCmsInfoByLocation(locationid, orgid string) ([]model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Find(&cmsinfos)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Find(&cmsinfos)
 	return cmsinfos, err
 }
 
 // GetCmsInfoByID 获取单条消息记录
 func (m *MessageDAO) GetCmsInfoByID(id string) (*model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("info_id=?", id).Find(&cmsinfos)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("info_id=?", id).Find(&cmsinfos)
 	if err != nil {
 		return nil, err
 	}
@@ -75,6 +76,8 @@ func (m *MessageDAO) AddCmsInfo(cmsinfo model.TaCmsInfo) (*model.TaCmsInfo, erro
 	cmsinfo.InfoId = utils.GetGUID()
 	cmsinfo.Status = models.STATUS_NORMAL
 	cmsinfo.CreateDate = time.Now()
+	user := m.ctx.Get("user").(model.SysUser)
+	cmsinfo.CreateUser = user.UserId
 	_, err := m.db.Insert(&cmsinfo)
 	return &cmsinfo, err
 }

models/message/news.go

@@ -23,7 +23,7 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 	var news []CmsNewsInfo
 	sql := `select * from ta_cms_news new left join (
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
-		from td_cms_image_location a inner join ta_cms_location b on a.location_id=b.location_id and a.status=` + strconv.Itoa(models.STATUS_NORMAL) +
+		from td_cms_image_location a inner join ta_cms_location b on a.location_id=b.location_id and a.status>` + strconv.Itoa(models.STATUS_DEL) +
 		` and b.org_id='` + orgid + `' group by b.news_id
 		) c on new.news_id = c.news_id and new.status>` + strconv.Itoa(models.STATUS_DEL) + ` and new.org_id='` + orgid + `'`
 
@@ -54,7 +54,7 @@ func (m *MessageDAO) GetNewsListCount(locationid, orgid string) (int, error) {
 // GetNewsByLocation 根据位置获取咨询信息
 func (m *MessageDAO) GetNewsByLocation(locationid, orgid string) ([]model.TaCmsNews, error) {
 	var news []model.TaCmsNews
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
 	return news, err
 }
 
@@ -88,6 +88,8 @@ func (m *MessageDAO) GetNewsLocationByID(newsid string) ([]model.TaCmsLocation,
 func (m *MessageDAO) AddNews(news model.TaCmsNews) (*model.TaCmsNews, error) {
 	news.NewsId = utils.GetGUID()
 	news.CreateDate = time.Now()
+	user := m.ctx.Get("user").(*model.SysUser)
+	news.CreateUser = user.UserId
 	_, err := m.db.Insert(&news)
 	return &news, err
 }
@@ -101,7 +103,7 @@ func (m *MessageDAO) DelNewsLocation(newsid string) error {
 
 // SaveNewsLocation 保存咨询与位置映射
 func (m *MessageDAO) SaveNewsLocation(newsid, locationsid string) error {
-	sql := `insert into ta_cms_location(location_id,news_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status = ` + strconv.Itoa(models.STATUS_NORMAL)
+	sql := `insert into ta_cms_location(location_id,news_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/model/sys_case_user.go

@@ -5,12 +5,14 @@ import (
 )
 
 type SysCaseUser struct {
-	CaseUserId string    `xorm:"not null pk VARCHAR(64)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	UserName   string    `xorm:"VARCHAR(50)"`
-	Tel        string    `xorm:"VARCHAR(50)"`
-	UserType   string    `xorm:"comment('案场管理员 咖啡师 消息收发员') VARCHAR(20)"`
+	CaseUserId string `xorm:"not null pk VARCHAR(64)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	UserName   string `xorm:"VARCHAR(50)"`
+	Tel        string `xorm:"VARCHAR(50)"`
+	UserType   string `xorm:"comment('案场管理员
+            咖啡师
+            消息收发员') VARCHAR(20)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/sys_wechat_conf.go

@@ -3,7 +3,8 @@ package model
 type SysWechatConf struct {
 	ConfId string `xorm:"VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
-	Type   int    `xorm:"comment('wechat 微信公众号  mini 小程序') SMALLINT(6)"`
+	Type   int    `xorm:"comment('wechat 微信公众号
+            mini 小程序') SMALLINT(6)"`
 	Appid  string `xorm:"VARCHAR(50)"`
 	Secret string `xorm:"VARCHAR(50)"`
 	Token  string `xorm:"VARCHAR(50)"`

models/model/ta_account_change.go

@@ -5,19 +5,25 @@ import (
 )
 
 type TaAccountChange struct {
-	DetailId     string    `xorm:"not null pk VARCHAR(64)"`
-	AccountId    string    `xorm:"VARCHAR(64)"`
-	UserId       string    `xorm:"VARCHAR(64)"`
-	UserName     string    `xorm:"VARCHAR(50)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	ChangeType   string    `xorm:"comment('integral 积分  amount 城币') VARCHAR(20)"`
-	ChangeSource string    `xorm:"comment('vip vip卡充值  orders 订单消费  register 注册  perfect 完善资料  recommend 推荐') VARCHAR(20)"`
-	SourceId     string    `xorm:"VARCHAR(64)"`
-	SourceName   string    `xorm:"VARCHAR(255)"`
-	Amount       float32   `xorm:"FLOAT(8,2)"`
-	FloatType    string    `xorm:"comment('+  -') VARCHAR(5)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
+	DetailId   string `xorm:"not null pk VARCHAR(64)"`
+	AccountId  string `xorm:"VARCHAR(64)"`
+	UserId     string `xorm:"VARCHAR(64)"`
+	UserName   string `xorm:"VARCHAR(50)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	ChangeType string `xorm:"comment('integral 积分
+            amount 城币') VARCHAR(20)"`
+	ChangeSource string `xorm:"comment('vip vip卡充值
+            orders 订单消费
+            register 注册
+            perfect 完善资料
+            recommend 推荐') VARCHAR(20)"`
+	SourceId   string  `xorm:"VARCHAR(64)"`
+	SourceName string  `xorm:"VARCHAR(255)"`
+	Amount     float32 `xorm:"FLOAT(8,2)"`
+	FloatType  string  `xorm:"comment('+
+            -') VARCHAR(5)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	Status     int       `xorm:"SMALLINT(6)"`
 }

models/model/ta_case_key.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseKey struct {
+	KeyId      string    `xorm:"not null pk VARCHAR(64)"`
+	LockNum    string    `xorm:"VARCHAR(50)"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+}

models/model/ta_case_key_use.go

@@ -0,0 +1,15 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseKeyUse struct {
+	UseId        string    `xorm:"not null pk VARCHAR(64)"`
+	KeyId        string    `xorm:"VARCHAR(64)"`
+	CustomerId   string    `xorm:"VARCHAR(64)"`
+	CustomerName string    `xorm:"VARCHAR(50)"`
+	UseDate      time.Time `xorm:"DATETIME"`
+	ReturnDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_cms_case_image.go

@@ -5,6 +5,7 @@ type TaCmsCaseImage struct {
 	CmsCaseId      string `xorm:"VARCHAR(64)"`
 	CaseImageUrl   string `xorm:"TEXT"`
 	Status         int    `xorm:"SMALLINT(6)"`
-	ImageType      string `xorm:"comment('cover：封面  detail：详情') VARCHAR(32)"`
-	Sort           int    `xorm:"INT(11)"`
+	ImageType      string `xorm:"comment('cover：封面
+            detail：详情') VARCHAR(32)"`
+	Sort int `xorm:"INT(11)"`
 }

models/model/ta_coupon_card.go

@@ -0,0 +1,28 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCouponCard struct {
+	CardId           string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId       string    `xorm:"VARCHAR(64)"`
+	SendType         int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	VideoUrl         string    `xorm:"TEXT"`
+	CoverUrl         string    `xorm:"TEXT"`
+	Price            float32   `xorm:"FLOAT(64)"`
+	StartDate        time.Time `xorm:"DATETIME"`
+	EndDate          time.Time `xorm:"DATETIME"`
+	ShareDescription string    `xorm:"VARCHAR(255)"`
+	RuleDescription  string    `xorm:"VARCHAR(400)"`
+	UseDescription   string    `xorm:"TEXT"`
+	TotalCount       int       `xorm:"INT(11)"`
+	SentCount        int       `xorm:"INT(11)"`
+	UsedCount        int       `xorm:"INT(11)"`
+	Status           int       `xorm:"comment('0未发布 1发布 2过期') SMALLINT(6)"`
+	CaseId           string    `xorm:"VARCHAR(64)"`
+	OrgId            string    `xorm:"VARCHAR(64)"`
+	CreateDate       time.Time `xorm:"DATETIME"`
+	CreateUser       string    `xorm:"VARCHAR(64)"`
+	IsOver           int       `xorm:"TINYINT(1)"`
+}

models/model/ta_customer.go

@@ -17,5 +17,4 @@ type TaCustomer struct {
 	RecommendName string    `xorm:"VARCHAR(50)"`
 	CreateDate    time.Time `xorm:"DATETIME"`
 	Status        int       `xorm:"SMALLINT(6)"`
-	UserId        string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_experience_card.go

@@ -0,0 +1,25 @@
+package model
+
+import (
+	"time"
+)
+
+type TaExperienceCard struct {
+	CardId     string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId string    `xorm:"VARCHAR(64)"`
+	SendType   string    `xorm:"comment('0案场 1渠道') VARCHAR(32)"`
+	VideoUrl   string    `xorm:"TEXT"`
+	CoverUrl   string    `xorm:"TEXT"`
+	Price      float32   `xorm:"FLOAT(64)"`
+	StartDate  time.Time `xorm:"DATETIME"`
+	EndDate    time.Time `xorm:"DATETIME"`
+	TotalCount int       `xorm:"INT(11)"`
+	SentCount  int       `xorm:"INT(11)"`
+	UsedCount  int       `xorm:"INT(11)"`
+	Status     string    `xorm:"comment('private未发布 public发布 over过期') VARCHAR(32)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	IsOver     int       `xorm:"TINYINT(1)"`
+}

models/model/ta_goods_orders.go

@@ -5,24 +5,25 @@ import (
 )
 
 type TaGoodsOrders struct {
-	OrdersId     string    `xorm:"not null pk VARCHAR(64)"`
-	OrdersNo     string    `xorm:"VARCHAR(32)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	AreaId       string    `xorm:"VARCHAR(64)"`
-	AreaName     string    `xorm:"VARCHAR(50)"`
-	TableId      string    `xorm:"VARCHAR(64)"`
-	TableName    string    `xorm:"VARCHAR(50)"`
-	Amount       string    `xorm:"DECIMAL(8,2)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	PayType      int       `xorm:"comment('vip VIP卡城币抵用 coupon 优惠券抵用') SMALLINT(6)"`
-	UserType     int       `xorm:"SMALLINT(6)"`
-	UserId       string    `xorm:"VARCHAR(64)"`
-	UserName     string    `xorm:"VARCHAR(50)"`
-	OrdersNum    int       `xorm:"INT(11)"`
-	Remark       string    `xorm:"TEXT"`
-	IsPay        int       `xorm:"TINYINT(1)"`
-	ActualAmount string    `xorm:"DECIMAL(8,2)"`
-	CouponAmount string    `xorm:"DECIMAL(8,2)"`
+	OrdersId   string    `xorm:"not null pk VARCHAR(64)"`
+	OrdersNo   string    `xorm:"VARCHAR(32)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	AreaId     string    `xorm:"VARCHAR(64)"`
+	AreaName   string    `xorm:"VARCHAR(50)"`
+	TableId    string    `xorm:"VARCHAR(64)"`
+	TableName  string    `xorm:"VARCHAR(50)"`
+	Amount     string    `xorm:"DECIMAL(8,2)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	PayType    int       `xorm:"comment('vip VIP卡城币抵用
+            coupon 优惠券抵用') SMALLINT(6)"`
+	UserType     int    `xorm:"SMALLINT(6)"`
+	UserId       string `xorm:"VARCHAR(64)"`
+	UserName     string `xorm:"VARCHAR(50)"`
+	OrdersNum    int    `xorm:"INT(11)"`
+	Remark       string `xorm:"TEXT"`
+	IsPay        int    `xorm:"TINYINT(1)"`
+	ActualAmount string `xorm:"DECIMAL(8,2)"`
+	CouponAmount string `xorm:"DECIMAL(8,2)"`
 }

models/model/ta_user_mapping.go

@@ -1,10 +1,12 @@
 package model
 
 type TaUserMapping struct {
-	MappingId   string `xorm:"not null pk VARCHAR(64)"`
-	UserId      string `xorm:"VARCHAR(64)"`
-	UserType    string `xorm:"comment('customer 为会员  user 为后台用户') VARCHAR(50)"`
-	AccountType string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(50)"`
+	MappingId string `xorm:"not null pk VARCHAR(64)"`
+	UserId    string `xorm:"VARCHAR(64)"`
+	UserType  string `xorm:"comment('customer 为会员
+            user 为后台用户') VARCHAR(50)"`
+	AccountType string `xorm:"comment('wechat 微信公众号
+            mini 小程序') VARCHAR(50)"`
 	Openid      string `xorm:"VARCHAR(200)"`
 	Uuid        string `xorm:"VARCHAR(200)"`
 	AccountInfo string `xorm:"TEXT"`

models/system/case.go

@@ -1,35 +0,0 @@
-package system
-
-import (
-	"spaceofcheng/services/models/model"
-	"spaceofcheng/services/utils"
-
-	"github.com/go-xorm/xorm"
-)
-
-// CaseDAO 当前数据库操作对象
-type CaseDAO struct {
-	ctx *utils.Context
-	db  *xorm.Session
-}
-
-// NewCaseDAO New Inst
-func NewCaseDAO(ctx *utils.Context) *CaseDAO {
-	return &CaseDAO{
-		ctx: ctx,
-		db:  ctx.DB,
-	}
-}
-
-// GetCaseByID 根据ID获取案场信息
-func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
-	var cases []model.SysCase
-	err := m.db.Where("case_id=?", caseid).Find(&cases)
-	if err != nil {
-		return nil, err
-	}
-	if len(cases) > 0 {
-		return &cases[0], nil
-	}
-	return nil, nil
-}

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,6 +72,48 @@ 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", &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/cases.go

@@ -2,6 +2,8 @@ package cases
 
 import (
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 )
 
@@ -18,3 +20,50 @@ func NewCaseServ(ctx *utils.Context) *CaseServ {
 		dao: cases.NewCaseDAO(ctx),
 	}
 }
+
+// GetCases 获取案场列表
+func (s *CaseServ) GetCases(caseids, casename string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	cases, err := s.dao.GetCaseList(caseids, casename, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetCaseCount(caseids, casename)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     cases,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCaseByID 根据案场id获取案场
+func (s *CaseServ) GetCaseByID(caseid string) (*model.SysCase, error) {
+	caseinfo, err := s.dao.GetCaseByID(caseid)
+	return caseinfo, err
+}
+
+// SaveCase 保存案场
+func (s *CaseServ) SaveCase(caseinfo model.SysCase) (*model.SysCase, error) {
+	var newInfo *model.SysCase
+	var err error
+	if caseinfo.CaseId == "" {
+		newInfo, err = s.dao.AddCase(caseinfo)
+	} else {
+		err = s.dao.UpdateCase(caseinfo)
+		newInfo = &caseinfo
+	}
+	return newInfo, err
+}
+
+// DelCase 删除案场
+func (s *CaseServ) DelCase(caseid string) error {
+	err := s.dao.DelCase(caseid)
+	return err
+}

service/cases/caseuser.go

@@ -0,0 +1,40 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetCaseUserByCase 根据案场id获取案场相关人员信息
+func (s *CaseServ) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
+	caseusers, err := s.dao.GetCaseUserByCase(caseid)
+	return caseusers, err
+}
+
+// GetCaseUserByType 根据类型获取人员
+func (s *CaseServ) GetCaseUserByType(caseid, usertype string) ([]model.SysCaseUser, error) {
+	caseusers, err := s.dao.GetCaseUserByUserType(caseid, usertype)
+	return caseusers, err
+}
+
+// GetCaseUserByID 根据ID获取人员
+func (s *CaseServ) GetCaseUserByID(userid string) (*model.SysCaseUser, error) {
+	caseuser, err := s.dao.GetCaseUserByID(userid)
+	return caseuser, err
+}
+
+// SaveCaseUser 保存人员信息
+func (s *CaseServ) SaveCaseUser(caseuser model.SysCaseUser) (*model.SysCaseUser, error) {
+	var newInfo *model.SysCaseUser
+	var err error
+	if caseuser.CaseUserId == "" {
+		newInfo, err = s.dao.AddCaseUser(caseuser)
+	} else {
+		err = s.dao.UpdateCaseUser(caseuser)
+		newInfo = &caseuser
+	}
+	return newInfo, err
+}
+
+// DelCaseUser 删除人员信息
+func (s *CaseServ) DelCaseUser(userid string) error {
+	err := s.dao.DelCaseUser(userid)
+	return err
+}

service/cases/equipment.go

@@ -0,0 +1,51 @@
+package cases
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// GetCaseEquipment 获取体检设备
+func (s *CaseServ) GetCaseEquipment(caseids string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	specs, err := s.dao.GetEquipmentList(caseids, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetEquipmentCount(caseids)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     specs,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCaseEquipmentByID 根据ID获取体检设备
+func (s *CaseServ) GetCaseEquipmentByID(equipmentid string) (*model.SysCaseEquipment, error) {
+	equipment, err := s.dao.GetCaseEquipmentByID(equipmentid)
+	return equipment, err
+}
+
+// SaveCaseEquipment 保存体检设备
+func (s *CaseServ) SaveCaseEquipment(equipment model.SysCaseEquipment) (*model.SysCaseEquipment, error) {
+	var err error
+	if equipment.EquipmentId == "" {
+		_, err = s.dao.AddCaseEquipment(&equipment)
+	} else {
+		err = s.dao.UpdateCaseEquipment(equipment)
+	}
+	return &equipment, err
+}
+
+// DelCaseEquipment 删除体检设备
+func (s *CaseServ) DelCaseEquipment(equipmentid string) error {
+	err := s.dao.DelCaseEquipment(equipmentid)
+	return err
+}

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/cases/tag.go

@@ -2,6 +2,7 @@ package cases
 
 import (
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 )
 
@@ -42,3 +43,33 @@ func (s *CaseServ) GetTagByID(tagid string) (*cases.Tag, error) {
 	}
 	return tag, err
 }
+
+// SaveTag 保存标签
+func (s *CaseServ) SaveTag(tag model.SysTag, caseids string) (*model.SysTag, error) {
+	var newInfo *model.SysTag
+	var err error
+	if tag.TagId == "" {
+		newInfo, err = s.dao.AddTag(tag)
+	} else {
+		err = s.dao.UpdateTag(tag)
+		newInfo = &tag
+	}
+	if err != nil {
+		return nil, err
+	}
+	err = s.dao.DelTagCase(newInfo.TagId)
+	if err != nil {
+		return nil, err
+	}
+	err = s.dao.SaveTagCase(newInfo.TagId, caseids)
+	if err != nil {
+		return nil, err
+	}
+	return newInfo, err
+}
+
+// DelTag 删除标签
+func (s *CaseServ) DelTag(tagid string) error {
+	err := s.dao.DeleteTag(tagid)
+	return err
+}

service/customer/customer.go

@@ -3,6 +3,7 @@ package customer
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/events"
@@ -12,15 +13,17 @@ import (
 
 // CustomerServ 系统处理
 type CustomerServ struct {
-	ctx *utils.Context
-	dao *customer.CustomerDAO
+	ctx     *utils.Context
+	dao     *customer.CustomerDAO
+	casedao *cases.CaseDAO
 }
 
 // NewCustomerServ 初始化
 func NewCustomerServ(ctx *utils.Context) *CustomerServ {
 	return &CustomerServ{
-		ctx: ctx,
-		dao: customer.NewCustomerDAO(ctx),
+		ctx:     ctx,
+		dao:     customer.NewCustomerDAO(ctx),
+		casedao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -188,7 +191,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 
 	// 校验案场信息
 	if caseID != "" {
-		cs, err := s.dao.GetCaseByID(caseID)
+		cs, err := s.casedao.GetCaseByID(caseID)
 		if err != nil {
 			return nil, err
 		}
@@ -225,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
+}

service/user.go

@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -14,7 +15,7 @@ import (
 type UserServ struct {
 	ctx     *utils.Context
 	dao     *system.UserDAO
-	casedao *system.CaseDAO
+	casedao *cases.CaseDAO
 }
 
 // NewUserServ 初始化
@@ -22,7 +23,7 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 	return &UserServ{
 		ctx:     ctx,
 		dao:     system.NewUserDAO(ctx),
-		casedao: system.NewCaseDAO(ctx),
+		casedao: cases.NewCaseDAO(ctx),
 	}
 }