更新api

pkg/models/protocal.go

@@ -11,11 +11,11 @@ type Protocal struct {
 	gorm.Model
 	Name          string `gorm:"size:30;not null;"` //名称
 	Label         string `gorm:"size:20;not null;"` // 标签
-	Type          int
-	ReadWriteType int
-	UnitSymbol    string
-	Description   string
-	ProductID     uint //所属产品
+	Type          int    //读写类型
+	ReadWriteType int    //数据类型
+	UnitSymbol    string //单位
+	Description   string //备注
+	ProductID     uint   //所属产品
 }
 
 // Validate 验证

pkg/rpcs/registry.go

@@ -5,6 +5,7 @@ type ArgsDeviceRegister struct {
 	ProductKey    string
 	DeviceCode    string
 	DeviceVersion string
+	ModuleName    string
 }
 
 // ArgsDeviceUpdate device update args

services/fileaccess/fileaccess.go

@@ -149,8 +149,7 @@ func (f *FileAccess) DeleteFile(args *rpcs.ArgsDeleteFile, reply *rpcs.ReplyEmpt
 	reg := regexp.MustCompile(`upload/\$*.*`)
 	src := reg.FindString(args.FileName)
 	err := os.Remove(src)
-	server.Log.Error(err)
-	return nil
+	return err
 }
 
 // MoveFile move a file to new path

services/httpaccess/actions.go

@@ -29,26 +29,29 @@ func renderError(code int, err error) Common {
 	return result
 }
 
-// device register args
+// DeviceRegisterArgs device register args
 type DeviceRegisterArgs struct {
 	ProductKey string `json:"product_key"  binding:"required"`
 	DeviceCode string `json:"device_code"  binding:"required"`
 	Version    string `json:"version"  binding:"required"`
+	ModuleName string `json:"module" binding:"required"`
 }
 
-// device authentication args
+// DeviceAuthArgs device authentication args
 type DeviceAuthArgs struct {
 	DeviceId     int64  `json:"device_id" binding:"required"`
 	DeviceSecret string `json:"device_secret" binding:"required"`
 	Protocol     string `json:"protocol" binding:"required"`
 }
 
+// RegisterDevice 设备激活
 func RegisterDevice(args DeviceRegisterArgs, r render.Render) {
 	server.Log.Printf("ACTION RegisterDevice, args:: %v ", args)
 	rpcargs := &rpcs.ArgsDeviceRegister{
 		ProductKey:    args.ProductKey,
 		DeviceCode:    args.DeviceCode,
 		DeviceVersion: args.Version,
+		ModuleName:    args.ModuleName,
 	}
 	device := &models.Device{}
 	err := server.RPCCallByName("registry", "Registry.RegisterDevice", rpcargs, device)

services/knowoapi/controllers/device.go

@@ -142,7 +142,9 @@ func (a *DeviceController) GetActivechart() {
 		responseError(a.Ctx, ErrDatabase, err.Error())
 		return
 	}
-	done(a.Ctx, datas)
+	done(a.Ctx, map[string]interface{}{
+		"chart": datas,
+	})
 }
 
 // GetLivechart 获取N日内的活跃数据

services/registry/registry.go

@@ -284,6 +284,7 @@ func (r *Registry) RegisterDevice(args *rpcs.ArgsDeviceRegister, reply *models.D
 		reply.DeviceDescription = product.ProductDescription
 		reply.DeviceVersion = args.DeviceVersion
 		reply.VendorID = uint(product.VendorID)
+		reply.ModuleName = args.ModuleName
 		err = db.Save(reply).Error
 		if err != nil {
 			return err