liuxiulin 7 月之前
父節點
當前提交
21e5969dd4
共有 3 個文件被更改,包括 15 次插入8 次删除
  1. 4 4
      services/knowoapi/controllers/ota.go
  2. 9 3
      services/knowoapi/model/ota.go
  3. 2 1
      services/knowoapi/services/ota.go

+ 4 - 4
services/knowoapi/controllers/ota.go

@@ -14,7 +14,7 @@ type OtaController struct {
 }
 
 // Post post
-// POST /user/rule_chain
+// POST /ota
 func (a *OtaController) Post() {
 	ptl := new(models.Ota)
 	if err := parseBody(a.Ctx, ptl); err != nil {
@@ -31,7 +31,7 @@ func (a *OtaController) Post() {
 }
 
 // Delete delete
-// DELETE /user/rule_chain
+// DELETE /user/ota
 func (a *OtaController) Delete() {
 	Ota := new(models.Ota)
 	if err := parseBody(a.Ctx, Ota); err != nil {
@@ -42,7 +42,7 @@ func (a *OtaController) Delete() {
 		responseError(a.Ctx, ErrDatabase, err.Error())
 		return
 	}
-	done(a.Ctx, Ota)
+	done(a.Ctx, "删除成功")
 }
 
 // Put 更新
@@ -61,7 +61,7 @@ func (a *OtaController) Put() {
 }
 
 // Get  Ota
-// GET /user/ota?pi=&ps=&name=&vendor
+// GET /user/ota?pi=&ps=&name=&version
 func (a *OtaController) Get() {
 	pi, err := a.Ctx.URLParamInt("pi")
 	if err != nil {

+ 9 - 3
services/knowoapi/model/ota.go

@@ -64,10 +64,16 @@ func (a *Ota) Delete(Ota *models.Ota) error {
 	if _, ok := cache.Get(key); ok {
 		cache.Delete(key)
 	}
-	return a.db.Unscoped().Delete(Ota).Error
+	return a.db.Delete(Ota).Error
 }
 
 // Update update
-func (a *Ota) Update(Ota *models.Ota) error {
-	return a.db.Save(Ota).Error
+func (a *Ota) Update(Ota *models.Ota) (data models.Ota, err error) {
+	cache := getCache()
+	key := fmt.Sprintf("Sensor:%d", Ota.ID)
+	if _, ok := cache.Get(key); ok {
+		cache.Delete(key)
+	}
+	err = a.db.Model(&data).Update(Ota).Error
+	return
 }

+ 2 - 1
services/knowoapi/services/ota.go

@@ -49,7 +49,8 @@ func (a otaService) Delete(Ota *models.Ota) error {
 }
 
 func (a otaService) Update(Ota *models.Ota) error {
-	return a.models.Ota.Update(Ota)
+	_, err := a.models.Ota.Update(Ota)
+	return err
 }
 
 func (a otaService) Upgrade(params models.OtaUpgradeParams) error {