From 6a558d5f2484acf08072c500217e24b50c98a076 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Thu, 19 Nov 2020 09:14:25 +0800
Subject: [PATCH] task #8433

---
 src/server/repo/def.go          |  3 ++-
 src/server/repo/instances.go    |  8 +++++---
 src/server/repo/ranges.go       |  8 +++++---
 src/server/service/config.go    | 13 +++++++------
 src/server/service/def.go       |  9 +++------
 src/server/service/excel.go     | 14 +++++++-------
 src/server/service/instances.go | 14 +++++++-------
 src/server/service/ranges.go    | 14 +++++++-------
 src/server/service/text.go      | 12 ++++++------
 9 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/src/server/repo/def.go b/src/server/repo/def.go
index 3e559fe5..8619ec09 100644
--- a/src/server/repo/def.go
+++ b/src/server/repo/def.go
@@ -34,9 +34,10 @@ func (r *DefRepo) Update(def *model.ZdDef) (err error) {
 
 func (r *DefRepo) Remove(id uint) (err error) {
 	var def model.ZdDef
-	def.ID = uint(id)
+	def.ID = id
 
 	err = r.db.Delete(&def).Error
+	err = r.db.Where("defID = ?", id).Delete(&model.ZdField{}).Error
 
 	return
 }
diff --git a/src/server/repo/instances.go b/src/server/repo/instances.go
index 25eefa1c..c254f997 100644
--- a/src/server/repo/instances.go
+++ b/src/server/repo/instances.go
@@ -25,9 +25,11 @@ func (r *InstancesRepo) Save(model *model.ZdInstances) (err error) {
 }
 
 func (r *InstancesRepo) Remove(id uint) (err error) {
-	model := model.ZdInstances{}
-	model.ID = id
-	err = r.db.Delete(model).Error
+	inst := model.ZdInstances{}
+	inst.ID = id
+
+	err = r.db.Delete(inst).Error
+	err = r.db.Where("instancesID = ?", id).Delete(&model.ZdInstancesItem{}).Error
 
 	return
 }
diff --git a/src/server/repo/ranges.go b/src/server/repo/ranges.go
index 24170b39..f750bc6e 100644
--- a/src/server/repo/ranges.go
+++ b/src/server/repo/ranges.go
@@ -25,9 +25,11 @@ func (r *RangesRepo) Save(ranges *model.ZdRanges) (err error) {
 }
 
 func (r *RangesRepo) Remove(id uint) (err error) {
-	model := model.ZdRanges{}
-	model.ID = id
-	err = r.db.Delete(model).Error
+	ranges := model.ZdRanges{}
+	ranges.ID = id
+
+	err = r.db.Delete(ranges).Error
+	err = r.db.Where("rangesID = ?", id).Delete(&model.ZdRangesItem{}).Error
 
 	return
 }
diff --git a/src/server/service/config.go b/src/server/service/config.go
index 0a49068a..88fee545 100644
--- a/src/server/service/config.go
+++ b/src/server/service/config.go
@@ -3,8 +3,9 @@ package serverService
 import (
 	"github.com/easysoft/zendata/src/model"
 	"github.com/easysoft/zendata/src/server/repo"
-	logUtils "github.com/easysoft/zendata/src/utils/log"
+	fileUtils "github.com/easysoft/zendata/src/utils/file"
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
+	"github.com/jinzhu/gorm"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
 )
@@ -37,14 +38,14 @@ func (s *ConfigService) Save(config *model.ZdConfig) (err error) {
 }
 
 func (s *ConfigService) Remove(id int) (err error) {
-	err = s.configRepo.Remove(uint(id))
-	if err != nil {
+	var old model.ZdConfig
+	old, err = s.configRepo.Get(uint(id))
+	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	config, _ := s.configRepo.Get(uint(id))
-	logUtils.PrintTo(config.Path)
-	//fileUtils.RemoveExist(config.Path)
+	err = s.configRepo.Remove(uint(id))
 
 	return
 }
diff --git a/src/server/service/def.go b/src/server/service/def.go
index 9940b090..fdd390be 100644
--- a/src/server/service/def.go
+++ b/src/server/service/def.go
@@ -74,16 +74,13 @@ func (s *DefService) Update(def *model.ZdDef) (err error) {
 }
 
 func (s *DefService) Remove(id int) (err error) {
-	var oldDef model.ZdDef
-	oldDef, err = s.defRepo.Get(uint(id))
+	var old model.ZdDef
+	old, err = s.defRepo.Get(uint(id))
 	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	fileUtils.RemoveExist(oldDef.Path)
-
-	var def model.ZdDef
-	def.ID = uint(id)
 	err = s.defRepo.Remove(uint(id))
 	return
 }
diff --git a/src/server/service/excel.go b/src/server/service/excel.go
index aed7393a..8d0501cd 100644
--- a/src/server/service/excel.go
+++ b/src/server/service/excel.go
@@ -3,8 +3,9 @@ package serverService
 import (
 	"github.com/easysoft/zendata/src/model"
 	"github.com/easysoft/zendata/src/server/repo"
-	logUtils "github.com/easysoft/zendata/src/utils/log"
+	fileUtils "github.com/easysoft/zendata/src/utils/file"
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
+	"github.com/jinzhu/gorm"
 )
 
 type ExcelService struct {
@@ -35,15 +36,14 @@ func (s *ExcelService) Save(excel *model.ZdExcel) (err error) {
 }
 
 func (s *ExcelService) Remove(id int) (err error) {
-	err = s.excelRepo.Remove(uint(id))
-	if err != nil {
+	var old model.ZdExcel
+	old, err = s.excelRepo.Get(uint(id))
+	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	excel, _ := s.excelRepo.Get(uint(id))
-	logUtils.PrintTo(excel.Path)
-	//fileUtils.RemoveExist(excel.Path)
-
+	err = s.excelRepo.Remove(uint(id))
 	return
 }
 
diff --git a/src/server/service/instances.go b/src/server/service/instances.go
index 628a8049..35d8f456 100644
--- a/src/server/service/instances.go
+++ b/src/server/service/instances.go
@@ -4,8 +4,9 @@ import (
 	"github.com/easysoft/zendata/src/model"
 	"github.com/easysoft/zendata/src/server/repo"
 	constant "github.com/easysoft/zendata/src/utils/const"
-	logUtils "github.com/easysoft/zendata/src/utils/log"
+	fileUtils "github.com/easysoft/zendata/src/utils/file"
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
+	"github.com/jinzhu/gorm"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
 )
@@ -39,15 +40,14 @@ func (s *InstancesService) Save(instances *model.ZdInstances) (err error) {
 }
 
 func (s *InstancesService) Remove(id int) (err error) {
-	err = s.instancesRepo.Remove(uint(id))
-	if err != nil {
+	var old model.ZdInstances
+	old, err = s.instancesRepo.Get(uint(id))
+	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	instances, _ := s.instancesRepo.Get(uint(id))
-	logUtils.PrintTo(instances.Path)
-	//fileUtils.RemoveExist(instances.Path)
-
+	err = s.instancesRepo.Remove(uint(id))
 	return
 }
 
diff --git a/src/server/service/ranges.go b/src/server/service/ranges.go
index bf618c8e..ee747b90 100644
--- a/src/server/service/ranges.go
+++ b/src/server/service/ranges.go
@@ -3,8 +3,9 @@ package serverService
 import (
 	"github.com/easysoft/zendata/src/model"
 	"github.com/easysoft/zendata/src/server/repo"
-	logUtils "github.com/easysoft/zendata/src/utils/log"
+	fileUtils "github.com/easysoft/zendata/src/utils/file"
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
+	"github.com/jinzhu/gorm"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
 )
@@ -37,15 +38,14 @@ func (s *RangesService) Save(ranges *model.ZdRanges) (err error) {
 }
 
 func (s *RangesService) Remove(id int) (err error) {
-	err = s.rangesRepo.Remove(uint(id))
-	if err != nil {
+	var old model.ZdRanges
+	old, err = s.rangesRepo.Get(uint(id))
+	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	ranges, _ := s.rangesRepo.Get(uint(id))
-	logUtils.PrintTo(ranges.Path)
-	//fileUtils.RemoveExist(ranges.Path)
-
+	err = s.rangesRepo.Remove(uint(id))
 	return
 }
 
diff --git a/src/server/service/text.go b/src/server/service/text.go
index 5662edde..5637d206 100644
--- a/src/server/service/text.go
+++ b/src/server/service/text.go
@@ -4,8 +4,8 @@ import (
 	"github.com/easysoft/zendata/src/model"
 	"github.com/easysoft/zendata/src/server/repo"
 	fileUtils "github.com/easysoft/zendata/src/utils/file"
-	logUtils "github.com/easysoft/zendata/src/utils/log"
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
+	"github.com/jinzhu/gorm"
 )
 
 type TextService struct {
@@ -36,14 +36,14 @@ func (s *TextService) Save(text *model.ZdText) (err error) {
 }
 
 func (s *TextService) Remove(id int) (err error) {
-	err = s.textRepo.Remove(uint(id))
-	if err != nil {
+	var old model.ZdText
+	old, err = s.textRepo.Get(uint(id))
+	if err == gorm.ErrRecordNotFound {
 		return
 	}
+	fileUtils.RemoveExist(old.Path)
 
-	text, _ := s.textRepo.Get(uint(id))
-	logUtils.PrintTo(text.Path)
-	//fileUtils.RemoveExist(text.Path)
+	err = s.textRepo.Remove(uint(id))
 
 	return
 }
-- 
GitLab