0813AM

models/constant.go

@@ -0,0 +1,6 @@
+package models
+
+const (
+	STATUS_NOMAIL = 1
+	STATUS_DEL    = -1
+)

models/goods/spec.go

@@ -4,28 +4,27 @@ 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>" + strconv.Itoa(models.STATUS_DEL)).Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).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>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).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>"+strconv.Itoa(models.STATUS_DEL)).And("spec_id=?", specid).Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("spec_id=?", specid).Find(&goodsSpec)
 	if err != nil {
 		return nil, err
 	}

models/goods/type.go

@@ -4,7 +4,6 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -12,21 +11,21 @@ import (
 // GetGoodsTypeCount 获取商品类型总数
 func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status > " + strconv.Itoa(models.STATUS_DEL)).Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).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 > "+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).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 > "+strconv.Itoa(models.STATUS_DEL)).And("type_id=?", typeid).Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("type_id=?", typeid).Find(&goodstype)
 	if err != nil {
 		return nil, err
 	}

models/message/location.go

@@ -0,0 +1,68 @@
+package message
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+)
+
+const (
+	ISSYS = 1
+)
+
+// GetLocationList 获取位置字典
+func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLocation, error) {
+	var locations []model.TdCmsImageLocation
+	s := m.db.Where("status=?", models.STATUS_NOMAIL).And("org_id=?", org_id)
+	if issys != "" {
+		s = s.And("is_sys=?", issys)
+	}
+	err := s.Find(&locations)
+	return locations, err
+}
+
+// GetLocationById 根据ID获取明细
+func (m *MessageDAO) GetLocationById(id string) (*model.TdCmsImageLocation, error) {
+	var location []model.TdCmsImageLocation
+	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("location_id=?", id).Find(&location)
+	if err != nil {
+		return nil, err
+	}
+	return &location[0], nil
+}
+
+// AddLocation 新增
+func (m *MessageDAO) AddLocation(location model.TdCmsImageLocation) (*model.TdCmsImageLocation, error) {
+	location.LocationId = utils.GetGUID()
+	location.Status = models.STATUS_NOMAIL
+	location.IsSys = ISSYS
+	_, err := m.db.Insert(&location)
+	return &location, err
+}
+
+// UpdateLocation 修改
+func (m *MessageDAO) UpdateLocation(location model.TdCmsImageLocation) error {
+	var cols = []string{
+		"location_name",
+		"location_code",
+		"title",
+		"consult",
+		"type_img",
+		"order_no",
+	}
+	_, err := m.db.Cols(cols...).Where("location_id=?", location.LocationId).Update(location)
+	return err
+}
+
+// DelLocation 删除
+func (m *MessageDAO) DelLocation(location_id string) error {
+	var location = model.TdCmsImageLocation{
+		LocationId: location_id,
+		Status:     models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("location_id=?", location.LocationId).Update(location)
+	return err
+}

models/message/message.go

@@ -0,0 +1,21 @@
+package message
+
+import (
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// MessageDAO 当前数据库操作对象
+type MessageDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewMessageDAO New Inst
+func NewMessageDAO(ctx *utils.Context) *MessageDAO {
+	return &MessageDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}

models/model/sys_user.go

@@ -5,17 +5,16 @@ import (
 )
 
 type SysUser struct {
-	UserId       string    `xorm:"not null pk VARCHAR(64)"`
-	UserName     string    `xorm:"not null VARCHAR(50)"`
-	RealName     string    `xorm:"VARCHAR(50)"`
-	Pwd          string    `xorm:"VARCHAR(500)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	Sex          int       `xorm:"SMALLINT(6)"`
-	WorkNo       string    `xorm:"VARCHAR(100)"`
-	Email        string    `xorm:"VARCHAR(100)"`
-	Phone        string    `xorm:"VARCHAR(100)"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	Headimgurl   string    `xorm:"TEXT"`
-	UserTypeName string    `xorm:"VARCHAR(500)"`
+	UserId     string    `xorm:"not null pk VARCHAR(64)"`
+	UserName   string    `xorm:"not null VARCHAR(50)"`
+	RealName   string    `xorm:"VARCHAR(50)"`
+	Pwd        string    `xorm:"VARCHAR(500)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	Sex        int       `xorm:"SMALLINT(6)"`
+	WorkNo     string    `xorm:"VARCHAR(100)"`
+	Email      string    `xorm:"VARCHAR(100)"`
+	Phone      string    `xorm:"VARCHAR(100)"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	Headimgurl string    `xorm:"TEXT"`
 }

models/model/td_cms_image_location.go

@@ -10,4 +10,5 @@ type TdCmsImageLocation struct {
 	IsSys        int    `xorm:"TINYINT(1)"`
 	TypeImg      string `xorm:"TEXT"`
 	Status       int    `xorm:"SMALLINT(6)"`
+	OrderNo      int    `xorm:"SMALLINT(6)"`
 }

models/models.go

@@ -10,11 +10,6 @@ var (
 	DBEngine *xorm.Engine
 )
 
-const (
-	STATUS_NOMAIL = 1
-	STATUS_DEL    = -1
-)
-
 func init() {
 	DBEngine = NewDBEngine()
 }

models/system/user.go

@@ -28,17 +28,67 @@ func NewUserDAO(ctx *utils.Context) *UserDAO {
 	}
 }
 
+type UserListInfo struct {
+	model.SysUser `xorm:"extends"`
+	UserTypeNames string
+}
+
 // GetUserList 用户列表
-func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSize int) ([]model.SysUser, error) {
-	var users []model.SysUser
-	userDAO := m.db.Where(`(status> `+strconv.Itoa(models.STATUS_DEL)+` and user_name like '%?%' and user_id in 
-		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('?')))`, username, strings.Replace(caseids, ",", "','", -1))
+func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSize int) ([]UserListInfo, error) {
+	var users []UserListInfo
+	sql := `select user.*,c.user_type_names from sys_user user left join (
+		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
+		INNER join td_user_type b on a.type_id = b.type_id
+		group by a.user_id) c on user.user_id = c.user_id where 
+		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user_id in 
+		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
-		userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
+		sql = sql + " and user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
-	err := userDAO.Limit(pageSize, page*pageSize).Desc("create_date").Find(&users)
+
+	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+
+	err := m.db.Sql(sql).Find(&users)
 	return users, err
+
+	// var users []model.SysUser
+	// userDAO := m.db.Where(`(status> `+strconv.Itoa(models.STATUS_DEL)+` and user_name like '%?%' and user_id in
+	// 	(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('?')))`, username, strings.Replace(caseids, ",", "','", -1))
+
+	// if typeid != "" {
+	// 	userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
+	// }
+	// err := userDAO.Limit(pageSize, page*pageSize).Desc("create_date").Find(&users)
+	// return users, err
+}
+
+// GetUserCount 用户列表count
+func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
+	// var users []model.SysUser
+	// userDAO := m.db.Where(`(status> `+strconv.Itoa(models.STATUS_DEL)+` and user_name like '%?%' and user_id in
+	// 	(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('?')))`, username, strings.Replace(caseids, ",", "','", -1))
+
+	// if typeid != "" {
+	// 	userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
+	// }
+	// err := userDAO.Find(&users)
+	var users []UserListInfo
+	sql := `select user.*,c.user_type_names from sys_user user left join (
+		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
+		INNER join td_user_type b on a.type_id = b.type_id
+		group by a.user_id) c on user.user_id = c.user_id where 
+		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user_id in 
+		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
+
+	if typeid != "" {
+		sql = sql + " and user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
+	}
+	err := m.db.Sql(sql).Find(&users)
+	if err != nil {
+		return 0, err
+	}
+	return len(users), nil
 }
 
 // UserInfo 用户详情

service/message/location.go

@@ -0,0 +1,31 @@
+package message
+
+import "spaceofcheng/services/models/model"
+
+// GetLocationList 获取列表
+func (s *MessageServ) GetLocationList(issys, orgid string) ([]model.TdCmsImageLocation, error) {
+	list, err := s.dao.GetLocationList(issys, orgid)
+	return list, err
+}
+
+// GetLocationByID 获取详细信息
+func (s *MessageServ) GetLocationByID(id string) (*model.TdCmsImageLocation, error) {
+	location, err := s.dao.GetLocationById(id)
+	return location, err
+}
+
+// SaveLocation 保存
+func (s *MessageServ) SaveLocation(location model.TdCmsImageLocation) (*model.TdCmsImageLocation, error) {
+	if location.LocationId == "" {
+		newlocation, err := s.dao.AddLocation(location)
+		return newlocation, err
+	}
+	err := s.dao.UpdateLocation(location)
+	return &location, err
+}
+
+// DelLocation 删除
+func (s *MessageServ) DelLocation(locationID string) error {
+	err := s.dao.DelLocation(locationID)
+	return err
+}

service/message/message.go

@@ -0,0 +1,20 @@
+package message
+
+import (
+	"spaceofcheng/services/models/message"
+	"spaceofcheng/services/utils"
+)
+
+// MessageServ 系统处理
+type MessageServ struct {
+	ctx *utils.Context
+	dao *message.MessageDAO
+}
+
+// NewMessageServ 初始化
+func NewMessageServ(ctx *utils.Context) *MessageServ {
+	return &MessageServ{
+		ctx: ctx,
+		dao: message.NewMessageDAO(ctx),
+	}
+}

service/user.go

@@ -31,12 +31,25 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 }
 
 // GetUserList 获取用户列表
-func (s *UserServ) GetUserList(username, typeid, caseids string, page int, pageSize int) ([]model.SysUser, error) {
+func (s *UserServ) GetUserList(username, typeid, caseids string, page int, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}
 	userList, err := s.dao.GetUserList(username, typeid, caseids, page, pageSize)
-	return userList, err
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetUserCount(username, typeid, caseids)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     userList,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
 }
 
 // GetUserByID 根据用户ID获取用户信息
@@ -45,6 +58,7 @@ func (s *UserServ) GetUserByID(userid string) (*system.UserInfo, error) {
 	if err != nil {
 		return nil, err
 	}
+	userinfo.Pwd = ""
 	usertype, err := s.dao.GetUserType(userid)
 	if err != nil {
 		return nil, err
@@ -63,17 +77,17 @@ func (s *UserServ) GetUserByID(userid string) (*system.UserInfo, error) {
 	}
 	userinfo.UserCase = usercase
 
-	userrole, err := s.dao.GetUserRole(userid)
-	if err != nil {
-		return nil, err
-	}
-	userinfo.UserRole = userrole
+	// userrole, err := s.dao.GetUserRole(userid)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// userinfo.UserRole = userrole
 
-	usermenu, err := s.dao.GetUserMenu(userid)
-	if err != nil {
-		return nil, err
-	}
-	userinfo.UserMenu = usermenu
+	// usermenu, err := s.dao.GetUserMenu(userid)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// userinfo.UserMenu = usermenu
 
 	return userinfo, nil
 }
@@ -148,6 +162,7 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	if err != nil {
 		return nil, err
 	}
+	newUSer.Pwd = ""
 	return newUSer, err
 }