0821PM

models/cases/area.go

 // 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)
+	sql := `select * from sys_case_area where status>` + strconv.Itoa(models.STATUS_DEL) + ` and case_id ='` + caseid + `'`
+	err := m.db.Sql(sql).Find(&sql)
+	// err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id =?", caseid).Table("sys_case_area").Find(&areas)
 	return areas, err
 }
 

models/cases/key.go

 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
 	}
 
 	offset := (page - 1) * pageSize
-	query += " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
+	query += " order by lock_num asc LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
 
 	err := m.db.SQL(query, models.STATUS_NORMAL, caseid, models.STATUS_DEL).Find(&keys)
 	return keys, err
 }
 
 // GetKeysCountByCase 根据案场获取钥匙数量
-func (m *CaseDAO) GetKeysCountByCase(caseid string) (int, error) {
+func (m *CaseDAO) GetKeysCountByCase(caseid, num string) (int, error) {
 	var keys []model.TaCaseKey
-	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&keys)
+	dao := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL))
+	if num != "" {
+		dao.And("num like '%" + num + "%'")
+	}
+	err := dao.Find(&keys)
 	return len(keys), err
 }
 
 // AddKey 新增单个钥匙信息
 func (m *CaseDAO) AddKey(key model.TaCaseKey) (*model.TaCaseKey, error) {
 	key.KeyId = utils.GetGUID()
-	key.Status = models.STATUS_NORMAL
+	key.Status = STATUS_UNLOCK
 	key.CreateDate = time.Now()
 	_, err := m.db.Insert(key)
 	return &key, err
 	_, err := m.db.Exec(sql)
 	return err
 }
+
+// GetKeyByNumRange 根据区间获取钥匙
+func (m *CaseDAO) GetKeyByNumRange(caseid, nums string) ([]model.TaCaseKey, error) {
+	var keys []model.TaCaseKey
+	sql := `select * from ta_case_key where status>` + strconv.Itoa(models.STATUS_DEL) + `
+	and case_id='` + caseid + `' and lock_num in ('` + strings.Replace(nums, ",", "','", -1) + `')`
+
+	err := m.db.Sql(sql).Find(keys)
+	return keys, err
+}

models/cases/table.go

 	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 ('` +
+	where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and b.status>` + strconv.Itoa(models.STATUS_DEL) +
+		` and c.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` +
 		strings.Replace(caseids, ",", "','", -1) + `')`
 
 	err := m.db.Sql(sql).Find(&tables)

models/cases/tag.go

 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // GetTagCount 获取标签总数
 func (m *CaseDAO) GetTagCount(caseids string) (int, error) {
-	var tags []model.SysTag
-	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&tags)
+	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_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 where tag.status>` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&tags)
+
 	return len(tags), err
 }
 
 // TagInfo 标签
 type TagInfo struct {
-	model.TaCmsCase `xorm:"extends"`
-	CaseNames       string
+	model.SysTag `xorm:"extends"`
+	CaseNames    string
 }
 
 // GetTagList 根据案场获取标签
 func (m *CaseDAO) GetTagList(caseids string, page int, pageSize int) ([]TagInfo, error) {
 	var tags []TagInfo
+	offset := (page - 1) * pageSize
 	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_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`
+	group by b.tag_id ) c on tag.tag_id = c.tag_id where tag.status>` + strconv.Itoa(models.STATUS_DEL) + ` LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
 
