featrue(sa_api): v2版大屏，添加传感器类型、容器类型属性，支持展示电气监控设备

backend/src/dashoo.cn/alertorapp/business/triggerhistory/triggerhistory.go

@@ -26,37 +26,6 @@ type Trigger_History struct {
 	AlarmOn            time.Time
 }
 
-type Channels struct {
-	Id               int       `xorm:"<- not null pk INT(50)"`
-	Title            string    `xorm:"VARCHAR(255)" json:"title"`
-	Code             string    `xorm:"VARCHAR(200)" json:"id"`
-	MaxValue         float64   `xorm:"DECIMAL(10)"`
-	MinValue         float64   `xorm:"DECIMAL(10)"`
-	TagCode          string    `xorm:"VARCHAR(200)"`
-	Tags             string    `xorm:"VARCHAR(50)" json:"tags"`
-	About            string    `xorm:"VARCHAR(50)" json:"about"`
-	DId              int       `xorm:"INT(11)"`
-	VisitLevel       int       `xorm:"INT(11)" json:"visitlevel"`
-	DataItem         int       `xorm:"INT(11)"`
-	Unit             string    `xorm:"VARCHAR(255)"`
-	UnitSign         string    `xorm:"VARCHAR(255)"`
-	Description      string    `xorm:"VARCHAR(255)"`
-	SortCode         int       `xorm:"not null INT(11)"`
-	Enabled          int       `xorm:"INT(11)"`
-	Serial           string    `xorm:"VARCHAR(500)"`
-	CreateOn         time.Time `xorm:"DATETIME created"`
-	CreateUserId     int       `xorm:"VARCHAR(50)"`
-	CreateBy         string    `xorm:"INT(10)"`
-	ModifiedOn       time.Time `xorm:"DATETIME updated"`
-	ModifiedUserId   int       `xorm:"INT(10)"`
-	ModifiedBy       string    `xorm:"VARCHAR(50)"`
-	CurrValue        float64   `xorm:"DECIMAL(10)"`
-	LastTime         time.Time `xorm:"DATETIME"`
-	SaveTime         int       `xorm:"INT(11)"`
-	DeviceState      int       `xorm:"INT(11)"`
-	CalibrationValue float32
-}
-
 type Trigger struct {
 	Id                int       `xorm:"not null pk autoincr INT(11)" json:"id"`
 	AccCode           string    `xorm:"VARCHAR(36)"`
@@ -94,3 +63,35 @@ type Trigger struct {
 	IsMultiLevel      int       `json:"ismultilevel"`
 	ParentId          int       `json:"parentid"`
 }
+
+type Channels struct {
+	Id               int       `xorm:"<- not null pk INT(50)"`
+	Title            string    `xorm:"VARCHAR(255)" json:"title"`
+	Code             string    `xorm:"VARCHAR(200)" json:"id"`
+	MaxValue         float64   `xorm:"DECIMAL(10)"`
+	MinValue         float64   `xorm:"DECIMAL(10)"`
+	TagCode          string    `xorm:"VARCHAR(200)"`
+	Tags             string    `xorm:"VARCHAR(50)" json:"tags"`
+	About            string    `xorm:"VARCHAR(50)" json:"about"`
+	DId              int       `xorm:"INT(11)"`
+	VisitLevel       int       `xorm:"INT(11)" json:"visitlevel"`
+	DataItem         int       `xorm:"INT(11)"`
+	Unit             string    `xorm:"VARCHAR(255)"`
+	UnitSign         string    `xorm:"VARCHAR(255)"`
+	Description      string    `xorm:"VARCHAR(255)"`
+	SortCode         int       `xorm:"not null INT(11)"`
+	Enabled          int       `xorm:"INT(11)"`
+	Serial           string    `xorm:"VARCHAR(500)"`
+	CreateOn         time.Time `xorm:"DATETIME created"`
+	CreateUserId     int       `xorm:"VARCHAR(50)"`
+	CreateBy         string    `xorm:"INT(10)"`
+	ModifiedOn       time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+	CurrValue        float64   `xorm:"DECIMAL(10)"`
+	LastTime         time.Time `xorm:"DATETIME"`
+	SaveTime         int       `xorm:"INT(11)"`
+	DeviceState      int       `xorm:"INT(11)"`
+	CalibrationValue float32
+	EModelType       int
+}

backend/src/dashoo.cn/alertorapp/business/triggerhistory/triggerhistoryService.go

@@ -2,7 +2,6 @@ package triggerhistory
 
 import (
 	"fmt"
-	"strconv"
 
 	"dashoo.cn/base_common/utils"
 	. "dashoo.cn/base_common/utils/db"
@@ -57,25 +56,3 @@ func (s *TriggerHistoryService) Getchannelbyuser(where, userid string) []Channel
 	s.DBE.SQL(sql).Find(&model)
 	return model
 }
-
-func (s *TriggerHistoryService) GetCnameByCodePage(pageIndex, itemsPerPage int64, order string, asc bool, where string) (int64, []Channels) {
-	var err error
-	var total int64 //获取总记录数
-	list := make([]Channels, 0)
-	sqlCount := "SELECT COUNT(*) AS total FROM Channels where " + where
-	sql := "select * from Channels where " + where + "ORDER BY SortCode limit " + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
-	fmt.Println("----sql--------", sql)
-	utils.DBE.SQL(sql).Find(&list)
-	resultsSlice, err := s.DBE.Query(sqlCount)
-	LogError(err)
-	if len(resultsSlice) > 0 {
-		results := resultsSlice[0]
-		for _, value := range results {
-			total, err = strconv.ParseInt(string(value), 10, 64)
-			LogError(err)
-			break
-		}
-	}
-	return total, list
-
-}

backend/src/dashoo.cn/alertorapp/business/userchannels/channelsService.go

@@ -0,0 +1,43 @@
+package userchannels
+
+import (
+	"fmt"
+	"strconv"
+
+	"dashoo.cn/base_common/utils"
+	. "dashoo.cn/base_common/utils/db"
+	"xorm.io/xorm"
+)
+
+type ChannelService struct {
+	ServiceBase
+}
+
+func GetChannelService(xormEngine *xorm.Engine) *ChannelService {
+	s := new(ChannelService)
+	s.DBE = xormEngine
+	return s
+}
+
+func (s *ChannelService) GetCnameByCodePage(pageIndex, itemsPerPage int64, order string, asc bool, where string) (int64, []Channels) {
+	var err error
+	var total int64 //获取总记录数
+	list := make([]Channels, 0)
+	sqlCount := "SELECT COUNT(*) AS total FROM Channels c where " + where
+	// sql := "select * from Channels where " + where + "ORDER BY SortCode limit " + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+	sql := "select c.Title,c.Code,c.MaxValue,c.MinValue,c.DataItem, em.ditem as EModelType from Channels c ,equipment e,equipmentmodel em where c.equipmentid=e.id and e.modelid = em.id and " + where + "ORDER BY c.SortCode limit " + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+	fmt.Println("----sql--------", sql)
+	s.DBE.SQL(sql).Find(&list)
+	resultsSlice, err := s.DBE.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, list
+
+}

backend/src/dashoo.cn/alertorapp/business/userchannels/userchannels.go

@@ -19,3 +19,35 @@ type Base_UserChannels struct {
 	Modifieduserid int       `xorm:"INT(11)" form:"-" json:"-"`
 	Modifiedby     string    `xorm:"VARCHAR(50)" form:"-" json:"-"`
 }
+
+type Channels struct {
+	Id               int       `xorm:"<- not null pk INT(50)"`
+	Title            string    `xorm:"VARCHAR(255)" json:"title"`
+	Code             string    `xorm:"VARCHAR(200)" json:"id"`
+	MaxValue         float64   `xorm:"DECIMAL(10)"`
+	MinValue         float64   `xorm:"DECIMAL(10)"`
+	TagCode          string    `xorm:"VARCHAR(200)"`
+	Tags             string    `xorm:"VARCHAR(50)" json:"tags"`
+	About            string    `xorm:"VARCHAR(50)" json:"about"`
+	DId              int       `xorm:"INT(11)"`
+	VisitLevel       int       `xorm:"INT(11)" json:"visitlevel"`
+	DataItem         int       `xorm:"INT(11)"`
+	Unit             string    `xorm:"VARCHAR(255)"`
+	UnitSign         string    `xorm:"VARCHAR(255)"`
+	Description      string    `xorm:"VARCHAR(255)"`
+	SortCode         int       `xorm:"not null INT(11)"`
+	Enabled          int       `xorm:"INT(11)"`
+	Serial           string    `xorm:"VARCHAR(500)"`
+	CreateOn         time.Time `xorm:"DATETIME created"`
+	CreateUserId     int       `xorm:"VARCHAR(50)"`
+	CreateBy         string    `xorm:"INT(10)"`
+	ModifiedOn       time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+	CurrValue        float64   `xorm:"DECIMAL(10)"`
+	LastTime         time.Time `xorm:"DATETIME"`
+	SaveTime         int       `xorm:"INT(11)"`
+	DeviceState      int       `xorm:"INT(11)"`
+	CalibrationValue float32
+	EModelType       int
+}

backend/src/dashoo.cn/alertorapp/conf/app.ini

@@ -40,13 +40,20 @@ label_names=Web Frame.|ORM|DB Driver|GUI|Networking|Toolkit
 
 [db]
 type=mysql
+host=rm-8vbk16zx2rbfu6jt6uo.mysql.zhangbei.rds.aliyuncs.com
+db_port=3306
+name=seed_db
+user=seed_user
+pwd=Ruvaher8gObi
+
+[mcs_db]
+type=mysql
 name=mcs_db
 host=rm-8vbk16zx2rbfu6jt6uo.mysql.zhangbei.rds.aliyuncs.com
 db_port=3306
 user=mcs_user
 pwd=X6T1pa5o1AgO
 
-
 [task]
 rock_reset=0
 max_skip_time=5
@@ -56,3 +63,7 @@ min_pro_num=100
 addr = 1.116.37.6:26379
 poolnum = 5
 
+[send.nsq]
+nsqdtcpaddr = 1.116.37.6:9150
+topic = blackboxd2	
+

backend/src/dashoo.cn/alertorapp/controllers/home.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"xorm.io/xorm"
+
 	"dashoo.cn/alertorapp/business/trigger"
 	"dashoo.cn/alertorapp/business/triggerhistory"
 	"dashoo.cn/alertorapp/business/userchannels"
@@ -14,6 +16,8 @@ import (
 	"dashoo.cn/base_common/utils"
 )
 
+var MCS_DBE *xorm.Engine
+
 type HomeController struct {
 	BaseController
 }
@@ -28,10 +32,13 @@ type ChannelModel struct {
 	MinValue    float64
 	Name        string
 	Code        string
-	Levelv      int
-	LevelSignal int
-	DataItem    int
+	Levelv      int // 电量
+	LevelSignal int // 信号强度
+	DataItem    int // 传感器类型
 	Online      int
+	EModelType  int // 存储设备类型
+	Voltage     int
+	Power       int
 }
 type ChannelModelState struct {
 	Temperature float32 `json:"temperature"`
@@ -45,6 +52,8 @@ type ChannelModelState struct {
 	LevelSignal int
 	DataItem    int
 	IState      int `json:"istate"`
+	Voltage     int
+	Power       int
 }
 
 func (this *HomeController) Index() {
@@ -72,8 +81,8 @@ func (this *HomeController) Main() {
 		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
 		channellist := svc.GetCnameByCode(codes)
 		for _, v := range channellist {
-			t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
-			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1})
+			t, h, o2, co2, cjtime, lv, ls, voltage, power := GetTH(v.Code)
+			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1, v.EModelType, voltage, power})
 		}
 	}
 	this.Data["list"] = cmodels
