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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = services
 httpport = 8080
-runmode = prod
+runmode = dev
 autorender = false
 copyrequestbody = true
 EnableDocs = true

controllers/marketing/marketing.go

@@ -96,20 +96,20 @@ func (c *MarketingController) DelMarketing() {
 	c.ResponseJSON("操作成功!")
 }
 
-// DelMarketing 正常
-func (c *MarketingController) DelMarketingNormal() {
+// SetMarketingNormal 正常
+func (c *MarketingController) SetMarketingNormal() {
 	activityId := c.GetString(":activityId")
-	err := c.serv.DelMarketingNormal(activityId)
+	err := c.serv.SetMarketingNormal(activityId)
 	if err != nil {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON("操作成功!")
 }
 
-// DelMarketing 停用
-func (c *MarketingController) DelMarketingDisable() {
+// SetMarketingDisable 停用
+func (c *MarketingController) SetMarketingDisable() {
 	activityId := c.GetString(":activityId")
-	err := c.serv.DelMarketingDisable(activityId)
+	err := c.serv.SetMarketingDisable(activityId)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/sys.go

@@ -251,3 +251,10 @@ func UpdateUserMapping(userMap *model.TaUserMapping, cols []string) error {
 	_, err := DBEngine.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(userMap)
 	return err
 }
+
+// GetAllCases 获取所有有效案场
+func GetAllCases() ([]model.SysCase, error) {
+	var cases []model.SysCase
+	err := DBEngine.Where("status=?", STATUS_NORMAL).Asc("org_id").Find(&cases)
+	return cases, err
+}

npm-debug.log

@@ -1,22 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'D:\\Application\\Node\\node.exe',
-1 verbose cli   'C:\\Users\\Administrator\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js',
-1 verbose cli   'run',
-1 verbose cli   'dev' ]
-2 info using npm@4.0.5
-3 info using node@v8.2.1
-4 verbose stack Error: ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
-5 verbose cwd E:\GoProject\src\spaceofcheng\services
-6 error Windows_NT 10.0.17134
-7 error argv "D:\\Application\\Node\\node.exe" "C:\\Users\\Administrator\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js" "run" "dev"
-8 error node v8.2.1
-9 error npm  v4.0.5
-10 error path E:\GoProject\src\spaceofcheng\services\package.json
-11 error code ENOENT
-12 error errno -4058
-13 error syscall open
-14 error enoent ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
-15 error enoent ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
-15 error enoent This is most likely not a problem with npm itself
-15 error enoent and is related to npm not being able to find a file.
-16 verbose exit [ -4058, true ]

routers/common.go

@@ -281,12 +281,12 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/system/init", &user.UserController{}, "get:GetEnvVars"),
 
 		// 营销活动
-		beego.NSRouter("/marketing/list", &marketing.MarketingController{}, "get:GetMarketingList"),
+		beego.NSRouter("/marketing", &marketing.MarketingController{}, "get:GetMarketingList"),
 		beego.NSRouter("/marketing", &marketing.MarketingController{}, "post:SaveMarketing"),
 		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "get:GetMarketingById"),
-		beego.NSRouter("/marketing", &marketing.MarketingController{}, "put:UpdateMarketing"),
-		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:DelMarketingNormal"),
-		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:DelMarketingDisable"),
+		// beego.NSRouter("/marketing", &marketing.MarketingController{}, "put:UpdateMarketing"),
+		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:SetMarketingNormal"),
+		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:SetMarketingDisable"),
 		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "delete:DelMarketing"),
 
 		// websocket

service/events/events.go

@@ -84,3 +84,15 @@ var tsAction = func(e tinyevent.Event) error {
 	fmt.Println(str)
 	return nil
 }
+
+func init() {
+	cases, err := models.GetAllCases()
+	if err != nil {
+		utils.LogError("获取有效案场列表失败: " + err.Error())
+		return
+	}
+
+	for _, cs := range cases {
+		ListenAllEvent(cs.OrgId, cs.CaseId)
+	}
+}

service/marketing/marketing.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
@@ -55,7 +56,7 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 	}, err
 }
 
-// 保存 营销活动
+// SaveMarketing 保存 营销活动
 /**
 * resource_desc 活动描述
  */
@@ -89,8 +90,10 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 		return nil, nil, err
 	}
 
-	return newInfo, newWoke, err
+	// 重启事件
+	events.ListenAllEvent(activity.OrgId, activity.CaseId)
 
+	return newInfo, newWoke, err
 }
 
 // GetMarketingById 根据ID查询数据
@@ -135,8 +138,8 @@ func (s *MarketingServ) DelMarketing(activityId string) error {
 
 }
 
-// DelMarketing  根据ID 修改状态为 正常
-func (s *MarketingServ) DelMarketingNormal(activityId string) error {
+// SetMarketingNormal  根据ID 修改状态为 正常
+func (s *MarketingServ) SetMarketingNormal(activityId string) error {
 
 	if activityId == "" {
 		return utils.LogError("没有对应的营销活动")
@@ -150,13 +153,18 @@ func (s *MarketingServ) DelMarketingNormal(activityId string) error {
 	if info.Status == models.STATUS_NORMAL {
 		return utils.LogError("营销状态异常")
 	}
+
 	err = s.dao.DelMarketing(activityId, models.STATUS_NORMAL)
-	return err
+	if err == nil {
+		// 重启事件
+		events.ListenAllEvent(info.OrgId, info.CaseId)
+	}
 
+	return err
 }
 
-// DelMarketing  根据ID 修改状态为 停用
-func (s *MarketingServ) DelMarketingDisable(activityId string) error {
+// SetMarketingDisable  根据ID 修改状态为 停用
+func (s *MarketingServ) SetMarketingDisable(activityId string) error {
 
 	if activityId == "" {
 		return utils.LogError("没有对应的营销活动")
@@ -172,7 +180,6 @@ func (s *MarketingServ) DelMarketingDisable(activityId string) error {
 	}
 	err = s.dao.DelMarketing(activityId, models.STATUS_READY)
 	return err
-
 }
 
 // UpdateMarketing 修改 营销活动