category: 畜牧分类删除同步

backend/operation/pasture.proto

@@ -269,11 +269,12 @@ message FormulaOptionEnum {
 }
 // 牧场端分类数据同步
 message ClassRequest {
-  string key_word = 1;     // 关键字
-  int32 pasture_id = 2;    // 牧场id
-  int32 parent_id = 3;    // 一类id
-  string parent_name = 4; // 一类名称
-  string name = 5;     // 分类名称
-  string number = 6;    // 分类编号
-  IsShow.Kind is_show = 7;  // 是否展示
+  string key_word = 1;         // 关键字
+  int32 pasture_id = 2;        // 牧场id
+  int32 parent_id = 3;         // 一类id
+  string parent_name = 4;      // 一类名称
+  string name = 5;             // 分类名称
+  string number = 6;           // 分类编号
+  IsShow.Kind is_show = 7;     // 是否展示
+  IsShow.Kind is_delete = 8;   // 是否删除
 }

http/handler/pasture/cattle_forage_category.go

@@ -12,13 +12,6 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-/*// ParentCattleCategoryList 牲畜父类列表
-func ParentCattleCategoryList(c *gin.Context) {
-	res := middleware.BackendOperation(c).OpsService.ParentCattleCategoryList(c)
-	c.JSON(http.StatusOK, apiok.CommonResponse(res))
-}
-*/
-
 func AddCattleCategory(c *gin.Context) {
 	var req operationPb.AddCattleCategoryRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
@@ -145,12 +138,6 @@ func SearchCattleCategory(c *gin.Context) {
 	ginutil.JSONResp(c, res)
 }
 
-/*// ParentForageCategoryList 饲料父类列表
-func ParentForageCategoryList(c *gin.Context) {
-	res := middleware.BackendOperation(c).OpsService.ParentForageCategoryList(c)
-	c.JSON(http.StatusOK, apiok.CommonResponse(res))
-}*/
-
 func AddForageCategory(c *gin.Context) {
 	var req operationPb.AddForageCategoryRequest
 	if err := ginutil.BindProto(c, &req); err != nil {

model/group_pasture.go

@@ -55,6 +55,8 @@ const (
 	PastureAccountDistributionURl = "pasture/account/distribute"
 	ForageCategoryDistributionURl = "pasture/forage_category/distribute"
 	CattleCategoryDistributionURl = "pasture/cattle_category/distribute"
+	CattleCategoryDeleteURl       = "pasture/cattle_category/delete"
+	ForageCategoryDeleteURl       = "pasture/cattle_category/delete"
 )
 
 var (

model/pasture_data.go

@@ -63,3 +63,9 @@ type CategoryRequest struct {
 	IsShow     int32  `json:"is_show"`
 	GroupId    int32  `json:"group_id"`
 }
+
+type CategoryDeleteRequest struct {
+	PastureId int32 `json:"pasture_id"`
+	GroupId   int32 `json:"group_id"`
+	IsDelete  int32 `json:"is_delete"`
+}

module/backend/pasture_service.go

@@ -211,8 +211,7 @@ func (s *StoreEntry) AddCattleCategory(ctx context.Context, req *operationPb.Add
 	cattleCategory := model.NewCattleCategory(req)
 	if err := s.DB.Create(cattleCategory).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(req.ParentId),
 			ParentName: req.ParentName,
@@ -222,8 +221,10 @@ func (s *StoreEntry) AddCattleCategory(ctx context.Context, req *operationPb.Add
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(cattleCategory.Id),
 		}
-		s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body); err != nil {
+			zaplog.Error("AddCattleCategory", zap.Any("CategoryDistribution", err))
+		}
+	}
 
 	return nil
 }
@@ -248,9 +249,7 @@ func (s *StoreEntry) EditCattleCategory(ctx context.Context, req *operationPb.Ad
 		Where("id = ?", req.Id).
 		Updates(updateData).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(req.ParentId),
 			ParentName: req.ParentName,
@@ -260,8 +259,10 @@ func (s *StoreEntry) EditCattleCategory(ctx context.Context, req *operationPb.Ad
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(req.Id),
 		}
-		s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body); err != nil {
+			zaplog.Error("EditCattleCategory", zap.Any("CategoryDistribution", err))
+		}
+	}
 	return nil
 }
 