@@ -83,96 +92,96 @@ func (this *HomeController) Main() {
 }
 
 func (this *HomeController) MainGrid9() {
-	ccode := this.Ctx.Input.Param(":ccode")
-	alertorstrs := GetAlertor(ccode)
-	cmodelouts := make([][]ChannelModel, 0, 0)
-	if alertorstrs != "" {
-		codes := strings.Replace(alertorstrs, ",", "','", -1)
-		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
-		channellist := svc.GetCnameByCode(codes)
-		for i := 0; i <= len(channellist)/9; i++ {
-			cmodels := make([]ChannelModel, 0)
-			for k, v := range channellist {
-				if k >= 9*i && k < 9*(i+1) {
-					t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
-					cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1})
-				}
-			}
-			fmt.Println("----cmodels---------", cmodels)
-			if len(cmodels) > 0 {
-				fmt.Println("----cmodels--11-------", cmodels)
-				cmodelouts = append(cmodelouts, cmodels)
-			}
-		}
+	// ccode := this.Ctx.Input.Param(":ccode")
+	// alertorstrs := GetAlertor(ccode)
+	// cmodelouts := make([][]ChannelModel, 0, 0)
+	// if alertorstrs != "" {
+	// 	codes := strings.Replace(alertorstrs, ",", "','", -1)
+	// 	svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
+	// 	channellist := svc.GetCnameByCode(codes)
+	// 	for i := 0; i <= len(channellist)/9; i++ {
+	// 		cmodels := make([]ChannelModel, 0)
+	// 		for k, v := range channellist {
+	// 			if k >= 9*i && k < 9*(i+1) {
+	// 				t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+	// 				cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1, v.EModelType})
+	// 			}
+	// 		}
+	// 		fmt.Println("----cmodels---------", cmodels)
+	// 		if len(cmodels) > 0 {
+	// 			fmt.Println("----cmodels--11-------", cmodels)
+	// 			cmodelouts = append(cmodelouts, cmodels)
+	// 		}
+	// 	}
 