-	err := m.db.Sql(sql).Find(tags)
+	err := m.db.Sql(sql).Find(&tags)
 	return tags, err
 }
 
 
 // DeleteTag 刪除标签
 func (m *CaseDAO) DeleteTag(tagid string) error {
+	beego.Error(tagid)
 	var tag = model.SysTag{
 		TagId:  tagid,
 		Status: models.STATUS_DEL,

models/message/cmscase.go

 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/builder"
 )
 
 func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int) ([]CmsCaseInfo, error) {
 	var cases []CmsCaseInfo
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	where a.org_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa((page+1)*pageSize)
-
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }
 func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]model.TaCmsCase, error) {
 	var cases []model.TaCmsCase
 	err := m.db.Where("org_id=?", orgid).Find(&cases)
+	beego.Error(cases)
 	return cases, err
 }
 
 // GetCmsCaseByID 获取项目专题详情
 func (m *MessageDAO) GetCmsCaseByID(cmscaseid string) (*CmsCase, error) {
 	var cases []CmsCase
-	err := m.db.Table("ta_cms_case").Where("cms_case_id=?", cmscaseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&cases)
+	sql := `select * from ta_cms_case where cms_case_id='` + cmscaseid + `' and status>` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&cases)
+	// err := m.db.Table("ta_cms_case").Where("cms_case_id=?", cmscaseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&cases)
 	if err != nil {
+		beego.Error(err)
 		return nil, err
 	}
 	if len(cases) > 0 {

models/message/image.go

 		"forward_resource_id",
 		"sort",
 		"title",
+		"location_id",
+		"status",
 	}
 	_, err := m.db.Cols(cols...).Where("image_id=?", img.ImageId).Update(img)
 	return err

models/message/message.go

 func (m *MessageDAO) UpdateCmsInfo(cmsinfo model.TaCmsInfo) error {
 	var cols = []string{
 		"info_name",
+		"info_url",
+		"location_id",
+		"case_id",
 	}
 	_, err := m.db.Cols(cols...).Where("info_id=?", cmsinfo.InfoId).Update(cmsinfo)
 	return err

models/message/news.go

 	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_DEL) +
-		` and b.org_id='` + orgid + `' group by b.news_id
+		` and a.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 + `'`
 
 	if locationid != "" {
 	}
 
 	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
-
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 }

routers/common.go

 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
 
+		// tag 标签
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "get:GetTagList"),
+		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "get:GetTagByID"),
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "post:SaveCaseTag"),
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "put:SaveCaseTag"),
+		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "delete:DelCaseTag"),
+
 		// caseuser 案场人员
 		beego.NSRouter("/case/user", &cases.CaseController{}, "get:GetCaseUserByCase"),
 		beego.NSRouter("/case/userbytype", &cases.CaseController{}, "get:GetCaseUserByType"),