@@ -277,19 +278,20 @@ func (s *StoreEntry) IsShowCattleCategory(ctx context.Context, req *operationPb.
 
 	if err := s.DB.Model(new(model.CattleCategory)).Where("id = ?", req.CattleCategoryId).Update("is_show", req.IsShow).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(cattleCategory.ParentId),
 			ParentName: cattleCategory.ParentName,
 			Name:       cattleCategory.Name,
-			Id:         int32(req.CattleCategoryId),
+			Id:         req.CattleCategoryId,
 			Number:     cattleCategory.Number,
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(cattleCategory.Id),
 		}
-		s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.CattleCategoryDistributionURl, body); err != nil {
+			zaplog.Error("IsShowCattleCategory", zap.Any("CategoryDistribution", err), zap.Any("body", body))
+		}
+	}
 	return nil
 }
 
@@ -305,6 +307,14 @@ func (s *StoreEntry) DeleteCattleCategory(ctx context.Context, cattleCategoryId
 
 	if err := s.DB.Model(new(model.CattleCategory)).Where("id = ?", cattleCategoryId).Update("is_delete", operationPb.IsShow_NO).Error; err != nil {
 		return xerr.WithStack(err)
+	} else {
+		body := &model.CategoryDeleteRequest{
+			GroupId:  int32(cattleCategory.Id),
+			IsDelete: int32(operationPb.IsShow_OK),
+		}
+		if err = s.CategoryDelete(ctx, model.CattleCategoryDeleteURl, body); err != nil {
+			zaplog.Error("DeleteCattleCategory", zap.Any("CategoryDelete", err), zap.Any("body", body))
+		}
 	}
 	return nil
 }
@@ -349,8 +359,7 @@ func (s *StoreEntry) AddForageCategory(ctx context.Context, req *operationPb.Add
 	forageCategory := model.NewForageCategory(req)
 	if err := s.DB.Create(forageCategory).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(req.ParentId),
 			ParentName: req.ParentName,
@@ -360,8 +369,10 @@ func (s *StoreEntry) AddForageCategory(ctx context.Context, req *operationPb.Add
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(forageCategory.Id),
 		}
-		s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body); err != nil {
+			zaplog.Error("AddForageCategory", zap.Any("CategoryDistribution", err), zap.Any("body", body))
+		}
+	}
 	return nil
 }
 
@@ -384,8 +395,7 @@ func (s *StoreEntry) EditForageCategory(ctx context.Context, req *operationPb.Ad
 		Where("id = ?", req.Id).
 		Updates(updateData).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(req.ParentId),
 			ParentName: req.ParentName,
@@ -395,8 +405,10 @@ func (s *StoreEntry) EditForageCategory(ctx context.Context, req *operationPb.Ad
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(req.Id),
 		}
-		s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body); err != nil {
+			zaplog.Error("EditForageCategory", zap.Any("CategoryDistribution", err), zap.Any("body", body))
+		}
+	}
 
 	return nil
 }
@@ -413,8 +425,7 @@ func (s *StoreEntry) IsShowForageCategory(ctx context.Context, req *operationPb.
 
 	if err := s.DB.Model(new(model.ForageCategory)).Where("id = ?", req.ForageCategoryId).Update("is_show", req.IsShow).Error; err != nil {
 		return xerr.WithStack(err)
-	}
-	defer func() {
+	} else {
 		body := &model.CategoryRequest{
 			ParentId:   int32(forageCategory.ParentId),
 			ParentName: forageCategory.ParentName,
@@ -424,8 +435,10 @@ func (s *StoreEntry) IsShowForageCategory(ctx context.Context, req *operationPb.
 			IsShow:     int32(req.IsShow),
 			GroupId:    int32(forageCategory.Id),
 		}
-		s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body)
-	}()
+		if err = s.CategoryDistribution(ctx, model.ForageCategoryDistributionURl, body); err != nil {
+			zaplog.Error("IsShowForageCategory", zap.Any("CategoryDistribution", err), zap.Any("body", body))
+		}
+	}
 	return nil
 }
 