-	}
-	this.Data["list"] = cmodelouts
-	this.Data["total"] = len(cmodelouts)
-	this.Data["ccode"] = ccode
-	this.TplName = "homecontroller/maingrid9.tpl"
+	// }
+	// this.Data["list"] = cmodelouts
+	// this.Data["total"] = len(cmodelouts)
+	// this.Data["ccode"] = ccode
+	// this.TplName = "homecontroller/maingrid9.tpl"
 }
 func (this *HomeController) MainGrid12() {
-	ccode := this.Ctx.Input.Param(":ccode")
-	alertorstrs := GetAlertor(ccode)
-	cmodelouts := make([][]ChannelModel, 0, 0)
-	if alertorstrs != "" {
-		codes := strings.Replace(alertorstrs, ",", "','", -1)
-		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
-		channellist := svc.GetCnameByCode(codes)
-		for i := 0; i <= len(channellist)/12; i++ {
-			cmodels := make([]ChannelModel, 0)
-			for k, v := range channellist {
-				if k >= 12*i && k < 12*(i+1) {
-					t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
-					cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1})
-				}
-			}
-			if len(cmodels) > 0 {
-				cmodelouts = append(cmodelouts, cmodels)
-			}
-		}
+	// ccode := this.Ctx.Input.Param(":ccode")
+	// alertorstrs := GetAlertor(ccode)
+	// cmodelouts := make([][]ChannelModel, 0, 0)
+	// if alertorstrs != "" {
+	// 	codes := strings.Replace(alertorstrs, ",", "','", -1)
+	// 	svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
+	// 	channellist := svc.GetCnameByCode(codes)
+	// 	for i := 0; i <= len(channellist)/12; i++ {
+	// 		cmodels := make([]ChannelModel, 0)
+	// 		for k, v := range channellist {
+	// 			if k >= 12*i && k < 12*(i+1) {
+	// 				t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+	// 				cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1, v.EModelType})
+	// 			}
+	// 		}
+	// 		if len(cmodels) > 0 {
+	// 			cmodelouts = append(cmodelouts, cmodels)
+	// 		}
+	// 	}
 
