Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

http/handle/group/feed_formula.go

@@ -15,6 +15,10 @@ const (
 	CowCategoryDeleteKey  = "cow_delete"
 )
 
+func Handle404(c *gin.Context) {
+	c.String(http.StatusNotFound, "404 NotFound")
+}
+
 // DistributeFeedFormula 饲料配方下发
 func DistributeFeedFormula(c *gin.Context) {
 	appG := app.Gin{C: c}

http/routers/group_api.go

@@ -11,16 +11,16 @@ func GroupAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		for _, opt := range opts {
 			opt(s)
 		}
-
+		s.NoRoute(group.Handle404)
 		apiPasture := s.Group("/pasture")
-		apiPasture.POST("feed_formula/distribute", group.DistributeFeedFormula)                 // 饲料配方下发
-		apiPasture.POST("feed_formula/is_modify", group.FeedFormulaIsModify)                    // 饲料配方是否可修改
-		apiPasture.POST("dashboard/accuracy_data", group.AnalysisAccuracy)                      // 混料准确率数据
-		apiPasture.POST("dashboard/process_analysis", group.ProcessAnalysis)                    // 过程分析
-		apiPasture.POST("dashboard/sprinkle_statistics", group.SprinkleStatistics)              // 撒料统计
-		apiPasture.POST("dashboard/forage_category/distribute", group.ForageCategoryDistribute) // 饲料分类下发
-		apiPasture.POST("dashboard/forage_category/delete", group.ForageCategoryDelete)         // 饲料分类删除
-		apiPasture.POST("dashboard/cattle_category/distribute", group.CowCategoryDistribute)    // 畜牧分类下发
-		apiPasture.POST("dashboard/cattle_category/delete", group.CowCategoryDelete)            // 畜牧分类删除
+		apiPasture.POST("feed_formula/distribute", group.DistributeFeedFormula)       // 饲料配方下发
+		apiPasture.POST("feed_formula/is_modify", group.FeedFormulaIsModify)          // 饲料配方是否可修改
+		apiPasture.POST("dashboard/accuracy_data", group.AnalysisAccuracy)            // 混料准确率数据
+		apiPasture.POST("dashboard/process_analysis", group.ProcessAnalysis)          // 过程分析
+		apiPasture.POST("dashboard/sprinkle_statistics", group.SprinkleStatistics)    // 撒料统计
+		apiPasture.POST("forage_category/distribute", group.ForageCategoryDistribute) // 饲料分类下发
+		apiPasture.POST("forage_category/delete", group.ForageCategoryDelete)         // 饲料分类删除
+		apiPasture.POST("cattle_category/distribute", group.CowCategoryDistribute)    // 畜牧分类下发
+		apiPasture.POST("cattle_category/delete", group.CowCategoryDelete)            // 畜牧分类删除
 	}
 }

module/post_data.go

@@ -160,17 +160,6 @@ 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{}

service/group/group.go

@@ -251,7 +251,6 @@ func CattleCategoryDistributeService(req *models.CategoryRequest) error {
 		ParentName: req.ParentName,
 		GroupId:    int64(req.GroupId),
 	}
-
 	return module.CattleCategoryDistribute(cowClass)
 }