.drone.yml

@@ -9,7 +9,7 @@ steps:
   - name: clone
     image: alpine/git
     commands:
-      - git clone -b feature/event http://192.168.1.8:3000/xuyiping/kpt-pasture.git
+      - git clone -b ${DRONE_COMMIT_BRANCH} http://192.168.1.8:3000/xuyiping/kpt-pasture.git
       - cp -R kpt-pasture/* ./
   - name: build
     image: plugins/docker:20.14.2

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250731013344-bd687f491881
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250806065630-af563d4b2726
 	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

go.sum

@@ -1329,6 +1329,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250730095437-35f6be63af97 h1:hOXg1Ot2
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250730095437-35f6be63af97/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250731013344-bd687f491881 h1:JCa0Y3NyPxe339VC3AnGu+eFyr2aXduuIypy8RXgwRw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250731013344-bd687f491881/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250806065630-af563d4b2726 h1:Nw5SlOLC+TXc2oGVQRTTVsxpXe4XlHF16zl2E2LxLzk=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250806065630-af563d4b2726/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.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

module/backend/config_data.go

@@ -64,31 +64,41 @@ func (s *StoreEntry) BreedStatusEnumList() []*pasturePb.ConfigOptionsList {
 
 func (s *StoreEntry) CowKindEnumList() []*pasturePb.ConfigOptionsList {
 	cowKindList := make([]*pasturePb.ConfigOptionsList, 0)
-	cowKindList = append(cowKindList, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_XMTEN),
-		Label:    "西门塔尔牛",
-		Disabled: true,
-	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_AGSN),
-		Label:    "安格斯牛",
-		Disabled: true,
-	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_XNLN),
-		Label:    "夏洛莱牛",
-		Disabled: true,
-	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_LMZN),
-		Label:    "利木赞牛",
-		Disabled: true,
-	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_HFTN),
-		Label:    "海福特牛",
-		Disabled: true,
-	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CowKind_HN),
-		Label:    "和牛",
-		Disabled: true,
-	})
+	cowKindList = append(cowKindList,
+		&pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_JSN),
+			Label:    "娟姗牛",
+			Disabled: true,
+		},
+		&pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_XMTEN),
+			Label:    "西门塔尔牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_AGSN),
+			Label:    "安格斯牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_XNLN),
+			Label:    "夏洛莱牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_LMZN),
+			Label:    "利木赞牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_HFTN),
+			Label:    "海福特牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_HN),
+			Label:    "和牛",
+			Disabled: true,
+		}, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.CowKind_HX),
+			Label:    "华西牛",
+			Disabled: true,
+		})
 	return cowKindList
 }
 

module/crontab/neck_ring_health.go

@@ -107,6 +107,7 @@ func calculateNewScore(data *model.NeckRingHealth) int32 {
 	if data.IsImmunization == pasturePb.IsShow_Ok {
 		otherScore += 12
 	}
+
 	return data.Score + otherScore
 }