-	}
-	this.Data["list"] = cmodelouts
-	this.Data["total"] = len(cmodelouts)
-	this.Data["ccode"] = ccode
-	this.TplName = "homecontroller/maingrid9.tpl"
+	// }
+	// this.Data["list"] = cmodelouts
+	// this.Data["total"] = len(cmodelouts)
+	// this.Data["ccode"] = ccode
+	// this.TplName = "homecontroller/maingrid9.tpl"
 }
 
 func (this *HomeController) MainGrid6() {
-	ccode := this.Ctx.Input.Param(":ccode")
-	alertorstrs := GetAlertor(ccode)
-	cmodelouts := make([][]ChannelModel, 0, 0)
-	if alertorstrs != "" {
-		codes := strings.Replace(alertorstrs, ",", "','", -1)
-		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
-		channellist := svc.GetCnameByCode(codes)
-		channelnews := make([]triggerhistory.Channels, len(channellist))
-		channels_arr := strings.Split(alertorstrs, ",")
-		for _, v := range channellist {
-			indexa := utils.SliceIndexOf(channels_arr, v.Code)
-			if indexa >= 0 {
-				channelnews[indexa] = v
-			}
-		}
-		for i := 0; i <= len(channelnews)/6; i++ {
-			cmodels := make([]ChannelModel, 0)
-			for k, v := range channelnews {
-				if k >= 6*i && k < 6*(i+1) {
-					t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
-					cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1})
-				}
-			}
-			if len(cmodels) > 0 {
-				cmodelouts = append(cmodelouts, cmodels)
-			}
-		}
+	// ccode := this.Ctx.Input.Param(":ccode")
+	// alertorstrs := GetAlertor(ccode)
+	// cmodelouts := make([][]ChannelModel, 0, 0)
+	// if alertorstrs != "" {
+	// 	codes := strings.Replace(alertorstrs, ",", "','", -1)
+	// 	svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
+	// 	channellist := svc.GetCnameByCode(codes)
+	// 	channelnews := make([]triggerhistory.Channels, len(channellist))
+	// 	channels_arr := strings.Split(alertorstrs, ",")
+	// 	for _, v := range channellist {
+	// 		indexa := utils.SliceIndexOf(channels_arr, v.Code)
+	// 		if indexa >= 0 {
+	// 			channelnews[indexa] = v
+	// 		}
+	// 	}
+	// 	for i := 0; i <= len(channelnews)/6; i++ {
+	// 		cmodels := make([]ChannelModel, 0)
+	// 		for k, v := range channelnews {
+	// 			if k >= 6*i && k < 6*(i+1) {
+	// 				t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+	// 				cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1, v.EModelType})
+	// 			}
+	// 		}
+	// 		if len(cmodels) > 0 {
+	// 			cmodelouts = append(cmodelouts, cmodels)
+	// 		}
+	// 	}
 
