dashboard: 牧场数据预警优化

model/data_warning_items.go

@@ -79,6 +79,14 @@ var DefaultDataWarningItemsMap = map[pasturePb.DataWarningType_Kind][]*pasturePb
 			Value:     "150",
 			IsShow:    pasturePb.IsShow_Ok,
 		},
+		{
+			GroupId:   1,
+			FieldName: "purpose_kind",
+			FieldDesc: "用途",
+			Operator:  "=",
+			Value:     fmt.Sprintf("%d", pasturePb.Purpose_Fatten),
+			IsShow:    pasturePb.IsShow_Ok,
+		},
 	},
 	pasturePb.DataWarningType_Over_Age_UnPregnant_Young: {
 		{

model/flow.go

@@ -0,0 +1,24 @@
+package model
+
+import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+
+type Flow struct {
+	Id            int64                 `json:"id"`
+	PastureId     int64                 `json:"pastureId"`
+	Name          string                `json:"name"`
+	Category      int32                 `json:"category"`
+	Type          int32                 `json:"type"`
+	EndConditions string                `json:"endConditions"`
+	Remarks       string                `json:"remarks"`
+	IsShow        pasturePb.IsShow_Kind `json:"isShow"`
+	IsDelete      pasturePb.IsShow_Kind `json:"isDelete"`
+	ExtendData    string                `json:"extendData"`
+	OperationId   int64                 `json:"operationId"`
+	OperationName string                `json:"operationName"`
+	CreatedAt     int64                 `json:"createdAt"`
+	UpdatedAt     int64                 `json:"updatedAt"`
+}
+
+func (f *Flow) TableName() string {
+	return "flow"
+}

model/flow_node.go

@@ -0,0 +1,24 @@
+package model
+
+import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+
+type FlowNode struct {
+	Id             int64                 `json:"id"`
+	PastureId      int64                 `json:"pastureId"`
+	FlowId         int64                 `json:"flowId"`
+	NodeId         int64                 `json:"nodeId"`
+	NodeName       string                `json:"nodeName"`
+	IsCut          pasturePb.IsShow_Kind `json:"isCut"`
+	IsMust         pasturePb.IsShow_Kind `json:"isMust"`
+	IsStop         pasturePb.IsShow_Kind `json:"isStop"`
+	IsFirstNode    pasturePb.IsShow_Kind `json:"isFirstNode"`
+	CompletionDays int32                 `json:"completionDays"`
+	CutConditions  string                `json:"cutConditions"`
+	ExtendData     string                `json:"extendData"`
+	CreatedAt      int64                 `json:"createdAt"`
+	UpdatedAt      int64                 `json:"updatedAt"`
+}
+
+func (f *FlowNode) TableName() string {
+	return "flow_node"
+}

model/flow_node_conditions.go

@@ -0,0 +1,19 @@
+package model
+
+type FlowNodeConditions struct {
+	Id                    int64  `json:"id"`
+	PastureId             int64  `json:"pastureId"`
+	FlowId                int64  `json:"flowId"`
+	NodeId                int64  `json:"nodeId"`
+	NextNodeId            int64  `json:"nextNodeId"`
+	BaseTimeName          string `json:"baseTimeName"`
+	BaseTimeField         string `json:"baseTimeField"`
+	ExecTime              string `json:"execTime"`
+	CirculationConditions string `json:"circulationConditions"`
+	CreatedAt             int64  `json:"createdAt"`
+	UpdatedAt             int64  `json:"updatedAt"`
+}
+
+func (f *FlowNodeConditions) TableName() string {
+	return "flow_node_conditions"
+}

module/backend/dashboard.go

@@ -229,38 +229,13 @@ func (s *StoreEntry) FindDataWarningItems(pastureId, userId int64) ([]*model.Dat
 	if err := s.DB.Model(new(model.DataWarningItems)).
 		Where("pasture_id = ?", pastureId).
 		Where("user_id = ?", userId).
+		Order("warning_id ASC").
 		Find(&dataWarningItemsList).Error; err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return dataWarningItemsList, nil
 }
 
-/*func (s *StoreEntry) FindDataWarningMap(ctx context.Context, pastureId, userId int64) (map[int64]*model.DataWarning, error) {
-	dataWarning, err := s.FindDataWarning(ctx, pastureId, userId)
-	if err != nil {
-		return nil, xerr.Custom("默认预警数据有误，请联系管理员！")
-	}
-	dataWarningMap := make(map[int64]*model.DataWarning)
-	for _, v := range dataWarning {
-		dataWarningMap[v.Id] = v
-	}
-	return dataWarningMap, nil
-}
-
-func (s *StoreEntry) FindDataWarningItemsMap(ctx context.Context, userId int64) (map[int64]*model.DataWarningItems, error) {
-	dataWarningItemsList := make([]*model.DataWarningItems, 0)
-	if err := s.DB.Model(new(model.DataWarningItems)).
-		Where("user_id = ?", userId).
-		Find(&dataWarningItemsList).Error; err != nil {
-		return nil, xerr.WithStack(err)
-	}
-	dataWarningItemsMap := make(map[int64]*model.DataWarningItems)
-	for _, v := range dataWarningItemsList {
-		dataWarningItemsMap[v.Id] = v
-	}
-	return dataWarningItemsMap, nil
-}*/
-
 // UpdateWarningData 更新计算数据
 func (s *StoreEntry) UpdateWarningData(userModel *model.UserModel, needUpdateWarningIds []int64) {
 	if len(needUpdateWarningIds) <= 0 {

module/backend/test_service.go

@@ -137,14 +137,14 @@ func (s *StoreEntry) PastureInit(ctx context.Context, pastureId int64) error {
 	}
 
 	pasture := &model.AppPastureList{}
-	if err := s.DB.Model(new(model.AppPastureList)).
+	if err = s.DB.Model(new(model.AppPastureList)).
 		Where("id = ?", pastureId).
 		First(pasture).Error; err != nil {
 		return xerr.Customf("该牧场不存在：%d", pastureId)
 	}
 
 	deptList := make([]*model.SystemDept, 0)
-	if err := s.DB.Model(new(model.SystemDept)).
+	if err = s.DB.Model(new(model.SystemDept)).
 		Where("id = ?", pasture.Id).
 		Find(&deptList).Error; err != nil {
 		return xerr.Customf("牧场初始化数据失败：%s", err.Error())
@@ -157,41 +157,41 @@ func (s *StoreEntry) PastureInit(ctx context.Context, pastureId int64) error {
 	dataWaringTypeEnumList := s.DataWaringTypeEnumList(userModel, "all")
 	dataWarningList := model.DataWarningInitData(pastureId, dataWaringTypeEnumList)
 
-	if err := s.DB.Transaction(func(tx *gorm.DB) error {
+	if err = s.DB.Transaction(func(tx *gorm.DB) error {
 		for _, dataWarning := range dataWarningList {
-			if err := tx.Model(new(model.DataWarning)).
+			if err = tx.Model(new(model.DataWarning)).
 				Create(dataWarning).Error; err != nil {
 				zaplog.Error("PastureInit-DataWarning", zap.Any("error", err))
 			}
 			dataWarningItemsList := model.DataWarningItemsInitData(pastureId, dataWarning)
-			if err := tx.Model(new(model.DataWarningItems)).
+			if err = tx.Model(new(model.DataWarningItems)).
 				Create(dataWarningItemsList).Error; err != nil {
 				zaplog.Error("PastureInit-DataWarningItems", zap.Any("error", err))
 			}
 		}
 
 		nackRingConfigureList := model.NeckRingConfigureInit(pastureId)
-		if err := tx.Model(new(model.NeckRingConfigure)).
+		if err = tx.Model(new(model.NeckRingConfigure)).
 			Create(nackRingConfigureList).Error; err != nil {
 			zaplog.Error("PastureInit-NeckRingConfigure", zap.Any("error", err))
 		}
 
 		// 初始化牧场和部门数据
 		newSystemPastureDept := model.NewSystemPastureDeptInit(pasture)
-		if err := tx.Model(new(model.SystemDept)).
+		if err = tx.Model(new(model.SystemDept)).
 			Create(newSystemPastureDept).Error; err != nil {
 			zaplog.Error("PastureInit-SystemDept", zap.Any("error", err))
 		}
 
 		newSystemDept := model.NewSystemDeptInit(pasture.Id, newSystemPastureDept.Id)
-		if err := tx.Model(new(model.SystemDept)).
+		if err = tx.Model(new(model.SystemDept)).
 			Create(newSystemDept).Error; err != nil {
 			zaplog.Error("PastureInit-SystemDept", zap.Any("error", err))
 		}
 
 		// 初始化菜单
 		systemMenuList := make([]*model.SystemPastureMenu, 0)
-		if err := tx.Model(new(model.SystemPastureMenu)).
+		if err = tx.Model(new(model.SystemPastureMenu)).
 			Where("pasture_id = ?", 0).
 			Find(&systemMenuList).Error; err != nil {
 			zaplog.Error("PastureInit-SystemMenu", zap.Any("error", err))
@@ -206,12 +206,12 @@ func (s *StoreEntry) PastureInit(ctx context.Context, pastureId int64) error {
 			newSystemMenuList = append(newSystemMenuList, newSystemMenu)
 		}
 
-		if err := tx.Model(new(model.SystemPastureMenu)).
+		if err = tx.Model(new(model.SystemPastureMenu)).
 			Create(newSystemMenuList).Error; err != nil {
 			zaplog.Error("PastureInit-SystemMenu", zap.Any("error", err))
 		}
 
-		// 初始化用户和角色
+		// 初始化用户和角色 todo
 
 		return nil
 	}); err != nil {