update sub_device

pkg/rpcs/device_net_config.go

@@ -8,3 +8,9 @@ type ArgsCheckDeviceNetConfig struct {
 type ReplyCheckDeviceNetConfig struct {
 	Result bool `json:"result"`
 }
+
+type SubDeviceArgs struct {
+	DeviceCode  string `json:"device_code"`
+	SubDeviceId string `json:"sub_device_id"`
+	Status      int    `json:"status"`
+}

services/registry/registry.go

@@ -545,31 +545,25 @@ func (r *Registry) CheckDeviceNetConfig(args *rpcs.ArgsCheckDeviceNetConfig, rep
 	return nil
 }
 
-// SaveSubDevice try to save a sub_device
-func (r *Registry) SaveSubDevice(subDevice *models.SubDevice, reply *models.SubDevice) error {
+// UpdateSubDevice  update
+func (r *Registry) UpdateSubDevice(args *rpcs.SubDeviceArgs, reply *models.SubDevice) error {
 	db, err := getDB()
 	if err != nil {
 		return err
 	}
-	if db.Where(&models.SubDevice{SubDeviceID: subDevice.SubDeviceID}).First(reply).RecordNotFound() {
+	if db.Where(&models.SubDevice{SubDeviceID: args.SubDeviceId}).First(reply).RecordNotFound() {
 		reply.RecordId = guid.S()
-		reply.DeviceCode = subDevice.DeviceCode
-		reply.SubDeviceID = subDevice.SubDeviceID
-		reply.Status = 1
+		reply.DeviceCode = args.DeviceCode
+		reply.SubDeviceID = args.SubDeviceId
+		reply.Status = args.Status
 
 		err = db.Save(reply).Error
 		if err != nil {
 			return err
 		}
 	} else {
-		//delete cache
-		cache := getCache()
-		cacheKey := fmt.Sprintf("SubDevice:%v", subDevice.SubDeviceID)
-		if _, ok := cache.Get(cacheKey); ok {
-			cache.Delete(cacheKey)
-		}
 		// sub_device has already been saved. just update status .
-		reply.Status = 1
+		reply.Status = args.Status
 		err = db.Save(reply).Error
 		if err != nil {
 			return err
@@ -577,31 +571,3 @@ func (r *Registry) SaveSubDevice(subDevice *models.SubDevice, reply *models.SubD
 	}
 	return nil
 }
-
-// UpdateSubDeviceStatus will update a sub_device status
-func (r *Registry) UpdateSubDeviceStatus(subDevice *models.SubDevice, reply *models.SubDevice) error {
-	db, err := getDB()
-	if err != nil {
-		return err
-	}
-
-	err = db.Where(&models.SubDevice{SubDeviceID: subDevice.SubDeviceID}).First(reply).Error
-	if err != nil {
-		return err
-	}
-	//delete cache
-	cache := getCache()
-	cacheKey := fmt.Sprintf("SubDevice:%v", subDevice.SubDeviceID)
-	if _, ok := cache.Get(cacheKey); ok {
-		cache.Delete(cacheKey)
-	}
-
-	reply.Status = subDevice.Status
-
-	err = db.Save(reply).Error
-	if err != nil {
-		return err
-	}
-
-	return nil
-}