-	}
-	this.Data["list"] = cmodelouts
-	this.Data["total"] = len(cmodelouts)
-	this.Data["ccode"] = ccode
-	this.TplName = "homecontroller/maingrid6.tpl"
+	// }
+	// this.Data["list"] = cmodelouts
+	// this.Data["total"] = len(cmodelouts)
+	// this.Data["ccode"] = ccode
+	// this.TplName = "homecontroller/maingrid6.tpl"
 }
 
 func (this *HomeController) TriggerPost() {
@@ -197,16 +206,16 @@ func (this *HomeController) ChannelPost() {
 	ccode := this.Ctx.Input.Param(":ccode")
 	alertorstrs := GetAlertor(ccode)
 	cmodels := make([]ChannelModel, 0)
-	where := "1=1 "
-	var list []triggerhistory.Channels
+
+	var list []userchannels.Channels
 	var total int64 = 0
 	if alertorstrs != "" {
 		codes := strings.Replace(alertorstrs, ",", "','", -1)
-		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
-		where = where + " and Code in ('" + codes + "')"
+		svc := userchannels.GetChannelService(MCS_DBE)
+		where := "c.Code in ('" + codes + "')"
 		total, list = svc.GetCnameByCodePage(currentPage, size, "Id", false, where)
 		for _, v := range list {
-			t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+			t, h, o2, co2, cjtime, lv, ls, voltage, power := GetTH(v.Code)
 			//字符串分割
 			codde := strings.Replace(v.Code, "c", "", 1)
 			cdss := timeshijian(cjtime.Format("2006-01-02 15:04:05"))
@@ -216,7 +225,7 @@ func (this *HomeController) ChannelPost() {
 			} else {
 				online = 0
 			}
-			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, codde, lv, ls, v.DataItem, online})
+			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, codde, lv, ls, v.DataItem, online, v.EModelType, voltage, power})
 		}
 	}
 	var datainfo DataInfo
@@ -235,8 +244,8 @@ func (this *HomeController) ChannelPost5() {
 		svc := triggerhistory.GetTriggerHistoryService(utils.DBE)
 		channellist := svc.GetCnameByCode(codes)
 		for _, v := range channellist {
-			t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
-			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1})
+			t, h, o2, co2, cjtime, lv, ls, voltage, power := GetTH(v.Code)
+			cmodels = append(cmodels, ChannelModel{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.MaxValue, v.MinValue, v.Title, v.Code, lv, ls, v.DataItem, 1, v.EModelType, voltage, power})
 		}
 	}
 	this.Data["json"] = cmodels
