wechatmenu

controllers/wechatmenu/wechatmenu.go

@@ -1,9 +1,11 @@
 package wechatmenu
 
 import (
+	"encoding/json"
 	"strings"
 	"wechat-conf/controllers"
 	"wechat-conf/models/model"
+	"wechat-conf/service/keyvalue"
 	"wechat-conf/service/sysuser"
 	"wechat-conf/service/wechatmenu"
 	"wechat-conf/utils"
@@ -15,6 +17,7 @@ import (
 type MenuController struct {
 	dao  *wechatmenu.WechatmenuServ
 	sdao *sysuser.SysuserServ
+	kdao *keyvalue.KeyvalueServ
 	controllers.BaseController
 }
 
@@ -24,6 +27,34 @@ type MenuController struct {
 func (c *MenuController) Constructor() {
 	c.dao = wechatmenu.NewWechatmenuServ(c.Context)
 	c.sdao = sysuser.NewSysuserServ(c.Context)
+	c.kdao = keyvalue.NewKeyvalueServ(c.Context)
+}
+
+type Wehchatmenu struct {
+	WechatJson string
+}
+type WechatMenuDetailSub struct {
+	Name     string
+	Type     string
+	Value    string `json:"value,omitempty"`
+	Url      string `json:"url,omitempty"`
+	Media_Id string `json:"media_id,omitempty"`
+	Key      string `json:"key,omitempty"`
+}
+type WechatMenuDetail struct {
+	Name       string
+	Type       string
+	Value      string `json:"value,omitempty"`
+	Url        string `json:"url,omitempty"`
+	Media_Id   string `json:"media_id,omitempty"`
+	Key        string `json:"key,omitempty"`
+	Sub_Button []WechatMenuDetailSub
+}
+type WechatMenu struct {
+	Button []WechatMenuDetail
+}
+type Wechat struct {
+	Menu WechatMenu
 }
 
 func (c *MenuController) GetMenuList() {
@@ -38,6 +69,32 @@ func (c *MenuController) GetMenuList() {
 		c.ResponseError(err)
 	}
 	menu, err := client.GetMenu()
+	wechatmenu := menu["button"].([]WechatMenuDetail)
+	beego.Error("___________wechatmenulist____________")
+	beego.Error(wechatmenu)
+	beego.Error("_________________________________")
+	var keyList []*model.TaWechatKeyValue
+	for i := 0; i < len(wechatmenu); i++ {
+		if wechatmenu[i].Type == "click" {
+			key, err := c.kdao.GetValueByKey(wechatmenu[i].Key)
+			if err != nil {
+				c.ResponseError(err)
+			}
+			keyList = append(keyList, key)
+		}
+		for j := 0; j < len(wechatmenu[i].Sub_Button); j++ {
+			if wechatmenu[i].Sub_Button[j].Type == "click" {
+				key, err := c.kdao.GetValueByKey(wechatmenu[i].Key)
+				if err != nil {
+					c.ResponseError(err)
+				}
+				keyList = append(keyList, key)
+			}
+		}
+	}
+	beego.Error("___________keylist____________")
+	beego.Error(keyList)
+	beego.Error("_________________________________")
 	var code string = err.Error()
 	if err != nil {
 		if strings.Contains(code, "46003") {
@@ -46,11 +103,10 @@ func (c *MenuController) GetMenuList() {
 			c.ResponseError(err)
 		}
 	}
-	c.ResponseJSON(menu)
-}
-
-type Wehchatmenu struct {
-	WechatJson string
+	c.ResponseJSON(map[string]interface{}{
+		"menu":    menu,
+		"keyList": keyList,
+	})
 }
 
 func (c *MenuController) RefreshMenu() {
@@ -60,8 +116,58 @@ func (c *MenuController) RefreshMenu() {
 		c.ResponseError(err)
 	}
 	str := wechatJson.WechatJson
-	var data []byte = []byte(str)
-	err := c.dao.UpdateWechatMenu(str, user.OrgId)
+	beego.Error("____________str___________")
+	beego.Error(str)
+	beego.Error("__________________________")
+	var menu Wechat
+	err := json.Unmarshal([]byte(str), &menu)
+	//var data []byte = []byte(str)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	wechatmenu := menu.Menu.Button
+	beego.Error("___________wechatmenu____________")
+	beego.Error(wechatmenu)
+	beego.Error("_________________________________")
+	for i := 0; i < len(wechatmenu); i++ {
+		if wechatmenu[i].Type == "text" {
+			wechatmenu[i].Type = "click"
+			var keyvalue = model.TaWechatKeyValue{
+				KeyId: utils.GetGUID(),
+				Value: wechatmenu[i].Value,
+			}
+			err := c.kdao.AddKeyvalue(keyvalue)
+			if err != nil {
+				c.ResponseError(err)
+			}
+			wechatmenu[i].Key = keyvalue.KeyId
+			wechatmenu[i].Value = ""
+		}
+		for j := 0; j < len(wechatmenu[i].Sub_Button); j++ {
+			if wechatmenu[i].Sub_Button[j].Type == "text" {
+				wechatmenu[i].Sub_Button[j].Type = "click"
+				var keyvalue = model.TaWechatKeyValue{
+					KeyId: utils.GetGUID(),
+					Value: wechatmenu[i].Sub_Button[j].Value,
+				}
+				err := c.kdao.AddKeyvalue(keyvalue)
+				if err != nil {
+					c.ResponseError(err)
+				}
+				wechatmenu[i].Sub_Button[j].Key = keyvalue.KeyId
+				wechatmenu[i].Sub_Button[j].Value = ""
+			}
+		}
+	}
+	beego.Error("___________wechatmenuData____________")
+	beego.Error(wechatmenu)
+	beego.Error("_________________________________")
+	menuData, err := json.Marshal(wechatmenu)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	err = c.dao.UpdateWechatMenu(string(menuData), user.OrgId)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -73,7 +179,7 @@ func (c *MenuController) RefreshMenu() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-	err = client.RefreshMenu(data)
+	err = client.RefreshMenu(menuData)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/model/keyvalue/keyvalue.go

@@ -0,0 +1,46 @@
+package keyvalue
+
+import (
+	"strconv"
+	"wechat-conf/models"
+	"wechat-conf/models/model"
+	"wechat-conf/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// KeyvalueDAO 当前数据库操作对象
+type KeyvalueDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewKeyvalueDAO New Inst
+func NewKeyvalueDAO(ctx *utils.Context) *KeyvalueDAO {
+	return &KeyvalueDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+func (m *KeyvalueDAO) GetValueByKey(key string) (*model.TaWechatKeyValue, error) {
+	var keyvalue []model.TaWechatKeyValue
+	sql := `SELECT
+	* 
+FROM
+	ta_wechat_key_value 
+WHERE
+	key_id = '` + key + `'
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&keyvalue)
+	if len(keyvalue) > 0 {
+		return &keyvalue[0], err
+	}
+	return nil, err
+}
+
+func (m *KeyvalueDAO) AddValueKey(valueKey model.TaWechatKeyValue) error {
+	valueKey.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(valueKey)
+	return err
+}

models/model/ta_wechat_key_value.go

@@ -0,0 +1,7 @@
+package model
+
+type TaWechatKeyValue struct {
+	KeyId  string `xorm:"not null pk VARCHAR(64)"`
+	Value  string `xorm:"TEXT"`
+	Status int    `xorm:"SMALLINT(6)"`
+}

models/wechatmenu/wechatmenu.go

@@ -48,7 +48,7 @@ func (m *WechatMenuDAO) UpdateWechatMenu(wechatMenu, orgId string) error {
 	var cols = []string{
 		"wechat_config_json",
 	}
-	_, err := m.db.Cols(cols...).Where("org_id = ?", menu.WechatConfigId).Update(menu)
+	_, err := m.db.Cols(cols...).Where("org_id = ?", menu.WechatConfigId).And("status > ?", strconv.Itoa(models.STATUS_DEL)).Update(menu)
 	return err
 }
 func (m *WechatMenuDAO) DeleteWechatMenu(wechatConfigId string) error {

service/autoreply/autoreply.go

@@ -57,6 +57,21 @@ func (s *AutoreplyServ) GetAutoReplyById(autoReplyId string) (*model.TaAutoReply
 func (s *AutoreplyServ) SaveAutoReply(autoreply model.TaAutoReply, orgId string) (*model.TaAutoReply, error) {
 	var newAutoreply *model.TaAutoReply
 	var err error
+	if autoreply.RuleName == "" {
+		return nil, errors.New("规则名不能为空")
+	}
+	if autoreply.AutoType == models.AUTOREPLY_KEYWORDS && autoreply.Keywords == "" {
+		return nil, errors.New("关键词不能为空")
+	}
+	if autoreply.PairType == "" {
+		return nil, errors.New("匹配规则不能为空")
+	}
+	if autoreply.MessageType == models.MESSAGE_TYPE_CONTENT && autoreply.MessageContent == "" {
+		return nil, errors.New("图文不能为空")
+	}
+	if autoreply.MessageType == models.MESSAGE_TYPE_IMG && autoreply.MessageImg == "" {
+		return nil, errors.New("图片不能为空")
+	}
 	if autoreply.AutoReplyId == "" {
 		autoreply.OrgId = orgId
 		newAutoreply, err = s.dao.AddAutoReply(autoreply)

service/keyvalue/keyvalue.go

@@ -0,0 +1,38 @@
+package keyvalue
+
+import (
+	"errors"
+	"wechat-conf/models/model"
+	"wechat-conf/models/model/keyvalue"
+	"wechat-conf/utils"
+)
+
+// KeyvalueServ 用户
+type KeyvalueServ struct {
+	ctx *utils.Context
+	dao *keyvalue.KeyvalueDAO
+}
+
+// NewKeyvalueServ 初始化
+func NewKeyvalueServ(ctx *utils.Context) *KeyvalueServ {
+	return &KeyvalueServ{
+		ctx: ctx,
+		dao: keyvalue.NewKeyvalueDAO(ctx),
+	}
+}
+func (s *KeyvalueServ) GetValueByKey(keyId string) (*model.TaWechatKeyValue, error) {
+	keyvalue, err := s.dao.GetValueByKey(keyId)
+	if err != nil {
+		utils.LogError("获取值失败: " + err.Error())
+		return nil, errors.New("获取值失败")
+	}
+	return keyvalue, nil
+}
+func (s *KeyvalueServ) AddKeyvalue(keyvalue model.TaWechatKeyValue) error {
+	err := s.dao.AddValueKey(keyvalue)
+	if err != nil {
+		utils.LogError("新增值失败: " + err.Error())
+		return errors.New("新增值失败")
+	}
+	return nil
+}

service/sysuser/sysuser.go

@@ -56,6 +56,15 @@ func (s *SysuserServ) GetSysuserById(userId string) (*model.SysUser, error) {
 func (s *SysuserServ) SaveUser(user model.SysUser) (*model.SysUser, error) {
 	var newUser *model.SysUser
 	var err error
+	if user.RealName == "" {
+		return nil, errors.New("真实姓名不能为空")
+	}
+	if user.UserName == "" {
+		return nil, errors.New("用户名不能为空")
+	}
+	if user.Phone == "" {
+		return nil, errors.New("手机号不能为空")
+	}
 	if user.UserId == "" {
 		user.UserId = utils.GetGUID()
 		user.Pwd = encrypt.Md5(encrypt.Md5("123456"), user.UserId)