category: 畜牧分类删除数据同步

http/handle/api/ops.go

@@ -1046,12 +1046,18 @@ func PostDataByName(c *gin.Context) {
 		keyWord string
 	)
 	switch fsion.Get("name").ValueStr() {
-	case "insertFeedclass", "deleteFeedclass":
+	case "insertFeedclass":
 		keyWord = "feed"
 		err = module.GroupCategorySync(keyWord, fsion)
-	case "insertCowclass", "deleteCowclass":
+	case "deleteFeedclass":
+		keyWord = "feed_delete"
+		err = module.GroupCategoryDelete(keyWord, fsion)
+	case "insertCowclass":
 		keyWord = "cow"
 		err = module.GroupCategorySync(keyWord, fsion)
+	case "deleteCowclass":
+		keyWord = "cow_delete"
+		err = module.GroupCategoryDelete(keyWord, fsion)
 	default:
 	}
 	if err != nil {

models/group_data.go

@@ -137,12 +137,20 @@ type CategoryRequest struct {
 	GroupId    int32  `json:"group_id"`
 }
 
+// CategoryDeleteRequest 集团端删除分类数据同步牧场端request
 type CategoryDeleteRequest struct {
 	PastureId int32 `json:"pasture_id"`
 	GroupId   int32 `json:"group_id"`
 	IsDelete  int32 `json:"is_delete"`
 }
 
+// GroupCategoryDeleteRequest 牧场端删除分类数据同步集团端request
+type GroupCategoryDeleteRequest struct {
+	KeyWord   string `json:"key_word"`
+	PastureId int32  `json:"pasture_id"`
+	DataId    int32  `json:"data_id"`
+}
+
 type GroupCateGoryRequest struct {
 	PastureId      int32  `json:"pasture_id"`
 	ParentName     string `json:"parent_name"`

models/request_data.go

@@ -18,3 +18,8 @@ type ClassCowRequest struct {
 	ClassName  string `json:"classname"`
 	Enable     int32  `json:"enable"`
 }
+
+type ClassDeleteRequest struct {
+	PastureId string `json:"pastureid"`
+	Id        string `json:"id"`
+}

module/post_data.go

@@ -20,7 +20,10 @@ import (
 	"github.com/xormplus/xorm"
 )
 
-const ClassDataURl = "group/class/sync"
+const (
+	ClassDataSyncURl   = "group/class/sync"
+	ClassDataDeleteURl = "group/class/sync"
+)
 
 func PostDataByName(c *gin.Context, fashion *gofasion.Fasion) (interface{}, error) {
 	sqlnamestr := fashion.Get("name").ValueStr()
@@ -140,7 +143,7 @@ func GroupCategorySync(keyWord string, fasion *gofasion.Fasion) error {
 		Number:     classRequest.FcCode,
 		IsShow:     classRequest.Enable,
 	}
-	URL := fmt.Sprintf("%s/%s", GetGroupDomain(int64(pastureId)), ClassDataURl)
+	URL := fmt.Sprintf("%s/%s", GetGroupDomain(int64(pastureId)), ClassDataSyncURl)
 	result, err := DoPost(URL, body)
 	if err != nil {
 		return err
@@ -157,6 +160,48 @@ func GroupCategorySync(keyWord string, fasion *gofasion.Fasion) error {
 	return nil
 }
 
+func ParamsCategoryDeleteMarshal(fashion *gofasion.Fasion) (*models.ClassDeleteRequest, error) {
+	params := fashion.Get("parammaps")
+	classRequest := &models.ClassDeleteRequest{}
+
+	if err := json.Unmarshal([]byte(params.Json()), classRequest); err != nil {
+		logging.Error("GroupCategorySync", "Unmarshal", err)
+		return nil, err
+	}
+	return classRequest, nil
+}
+
+func GroupCategoryDelete(keyWord string, fashion *gofasion.Fasion) error {
+	params := fashion.Get("parammaps")
+	classRequest := &models.ClassDeleteRequest{}
+	if err := json.Unmarshal([]byte(params.Json()), classRequest); err != nil {
+		logging.Error("GroupCategorySync", "Unmarshal", err)
+		return err
+	}
+
+	pastureId, _ := strconv.Atoi(classRequest.PastureId)
+	dataId, _ := strconv.Atoi(classRequest.Id)
+	body := &models.GroupCategoryDeleteRequest{
+		KeyWord:   keyWord,
+		PastureId: int32(pastureId),
+		DataId:    int32(dataId),
+	}
+	URL := fmt.Sprintf("%s/%s", GetGroupDomain(int64(pastureId)), ClassDataDeleteURl)
+	result, err := DoPost(URL, body)
+	if err != nil {
+		return err
+	}
+
+	response := &models.GroupCommonResponse{}
+	if err = json.Unmarshal(result, response); err != nil {
+		return err
+	}
+	if response.Code != http.StatusOK {
+		return fmt.Errorf("msg: %s", response.Msg)
+	}
+	return nil
+}
+
 func GetGroupDomain(pastureId int64) string {
 	res := &models.SysOpt{}
 	if _, err := restful.Engine.Table(new(models.SysOpt).TableName()).

service/group/group.go

@@ -211,9 +211,7 @@ func ProcessAnalysisService(req *models.AnalysisAccuracyRequest) (*models.Proces
 		response.StirTime.MiddleValue = fmt.Sprintf("%.2f", util.Median(stirDelayList))
 		response.StirTime.DownMiddleValue = fmt.Sprintf("%.2f", util.Median(stirDelayList[0:len(stirDelayList)/2]))
 		response.StirTime.MinValue = fmt.Sprintf("%d", stirDelayList[0])
-
 	}
-
 	return response, nil
 }