@@ -264,7 +273,7 @@ func GetAlertor(bbmac string) string {
 	return selectstr
 }
 
-func GetTH(code string) (t, h, o2, co2 float32, cjtime time.Time, levelv, levelsignal int) {
+func GetTH(code string) (t, h, o2, co2 float32, cjtime time.Time, levelv, levelsignal, v, p int) {
 	lastdata, err := GetChannelLast(code)
 	if err == nil && lastdata.Time.Unix() > 0 {
 		t1 := lastdata.Temperature
@@ -275,6 +284,8 @@ func GetTH(code string) (t, h, o2, co2 float32, cjtime time.Time, levelv, levels
 		h = float32((int)(h1*10)) / 10.0
 		o2 = float32((int)(lastdata.O2*100)) / 100.0
 		co2 = float32((int)(lastdata.Co2*100)) / 100.0
+		v = int(lastdata.ElectricalSupply)
+		p = int(lastdata.ElectricalPower)
 		cjtime = lastdata.Time
 		switch {
 		case v1 < 2.7:
@@ -325,7 +336,7 @@ func (this *HomeController) MainGridAuto() {
 	channellist := svc.Getchannelbyuser(where, UserId)
 	//获取的数据,传入两值
 	for _, v := range channellist {
-		t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+		t, h, o2, co2, cjtime, lv, ls, voltage, power := GetTH(v.Code)
 		//0代表正常，1代表低温报警，2代表超温报警，3代表温度为0值
 		state := 0
 		//确认state值
@@ -337,7 +348,7 @@ func (this *HomeController) MainGridAuto() {
 			state = this.GetTemState(v.Code, "temperature", tem)
 		}
 
-		cmodels = append(cmodels, ChannelModelState{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.Title, v.Code, lv, ls, v.DataItem, state})
+		cmodels = append(cmodels, ChannelModelState{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.Title, v.Code, lv, ls, v.DataItem, state, voltage, power})
 	}
 	this.Data["UserId"] = UserId
 	this.Data["list"] = cmodels
@@ -409,7 +420,7 @@ func (this *HomeController) MainGridRefershAjaxAuto() {
 	channellist := svc.Getchannelbyuser(where, UserId)
 	//获取的数据,传入两值
 	for _, v := range channellist {
-		t, h, o2, co2, cjtime, lv, ls := GetTH(v.Code)
+		t, h, o2, co2, cjtime, lv, ls, voltage, power := GetTH(v.Code)
 		//0代表正常，1代表低温报警，2代表超温报警，3代表温度为0值
 		state := 0
 		//确认state值
@@ -421,7 +432,7 @@ func (this *HomeController) MainGridRefershAjaxAuto() {
 			state = this.GetTemState(v.Code, "temperature", tem)
 		}
 
-		cmodels = append(cmodels, ChannelModelState{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.Title, v.Code, lv, ls, v.DataItem, state})
+		cmodels = append(cmodels, ChannelModelState{t, h, o2, co2, cjtime.Format("2006-01-02 15:04:05"), v.Title, v.Code, lv, ls, v.DataItem, state, voltage, power})
 	}
 
 	this.Data["json"] = cmodels

backend/src/dashoo.cn/alertorapp/go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/beego/i18n v0.0.0
 	github.com/go-xorm/xorm v0.7.9
 	github.com/howeyc/fsnotify v0.9.0
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/nsqio/go-nsq v1.1.0
 	xorm.io/xorm v1.1.2
 

backend/src/dashoo.cn/alertorapp/go.sum

@@ -1,6 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
@@ -16,15 +17,19 @@ github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx2
 github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
+github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
 github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -41,18 +46,21 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -64,26 +72,42 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
+github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lunny/godbc v0.0.0-20131220142036-57f94ee1eb13 h1:aQopy7KTYTKDFWHzYusiT8lLRIiHECYk2v7VShtkWNE=
 github.com/lunny/godbc v0.0.0-20131220142036-57f94ee1eb13/go.mod h1:8e6WOK6PpJb5JSDf2cutQwrywJw3TimZhvpj8Z3m7F0=
+github.com/lunny/xorm v0.3.1 h1:cd1S/u9UswQxuT3xykQoSp+RXJADX3nokTv9A0pm4Aw=
+github.com/lunny/xorm v0.3.1/go.mod h1:dF05xwM+wPY9LVFW4VulsTHZAW1TZZwISDk2SGCd9Ao=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mediocregopher/radix.v2 v0.0.0-20181115013041-b67df6e626f9/go.mod h1:fLRUbhbSd5Px2yKUaGYYPltlyxi1guJz1vCmo1RQL50=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
@@ -91,7 +115,9 @@ github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4
 github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
 github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -106,23 +132,30 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
 github.com/unknwon/goconfig v0.0.0-20200908083735-df7de6a44db8/go.mod h1:qu2ZQ/wcC/if2u32263HTVC39PeOQRSmidQk3DuDFQ8=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -134,6 +167,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -181,10 +215,12 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78 h1:M8tBwCtWD/cZV9DZpFYRUgaymAYAr+aIUTWzDaM3uPs=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -196,11 +232,16 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
@@ -208,20 +249,32 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009 h1:u0oCo5b9wyLr++HF3AN9JicGhkUxJhMz51+8TIZH9N0=
 modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878=
+modernc.org/ccgo/v3 v3.9.0 h1:JbcEIqjw4Agf+0g3Tc85YvfYqkkFOv6xBwS4zkfqSoA=
 modernc.org/ccgo/v3 v3.9.0/go.mod h1:nQbgkn8mwzPdp4mm6BT6+p85ugQ7FrGgIcYaE7nSrpY=
+modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.8.0 h1:Pp4uv9g0csgBMpGPABKtkieF6O5MGhfGo6ZiOdlYfR8=
 modernc.org/libc v1.8.0/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84 h1:rgEUzE849tFlHSoeCrKyS9cZAljC+DY7MdMHKq6R6sY=
 modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84/go.mod h1:PGzq6qlhyYjL6uVbSgS6WoF7ZopTW/sI7+7p+mb4ZVU=
+modernc.org/strutil v1.1.0 h1:+1/yCzZxY2pZwwrsbH+4T7BQMoLQ9QiBshRC9eicYsc=
 modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/tcl v1.5.0 h1:euZSUNfE0Fd4W8VqXI1Ly1v7fqDJoBuAV88Ea+SnaSs=
 modernc.org/tcl v1.5.0/go.mod h1:gb57hj4pO8fRrK54zveIfFXBaMHK3SKJNWcmRw1cRzc=
+modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
+modernc.org/z v1.0.1 h1:WyIDpEpAIx4Hel6q/Pcgj/VhaQV5XPJ2I6ryIYbjnpc=
 modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
 xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
 xorm.io/builder v0.3.8 h1:P/wPgRqa9kX5uE0aA1/ukJ23u9KH0aSRpHLwDKXigSE=

backend/src/dashoo.cn/alertorapp/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/astaxie/beego"
 	"github.com/beego/i18n"
+	"github.com/nsqio/go-nsq"
 
 	"dashoo.cn/alertorapp/controllers"
 	"dashoo.cn/alertorapp/routers"
@@ -29,6 +30,7 @@ func initialize() {
 
 	// Initialize data.
 	utils.InitDb()
+	controllers.MCS_DBE = utils.InitDbByConf("mcs_db")
 	//utils.DBE.Sync(new(Base_Organize), new(Cms_Article), new(Cms_ArticleTags), new(Cms_Category), new(Cms_Link),
 	//	new(Cms_Site), new(Cms_Tag), new(Cms_User))
 
@@ -37,9 +39,9 @@ func initialize() {
 	//初始化redis
 	redis.InitRedis(utils.Cfg.MustInt("redis", "poolnum", 5), utils.Cfg.MustValue("redis", "addr"))
 
-	// cfg := nsq.NewConfig()
-	// controllers.Producernsq, _ = nsq.NewProducer(utils.Cfg.MustValue("sendnsq", "nsqdtcpaddr"), cfg)
-	// controllers.Nsqtopic = utils.Cfg.MustValue("sendnsq", "topic")
+	cfg := nsq.NewConfig()
+	controllers.Producernsq, _ = nsq.NewProducer(utils.Cfg.MustValue("sendnsq", "nsqdtcpaddr"), cfg)
+	controllers.Nsqtopic = utils.Cfg.MustValue("sendnsq", "topic")
 }
 
 func main() {