Browse Source

warning: health update

Yi 5 days ago
parent
commit
4f8b6caa0b
4 changed files with 8 additions and 2 deletions
  1. 1 1
      go.mod
  2. 2 0
      go.sum
  3. 3 0
      model/neck_ring_health_warning.go
  4. 2 1
      module/backend/neck_ring_warning.go

+ 1 - 1
go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250624095218-69693701e5c3
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250630022121-999540eb0dba
 	gitee.com/xuyiping_admin/pkg v0.0.0-20250613101634-36c36a2d27d0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3

+ 2 - 0
go.sum

@@ -42,6 +42,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250624083202-b4e70fad3c6f h1:KfgRw6va
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250624083202-b4e70fad3c6f/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250624095218-69693701e5c3 h1:vc+2kAaoBLBnA6oY1yyVVlhK2xc5ea6IH9F5+jbz62A=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250624095218-69693701e5c3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250630022121-999540eb0dba h1:rNvvHHAz0biEGAEtJk4MnN9uBCt7PkKLKjuyxtbgljc=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250630022121-999540eb0dba/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20250613101634-36c36a2d27d0 h1:ZCOqEAnGm6+DTAhACigzWKbwMKtleb8/7OzP2xfHG7g=
 gitee.com/xuyiping_admin/pkg v0.0.0-20250613101634-36c36a2d27d0/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

+ 3 - 0
model/neck_ring_health_warning.go

@@ -62,6 +62,7 @@ func (n NeckRingHealthWarningSlice) ToPB(
 	warningHealthLevelMap map[pasturePb.WarningHealthLevel_Kind]string,
 	cowMap map[int64]*Cow,
 	eventLogMap map[int64]string,
+	healthStatusMap map[pasturePb.HealthStatus_Kind]string,
 ) []*pasturePb.HealthWarningItem {
 	res := make([]*pasturePb.HealthWarningItem, len(n))
 	for i, v := range n {
@@ -93,6 +94,8 @@ func (n NeckRingHealthWarningSlice) ToPB(
 			data.PenId = cow.PenId
 			data.PenName = cow.PenName
 			data.Lact = cow.Lact
+			data.HealthStatus = cow.HealthStatus
+			data.HealthStatusName = healthStatusMap[cow.HealthStatus]
 		}
 
 		if desc, ok := eventLogMap[v.CowId]; ok {

+ 2 - 1
module/backend/neck_ring_warning.go

@@ -130,6 +130,7 @@ func (s *StoreEntry) NeckRingWarningHealthCowList(ctx context.Context, req *past
 	}
 
 	warningHealthLevelMap := s.WarningHealthLevelMap()
+	healthStatusMap := s.HealthStatusMap()
 	cowMap := make(map[int64]*model.Cow)
 	eventLogMap := make(map[int64]string)
 	cowIds := make([]int64, 0)
@@ -154,7 +155,7 @@ func (s *StoreEntry) NeckRingWarningHealthCowList(ctx context.Context, req *past
 			Total:    int32(count),
 			Page:     pagination.Page,
 			PageSize: pagination.PageSize,
-			List:     model.NeckRingHealthWarningSlice(neckWaringHealthList).ToPB(warningHealthLevelMap, cowMap, eventLogMap),
+			List:     model.NeckRingHealthWarningSlice(neckWaringHealthList).ToPB(warningHealthLevelMap, cowMap, eventLogMap, healthStatusMap),
 		},
 	}, nil