service/cases/area.go

 	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 // SaveCaseArea 保存区域
 func (s *CaseServ) SaveCaseArea(area model.SysCaseArea) (*model.SysCaseArea, error) {
 	var err error
+	if area.AreaName == "" {
+		return nil, utils.LogError("区域名称不能为空！")
+	}
+
 	if area.AreaId == "" {
 		_, err = s.dao.AddCaseArea(&area)
 	} else {

service/cases/cases.go

 func (s *CaseServ) SaveCase(caseinfo model.SysCase) (*model.SysCase, error) {
 	var newInfo *model.SysCase
 	var err error
+	if caseinfo.CaseName == "" {
+		return nil, utils.LogError("案场名称不能为空！")
+	}
+	if caseinfo.Coordinate == "" {
+		return nil, utils.LogError("案场经纬度不能为空！")
+	}
+
 	if caseinfo.CaseId == "" {
 		newInfo, err = s.dao.AddCase(caseinfo)
 		if err != nil {

service/cases/caseuser.go

 package cases
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+)
 
 // GetCaseUserByCase 根据案场id获取案场相关人员信息
 func (s *CaseServ) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
 func (s *CaseServ) SaveCaseUser(caseuser model.SysCaseUser) (*model.SysCaseUser, error) {
 	var newInfo *model.SysCaseUser
 	var err error
+	if caseuser.UserName == "" {
+		return nil, utils.LogError("人员名称不能为空！")
+	}
+	if caseuser.UserType == "" {
+		return nil, utils.LogError("人员类型不能为空！")
+	}
+	if caseuser.Tel == "" {
+		return nil, utils.LogError("人员电话不能为空！")
+	}
 	if caseuser.CaseUserId == "" {
 		newInfo, err = s.dao.AddCaseUser(caseuser)
 	} else {

service/cases/equipment.go

 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 // SaveCaseEquipment 保存体检设备
 func (s *CaseServ) SaveCaseEquipment(equipment model.SysCaseEquipment) (*model.SysCaseEquipment, error) {
 	var err error
+	if equipment.Name == "" {
+		return nil, utils.LogError("体检设备名称不能为空！")
+	}
 	if equipment.EquipmentId == "" {
 		_, err = s.dao.AddCaseEquipment(&equipment)
 	} else {

service/cases/key.go

 package cases
 
 import (
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 
 	"github.com/astaxie/beego"
 )
 			isdict = true
 		}
 	}
+
 	if !isdict {
 		return nil, utils.LogError("您没有该案场的权限！")
 	}
 		return nil, err
 	}
 
-	total, err := s.dao.GetCaseCount(caseid, num)
+	total, err := s.dao.GetKeysCountByCase(caseid, num)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 			beego.Error(err)
 			return nil, err
 		}
-		keys[index].CustomerId = use.CustomerId
-		keys[index].CustomerName = use.CustomerName
+		if use != nil {
+			keys[index].CustomerId = use.CustomerId
+			keys[index].CustomerName = use.CustomerName
+		}
 	}
 
 	return map[string]interface{}{
 
 	for i := beginnum; i <= endnum; i++ {
 		key := model.TaCaseKey{
-			OrgId:   orgid,
-			CaseId:  caseid,
-			LockNum: strconv.Itoa(i),
+			OrgId:      orgid,
+			CaseId:     caseid,
+			LockNum:    strconv.Itoa(i),
+			KeyId:      utils.GetGUID(),
+			Status:     cases.STATUS_UNLOCK,
+			CreateDate: time.Now(),
 		}
 		_, err := s.dao.AddKey(key)
 		if err != nil {

service/cases/table.go

 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 // SaveCaseTable 保存桌位
 func (s *CaseServ) SaveCaseTable(table model.SysCaseTable) (*model.SysCaseTable, error) {
 	var err error
+	if table.TableNo == "" {
+		return nil, utils.LogError("桌位名称不能为空")
+	}
 	if table.TableId == "" {
 		_, err = s.dao.AddCaseTable(&table)
 	} else {

service/cases/tag.go

 	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 func (s *CaseServ) SaveTag(tag model.SysTag, caseids string) (*model.SysTag, error) {
 	var newInfo *model.SysTag
 	var err error
+	if tag.TagName == "" {
+		return nil, utils.LogError("标签名称不能为空！")
+	}
+	if caseids == "" {
+		return nil, utils.LogError("案场不能为空！")
+	}
 	if tag.TagId == "" {
 		newInfo, err = s.dao.AddTag(tag)
 	} else {

service/message/cmscase.go

 	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 	"strings"
 
 	"github.com/astaxie/beego"
 func (s *MessageServ) SaveCmsCase(cmscase model.TaCmsCase, courseids, imgs, detailimgs string) (*model.TaCmsCase, error) {
 	var newInfo *model.TaCmsCase
 	var err error
+	if cmscase.Name == "" {
+		return nil, utils.LogError("项目名称不能为空！")
+	}
+
+	if cmscase.Title == "" {
+		return nil, utils.LogError("项目标题不能为空！")
+	}
+
 	if cmscase.CmsCaseId == "" {
 		newInfo, err = s.dao.AddCmsCase(cmscase)
 	} else {

service/message/news.go

 package message
 
 import (
+	"errors"
 	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 func (s *MessageServ) SaveNews(news model.TaCmsNews, locationids string) (*model.TaCmsNews, error) {
 	var newInfo *model.TaCmsNews
 	var err error
+	if news.Title == "" {
+		return nil, errors.New("咨询标题不允许为空！")
+	}
+
+	if news.ImageUrl == "" {
+		return nil, errors.New("图片不允许为空！")
+	}
+
+	if news.ForwardType == "" {
+		return nil, errors.New("跳转类型不允许为空！")
+	}
+	if news.ForwardType == ForwardTypeUrl && news.ForwardUrl == "" {
+		return nil, errors.New("跳转地址不允许为空！")
+	}
+
+	if news.ForwardType == ForwardTypeCourse && news.CaseId == "" {
+		return nil, errors.New("跳转资源不允许为空！")
+	}
+
 	if news.NewsId == "" {
 		newInfo, err = s.dao.AddNews(news)
 	} else {