postman
/
goAdapter
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

修改：1、去掉一些注释代码

This commit is contained in:
pengwang 2021-09-27 14:08:56 +08:00
parent 7ca9b3ac7d
commit 23fe0120d8
4 changed files with 210 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/commInterface/commIoOut.go
View File

@ -106,7 +106,7 @@ func ReadCommIoOutInterfaceListFromJson() bool {
}
return true
} else {
log.Println("commIoOutInterface.json is not exist")
setting.Logger.Info("commIoOutInterface.json is not exist")
return false
}

6
httpServer/routerWeb.go
View File

@ -28,8 +28,8 @@ func RouterWeb() {
loginRouter.POST("/login", apiLogin)
}
//router.Use(JWTAuth())
//{
router.Use(JWTAuth())
{
systemRouter := router.Group("/api/v1/system")
{
systemRouter.POST("/reboot", apiSystemReboot)
@ -248,7 +248,7 @@ func RouterWeb() {
reportRouter.DELETE("/node/param", apiDeleteReportNodeWParam)
}
//}
}
if err := router.Run(":8080"); err != nil {
setting.Logger.Errorf("gin run err,%v", err)

8
releaseAll.sh
View File

@ -1,8 +0,0 @@
make linux-armv5
cp openGW_armV5 ../Release/
make linux-arm64
cp openGW_arm64 ../Release/
make linux-amd64
cp openGW_linux64 ../Release/
make windows-amd64
cp openGW_win64.exe ../Release/

129
report/mqttEMQX/mqttEmqxReport.go
View File

@ -222,132 +222,3 @@ func (r *ReportServiceParamEmqxTemplate) NodePropertyPost(name []string) {
}
}
}
//func (r *ReportServiceParamEmqxTemplate) NodePropertyPost(name []string) {
//
// nodeList := make([]ReportServiceNodeParamEmqxTemplate, 0)
// for _, n := range name {
// for k, v := range r.NodeList {
// if n == v.Name {
// nodeList = append(nodeList, v)
// //上报故障计数值先加，收到正确回应后清0
// r.NodeList[k].ReportErrCnt++
// }
// }
// }
//
// pageCnt := len(nodeList) / 20 //单包最大发送20个设备
// if len(nodeList)%20 != 0 {
// pageCnt += 1
// }
//
// for pageIndex := 0; pageIndex < pageCnt; pageIndex++ {
// if pageIndex != (pageCnt - 1) {
// propertyPost := MQTTPropertyPostTemplate{
// ID: strconv.Itoa(MsgID),
// Version: "V1.0",
// Ack: 1,
// }
// node := nodeList[20*pageIndex : 20*pageIndex+20]
// for _, n := range node {
// for _, c := range device.CollectInterfaceMap {
// if c.CollInterfaceName == n.CollInterfaceName {
// for _, d := range c.DeviceNodeMap {
// if d.Name == n.Name {
// propertyPostParam := MQTTPropertyPostParamTemplate{
// ClientID: n
// }
// for _, v := range d.VariableMap {
// if len(v.Value) >= 1 {
// index := len(v.Value) - 1
// property := propertyTemplate{}
// property.Name = v.Name
// property.Value = v.Value[index].Value
// valueMap = append(valueMap, property)
// }
// }
// NodeValue := MQTTEmqxNodeValueTemplate{}
// NodeValue.ValueMap = valueMap
// NodeValue.ProductKey = n.Param.ProductKey
// NodeValue.DeviceName = n.Param.DeviceName
// NodeValueMap = append(NodeValueMap, NodeValue)
// }
// }
// }
// }
// }
//
//
// MsgID++
// MQTTEmqxPropertyPost(r.GWParam, NodeValueMap)
// select {
// case frame := <-r.ReceiveReportPropertyAckFrameChan:
// {
// if frame.Code == 200 {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost OK", r.GWParam.ServiceName)
// } else {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost Err", r.GWParam.ServiceName)
// }
// }
// case <-time.After(time.Millisecond * 2000):
// {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost Err", r.GWParam.ServiceName)
// }
// }
// } else { //最后一页
// NodeValueMap := make([]MQTTEmqxNodeValueTemplate, 0)
// valueMap := make([]propertyTemplate, 0)
// node := nodeList[20*pageIndex : len(nodeList)]
// //log.Printf("nodeList %v\n", node)
// for _, n := range node {
// for _, c := range device.CollectInterfaceMap {
// if c.CollInterfaceName == n.CollInterfaceName {
// for _, d := range c.DeviceNodeMap {
// if d.Name == n.Name {
// for _, v := range d.VariableMap {
// if len(v.Value) >= 1 {
// index := len(v.Value) - 1
// property := propertyTemplate{}
// property.Name = v.Name
// property.Value = v.Value[index].Value
// valueMap = append(valueMap, property)
// }
// }
// NodeValue := MQTTEmqxNodeValueTemplate{}
// NodeValue.ValueMap = valueMap
// NodeValue.ProductKey = n.Param.ProductKey
// NodeValue.DeviceName = n.Param.DeviceName
// NodeValueMap = append(NodeValueMap, NodeValue)
// }
// }
// }
// }
// }
//
// mqttEmqxRegister := MQTTEmqxRegisterTemplate{
// RemoteIP: r.GWParam.IP,
// RemotePort: r.GWParam.Port,
// ProductKey: r.GWParam.Param.ProductKey,
// DeviceName: r.GWParam.Param.DeviceName,
// DeviceSecret: r.GWParam.Param.DeviceSecret,
// }
// //setting.Logger.Debugf("NodeValueMap %v", NodeValueMap)
// MQTTEmqxNodePropertyPost(r.GWParam.MQTTClient, mqttEmqxRegister, NodeValueMap)
//
// select {
// case frame := <-r.ReceiveReportPropertyAckFrameChan:
// {
// if frame.Code == 200 {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost OK", r.GWParam.ServiceName)
// } else {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost Err", r.GWParam.ServiceName)
// }
// }
// case <-time.After(time.Millisecond * 2000):
// {
// setting.Logger.Debugf("%s MQTTEmqxNodePropertyPost Err", r.GWParam.ServiceName)
// }
// }
// }
// }
//}