@@ -441,6 +454,14 @@ func (s *StoreEntry) DeleteForageCategory(ctx context.Context, forageCategoryId
 
 	if err := s.DB.Model(new(model.ForageCategory)).Where("id = ?", forageCategoryId).Update("is_delete", operationPb.IsShow_NO).Error; err != nil {
 		return xerr.WithStack(err)
+	} else {
+		body := &model.CategoryDeleteRequest{
+			GroupId:  int32(forageCategory.Id),
+			IsDelete: int32(operationPb.IsShow_OK),
+		}
+		if err = s.CategoryDelete(ctx, model.CattleCategoryDeleteURl, body); err != nil {
+			zaplog.Error("DeleteForageCategory", zap.Any("CategoryDelete", err), zap.Any("body", body))
+		}
 	}
 	return nil
 }
@@ -495,7 +516,42 @@ func (s *StoreEntry) CategoryDistribution(ctx context.Context, url string, req *
 	for _, v := range groupList.Data.List {
 		go func(data *operationPb.AddPastureRequest) {
 			res := &model.PastureCommonResponse{}
-			req.Id = data.Id
+			req.PastureId = data.Id
+			if err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
+				zaplog.Error("CategoryDistribution",
+					zap.Any("url", url),
+					zap.Any("err", err),
+					zap.Any("body", req),
+					zap.Any("res", res),
+				)
+			}
+
+			if res.Code != http.StatusOK {
+				zaplog.Error("CategoryDistribution-http",
+					zap.Any("url", url),
+					zap.Any("body", req),
+					zap.Any("res", res),
+				)
+			}
+			wg.Done()
+		}(v)
+	}
+	wg.Wait()
+	return nil
+}
+
+// CategoryDelete 饲料分类和畜牧分类删除
+func (s *StoreEntry) CategoryDelete(ctx context.Context, url string, req *model.CategoryDeleteRequest) error {
+	groupList, err := s.SearchGroupPastureList(ctx, &operationPb.SearchPastureRequest{})
+	if err != nil {
+		return xerr.WithStack(err)
+	}
+	wg := sync.WaitGroup{}
+	wg.Add(len(groupList.Data.List))
+	for _, v := range groupList.Data.List {
+		go func(data *operationPb.AddPastureRequest) {
+			res := &model.PastureCommonResponse{}
+			req.PastureId = data.Id
 			if err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
 				zaplog.Error("CategoryDistribution",
 					zap.Any("url", url),

module/backend/pasture_sync_service.go

@@ -2,9 +2,12 @@ package backend
 
 import (
 	"context"
+	"errors"
 	"kpt-tmr-group/model"
 	"kpt-tmr-group/pkg/xerr"
 	operationPb "kpt-tmr-group/proto/go/backend/operation"
+
+	"gorm.io/gorm"
 )
 
 const (
@@ -14,21 +17,63 @@ const (
 
 func (s *StoreEntry) CategoryData(ctx context.Context, req *operationPb.ClassRequest) error {
 
-	pastureDateil, err := s.GetGroupPastureListById(ctx, int64(req.PastureId))
+	pastureDetail, err := s.GetGroupPastureListById(ctx, int64(req.PastureId))
 	if err != nil {
 		return xerr.WithStack(err)
 	}
 	switch req.KeyWord {
 	case FeedCategory:
-		newFeedData := model.NewPastureForageCategory(req, pastureDateil)
-		if err := s.DB.Model(new(model.ForageCategory)).Create(newFeedData).Error; err != nil {
+		history := &model.ForageCategory{}
+		if err = s.DB.Model(new(model.ForageCategory)).
+			Where("pasture_id = ?", req.PastureId).
+			Where("is_delete = ?", operationPb.IsShow_NO).
+			Where("data_source = ? ", operationPb.DataSource_FROM_PASTURE).
+			Where("parent_id = ?", req.ParentId).Where("name = ?", req.Name).
+			First(history).Error; err != nil {
+			if !errors.Is(err, gorm.ErrRecordNotFound) {
+				return xerr.WithStack(err)
+			}
+		}
+		if history.IsShow == operationPb.IsShow_OK && history.Id > 0 {
+			if err = s.DB.Model(new(model.ForageCategory)).Where("id = ?", history.Id).Updates(map[string]interface{}{
+				"number":    req.Number,
+				"is_show":   req.IsShow,
+				"is_delete": req.IsDelete,
+			}).Error; err != nil {
+				return xerr.WithStack(err)
+			}
+		}
+
+		newFeedData := model.NewPastureForageCategory(req, pastureDetail)
+		if err = s.DB.Model(new(model.ForageCategory)).Create(newFeedData).Error; err != nil {
 			return xerr.WithStack(err)
 		}
 	case CowCategory:
-		newCattleData := model.NewPastureCattleCategory(req, pastureDateil)
-		if err := s.DB.Model(new(model.CattleCategory)).Create(newCattleData).Error; err != nil {
+		history := &model.CattleCategory{}
+		if err = s.DB.Model(new(model.CattleCategory)).
+			Where("pasture_id = ?", req.PastureId).
+			Where("is_delete = ?", operationPb.IsShow_NO).
+			Where("data_source = ? ", operationPb.DataSource_FROM_PASTURE).
+			Where("parent_id = ?", req.ParentId).Where("name = ?", req.Name).
+			First(history).Error; err != nil {
+			if !errors.Is(err, gorm.ErrRecordNotFound) {
+				return xerr.WithStack(err)
+			}
+		}
+		if history.IsShow == operationPb.IsShow_OK && history.Id > 0 {
+			if err = s.DB.Model(new(model.CattleCategory)).Where("id = ?", history.Id).Updates(map[string]interface{}{
+				"number":    req.Number,
+				"is_show":   req.IsShow,
+				"is_delete": req.IsDelete,
+			}).Error; err != nil {
+				return xerr.WithStack(err)
+			}
+		}
+		newCattleData := model.NewPastureCattleCategory(req, pastureDetail)
+		if err = s.DB.Model(new(model.CattleCategory)).Create(newCattleData).Error; err != nil {
 			return xerr.WithStack(err)
 		}
 	}
+
 	return nil
 }

proto/go/backend/operation/pasture.pb.go

@@ -2576,13 +2576,14 @@ type ClassRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	KeyWord    string      `protobuf:"bytes,1,opt,name=key_word,json=keyWord,proto3" json:"key_word,omitempty"`                                  // 关键字
-	PastureId  int32       `protobuf:"varint,2,opt,name=pasture_id,json=pastureId,proto3" json:"pasture_id,omitempty"`                           // 牧场id
-	ParentId   int32       `protobuf:"varint,3,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"`                              // 一类id
-	ParentName string      `protobuf:"bytes,4,opt,name=parent_name,json=parentName,proto3" json:"parent_name,omitempty"`                         // 一类名称
-	Name       string      `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`                                                       // 分类名称
-	Number     string      `protobuf:"bytes,6,opt,name=number,proto3" json:"number,omitempty"`                                                   // 分类编号
-	IsShow     IsShow_Kind `protobuf:"varint,7,opt,name=is_show,json=isShow,proto3,enum=backend.operation.IsShow_Kind" json:"is_show,omitempty"` // 是否展示
+	KeyWord    string      `protobuf:"bytes,1,opt,name=key_word,json=keyWord,proto3" json:"key_word,omitempty"`                                        // 关键字
+	PastureId  int32       `protobuf:"varint,2,opt,name=pasture_id,json=pastureId,proto3" json:"pasture_id,omitempty"`                                 // 牧场id
+	ParentId   int32       `protobuf:"varint,3,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"`                                    // 一类id
+	ParentName string      `protobuf:"bytes,4,opt,name=parent_name,json=parentName,proto3" json:"parent_name,omitempty"`                               // 一类名称
+	Name       string      `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`                                                             // 分类名称
+	Number     string      `protobuf:"bytes,6,opt,name=number,proto3" json:"number,omitempty"`                                                         // 分类编号
+	IsShow     IsShow_Kind `protobuf:"varint,7,opt,name=is_show,json=isShow,proto3,enum=backend.operation.IsShow_Kind" json:"is_show,omitempty"`       // 是否展示
+	IsDelete   IsShow_Kind `protobuf:"varint,8,opt,name=is_delete,json=isDelete,proto3,enum=backend.operation.IsShow_Kind" json:"is_delete,omitempty"` // 是否删除
 }
 
 func (x *ClassRequest) Reset() {
@@ -2666,6 +2667,13 @@ func (x *ClassRequest) GetIsShow() IsShow_Kind {
 	return IsShow_INVALID
 }
 
+func (x *ClassRequest) GetIsDelete() IsShow_Kind {
+	if x != nil {
+		return x.IsDelete
+	}
+	return IsShow_INVALID
+}
+
 var File_backend_operation_pasture_proto protoreflect.FileDescriptor
 
 var file_backend_operation_pasture_proto_rawDesc = []byte{
@@ -3123,7 +3131,7 @@ var file_backend_operation_pasture_proto_rawDesc = []byte{
 	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
 	0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12,
 	0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0xeb, 0x01, 0x0a, 0x0c, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x52,
+	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0xa8, 0x02, 0x0a, 0x0c, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x77, 0x6f,
 	0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x57, 0x6f, 0x72,
 	0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x73, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x69, 0x64, 0x18,
@@ -3138,8 +3146,12 @@ var file_backend_operation_pasture_proto_rawDesc = []byte{
 	0x5f, 0x73, 0x68, 0x6f, 0x77, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x65, 0x6e, 0x64, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
 	0x49, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x2e, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x06, 0x69, 0x73, 0x53,
-	0x68, 0x6f, 0x77, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x3b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x68, 0x6f, 0x77, 0x12, 0x3b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
+	0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x73, 0x53, 0x68, 0x6f,
+	0x77, 0x2e, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x08, 0x69, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x3b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3257,11 +3269,12 @@ var file_backend_operation_pasture_proto_depIdxs = []int32{
 	35, // 53: backend.operation.IsShowEnum.value:type_name -> backend.operation.IsShow.Kind
 	42, // 54: backend.operation.FormulaTypeEnum.value:type_name -> backend.operation.FormulaType.Kind
 	35, // 55: backend.operation.ClassRequest.is_show:type_name -> backend.operation.IsShow.Kind
-	56, // [56:56] is the sub-list for method output_type
-	56, // [56:56] is the sub-list for method input_type
-	56, // [56:56] is the sub-list for extension type_name
-	56, // [56:56] is the sub-list for extension extendee
-	0,  // [0:56] is the sub-list for field type_name
+	35, // 56: backend.operation.ClassRequest.is_delete:type_name -> backend.operation.IsShow.Kind
+	57, // [57:57] is the sub-list for method output_type
+	57, // [57:57] is the sub-list for method input_type
+	57, // [57:57] is the sub-list for extension type_name
+	57, // [57:57] is the sub-list for extension extendee
+	0,  // [0:57] is the sub-list for field type_name
 }
 
 func init() { file_backend_operation_pasture_proto_init() }