Browse Source

calendar: update

Yi 4 weeks ago
parent
commit
c36e9ce743
4 changed files with 66 additions and 310 deletions
  1. 2 2
      go.mod
  2. 2 261
      go.sum
  3. 61 46
      module/backend/calendar.go
  4. 1 1
      module/backend/event_health.go

+ 2 - 2
go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250305093352-5acd87c93e37
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250305125910-0c6e47c2e274
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3
@@ -62,7 +62,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jinzhu/copier v0.3.5 // indirect
+	github.com/jinzhu/copier v0.3.5
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

+ 2 - 261
go.sum

@@ -36,265 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241128102506-727966a0f004 h1:0kHmrqRNqiJuzIGIk+dkAsTd/7iAlPRKPYN5h2aaeTo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241128102506-727966a0f004/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241203073346-ba8687d6c8de h1:dIATo9IIIOfcQaSISrclzRF0piVoy7bydeG0psN1Lt0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241203073346-ba8687d6c8de/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204014219-67b3a86c6073 h1:9lzMO1lwmQfgGRmpZkTLHjGcmU3hc6+uMOgEuPiyuuo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204014219-67b3a86c6073/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204021755-ac6c028d07a3 h1:05zSqGf+j1PFXULInvcc610amPNWH+CJk9Jd9h/kHhs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204021755-ac6c028d07a3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204031342-3f1a7bd2d670 h1:cqwZ/W6yHEqymPrIPm9VNKvy9U/Mx6OT4B4axdBZ2ak=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204031342-3f1a7bd2d670/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204093501-8c0752b62fac h1:J4ZtqdRLDnofNd4M1qfm3ZUFDxoAxaPXiNvB5YuUgXI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204093501-8c0752b62fac/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241204093535-10c3d976e5c7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241205100848-b0790a01ff1a h1:lFbAQBSqRM2cpquaV7TjCTsnmrRGZbOfhZg/aOs7524=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241205100848-b0790a01ff1a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241205102558-36e3ea825ca3 h1:fHcQ+MmsAt3jhDQaBEdYoQ0Kthako7MdRvLrekYdcMQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241205102558-36e3ea825ca3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241206015638-6b15cf82851d h1:L/gXdFvjt966dFbM56fDSS+2vdkb/5hSZUxHvK+Vw4Q=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241206015638-6b15cf82851d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241217030755-242924b1d633 h1:tj3mbsCdJ5FDN6X9GqhzLZ4d3WjC6gGz6geOt5esRII=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241217030755-242924b1d633/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241217065218-21d2be069b22 h1:4qNwmfsRxhbWGst94GHgibyfTt5LAtu0oBwzpQjWyQI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241217065218-21d2be069b22/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241218075304-cbb87679a2f1 h1:0oozXkfpp5WIZZoBadC/1au+rHgw8m92eXIhb/3/AV0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241218075304-cbb87679a2f1/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241218075333-5e665935b341/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241218092251-fc63330bc909 h1:vxUvJnVW0fMgbWwLBTHLU0cNYyl3nBm/8RO86TmulIs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241218092251-fc63330bc909/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241219074512-9ad3e0b600fb h1:2Acmom7XCrhgocmXewDMqNSrQtTUgq/aNsW6uyUEzkw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241219074512-9ad3e0b600fb/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241219080808-6a83c815206e h1:lSDWnqRTfBokXgiH6bGdnDwFFfewIp1fbgpkA8iadDY=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241219080808-6a83c815206e/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223023708-63ff08408266 h1:oLUtWC1Vme8B4znOYDM/0ZZBVsG5eMtFdy6KfnScLgo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223023708-63ff08408266/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223031557-299a2d417bba h1:so/AiSPsYkfQnlJgnmkjuQxm8Qhb2TEiRKCrfCNaI7o=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223031557-299a2d417bba/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223035802-00146a704807 h1:zNVU/0dFGnqMW4iw1CiESC7efp7KHo3+HnHFdsAyO28=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223035802-00146a704807/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223063242-cbd9ca4ef527 h1:bwLz4q7u5nxs7PGarS/zl6hgK5E7hcOMKSBfibEKdM4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223063242-cbd9ca4ef527/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223072631-d6d7cc8fef31 h1:KSfnFVKSlAyC7A6jCWAJkvAGxq/IVPsezl5ss3CqPMw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241223072631-d6d7cc8fef31/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241224084901-9a0b78705dd6 h1:dw2s50DrIIf7wOxOcIspSRFKNgvadWMgrEZZNpbO9Ho=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241224084901-9a0b78705dd6/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225065133-fd61d6c760a3 h1:MjADeMzUIM6dmShAuYeqyz8DPzCmRBWdsFPnvZ6IQTE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225065133-fd61d6c760a3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225070554-b4f496c60ddf h1:g4pcj4EJPmsuWRv6pDYvHaeIls4X5k0YIwmXU7tOidc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225070554-b4f496c60ddf/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225071614-71960ce0e967 h1:nFcpJG9E+YM9XUVFjZ290jxTmvdQrqjEmz1WKvu72vs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225071614-71960ce0e967/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225090543-f6e1bd2be3c9 h1:YszVUdVh1Hh8iTqzSShSPELH5nhVn1XWGYPaPjS12dw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225090543-f6e1bd2be3c9/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225110632-d4472512412e h1:2Ch8Yx/m+//0Hbzl3yjFxwBOe1CFDfFdri+fzDHQcQQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241225110632-d4472512412e/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226071350-4226aff28f62 h1:NfhUVP7lNOhzaoOnHDnjksZQkqUyTphbwGR8xgNmx3E=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226071350-4226aff28f62/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226082350-bd279d6d7998 h1:66soxkvWLLsTW1oDd4Bf+DC95C90Y5yjGnFA+BtIyYs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226082350-bd279d6d7998/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226082956-7a730dffe7ba h1:6j33896HgXCH4UBcFpVqqM3sEy1QvEm5Q8VtcBWxC1k=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241226082956-7a730dffe7ba/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241230072900-e3918c6dc9ee h1:x5daNVOieKpmVAREZAFuuFaqjJlDBHJ2dw0J1dyhfzc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20241230072900-e3918c6dc9ee/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102040428-4907b3d9afb5 h1:1Mh6q2pKo2w/WeJVeI3GuZLDL0WGqlluuJKypUDDYcg=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102040428-4907b3d9afb5/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102061132-210fa4d452be h1:w2OuLWbvxhZqHEoYdiSTQNWIrYuDbmaOSWnWgm2hcRk=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102061132-210fa4d452be/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102061445-bf2614513688 h1:gUcI0NVK7YfrdHtp+MqZ1uGLPaVEnqrt0zoB5oVyWC4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102061445-bf2614513688/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102074750-5967657b1847 h1:Z08PI5I5hkjo2zW3Ibv1TKd28O6ERSqMsNGMYVaUIe4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102074750-5967657b1847/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102080429-bbf8aeeb608c h1:Fqi07TncsGpYg4B+T9VsMPG4a1zmokH5xnUmmYHhlpI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250102080429-bbf8aeeb608c/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250103030611-2b0c271353c7 h1:mk2G7/x2g2WLbCFw7ThZ7F5HOJ9AfAidG7ilhit67bM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250103030611-2b0c271353c7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250103092939-8816c3aabc06 h1:9pYtEuYYvFb1Zak/bMe7MFzElFlwya45G7mrco5bNp0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250103092939-8816c3aabc06/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107022103-9539c511e1dd h1:gkUnfEcy/OQOZXb797N+DExwYLFVRNP7P6zfLWjShdQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107022103-9539c511e1dd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107024845-37a577c13d5e h1:P3cy/uJuG9uCpWiZJsncgkEPG4fuKffscpWqXwDJXiE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107024845-37a577c13d5e/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107064743-4115ed6f2a73 h1:M53fn2/vuz8+jAi/sdKMzsubz34k5R5vdeNi4ULmp3c=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250107064743-4115ed6f2a73/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250115062928-2823e210486d h1:qcqBgZFyNXyrg5090MnkbJY5CM5ps8ANzIWNNlwkxEs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250115062928-2823e210486d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250120023506-4fdfb4191bff h1:YwLd4ZpvvnPgdTiHdIIBW36B6guGXATLSar/u0bjPJA=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250120023506-4fdfb4191bff/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250120024815-cc7c8bda185b h1:iMNohD0Qg7balckYvv3FFhKaxpjaH6UkSSqzpjpqYeo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250120024815-cc7c8bda185b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250123060356-74f483993d26 h1:bUdNYFdlCUaAT6x6wIi6i4jLj1K3SyonTW8a0IiSGdU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250123060356-74f483993d26/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250123073911-033701a800ce h1:DblWV5HpCOdKgxRxFA/W/DKei/jCcymyYZjoQz+bj/M=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250123073911-033701a800ce/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124055126-a55370977ebd h1:DlMBdv2sOI6zDaov/0tKRHxctTi5tyOH173LooMbKVM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124055126-a55370977ebd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124063931-fe501cbad622 h1:15yviP2h/HSJuAWULQzQi/6Hvp81l8ySxbB8XirOluI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124063931-fe501cbad622/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124065849-a3be4cfe11ab h1:wRGHkMoiyg+JRvt3D5zb+mdU8bXXGgtCWnLr9TXxYhY=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124065849-a3be4cfe11ab/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124085242-ce995d9353fb h1:NYaR6KruC/8osHF5VKierJw+rWCsdQ/sahOUMxtgCl4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250124085242-ce995d9353fb/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250205095115-901ea79b7e1f h1:sVJ/ZSR4r1h2bO0HEf7IVZppBjJ/UzEqCu1hptptgrM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250205095115-901ea79b7e1f/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206021619-2b0fc78035bb h1:I0QqA8hsBc4WZQ7jl6WsiIEPwFxLvQmJv7XtLJhzlBM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206021619-2b0fc78035bb/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206022501-ea32be0345bd h1:wLHGWLUXJG4Uh0BXyD0VDeq6XnGWqVxxfZxUZHv294I=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206022501-ea32be0345bd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206034014-bf215fbc8803 h1:+VDhdJnUBbuC0Tk4WreKOsvsWOCDxdQEGlXA4TbXwOQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206034014-bf215fbc8803/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206052721-b3db038e7785 h1:DmfvtWuaFoSlAX9uQmOXu/JVh7Nqm/u2n/adB/rlBWw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250206052721-b3db038e7785/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250208020725-17a400a07936/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250208021036-c6018bf8a9e2 h1:eFOdl5NVDP6bnSB9XjMzBwgy2DnN6WaXwEx0KrwKlY8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250208021036-c6018bf8a9e2/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250208022155-41067ebaa17d h1:2l7WoxgnJf/Jf6YzSUh+Cm+m65iQU2WWvSz5LQo7jjc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250208022155-41067ebaa17d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210052401-c8bf761b13fe h1:MH7nK3YPH+pDUwVnxREVW/OhBXx6RdqnRWa9BwVV6ts=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210052401-c8bf761b13fe/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210055925-91dc2754eaec h1:LEPeYOmh+6q4gnwRcGNV6MCUPWjP4RmJl//ksBdH6Rs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210055925-91dc2754eaec/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210061341-1e50fd31801b h1:j9YojtrHZoz0DT5zBeMdya5+l92c52rCfJjQ6pLuUvs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210061341-1e50fd31801b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210065209-10ed2f760d20 h1:+BSaQABBlvZ951/PicQtP7foQLiaTm/9l4pvxQY0kXI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210065209-10ed2f760d20/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210090018-576d00ffc2aa h1:x3McivrzNWXfR/6OFE47rry2qf/Z/UFHenwRWXRG7y0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210090018-576d00ffc2aa/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210094803-e3d2418b887d h1:Vi1UHWFH7HqPS/8Hwdlg/yErSojgUA76Teg76MhOPu8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250210094803-e3d2418b887d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211014633-a13f8eeb1990 h1:gjJmp0kMT7p36nnb6zmioNA9nKxXkh0iCrX2txhHqWg=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211014633-a13f8eeb1990/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211015100-dc46b810edc2 h1:g6uOnX0e5rCEj/3inaIuwmxcAo8tCR4FIEpUnF4GAS0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211015100-dc46b810edc2/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211064756-0c54f3109753 h1:chRi9ULtdMteEQBh/jXemiifX4G1Joi/BbyB0Lru63o=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211064756-0c54f3109753/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211075436-87c7a5e75ebe h1:uIlkm9hPTbWMzloyShmiLJETgHyaQxAdPTT/sMLPhQ8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211075436-87c7a5e75ebe/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211091408-ce100724cc83 h1:UIoLJ8lt5G8dBMSFiwz6rD/YCECIwZafvwQhKQmGMPA=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211091408-ce100724cc83/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211094203-6344b8109fc2 h1:8ViobF44MfGh7UDkqWnIlZfjSK7lCCPhiewoBZlZ1D0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211094203-6344b8109fc2/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211104144-848fe88b8c1e h1:x+sO/2mrK1vcUPVnNuAuhvlD6PPsAxAc7K4EEfgefLs=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211104144-848fe88b8c1e/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211104420-863ff8fc2535 h1:fiM+bgvJRorAZCwgzMTXgolvF7AhEM7hx/MkmokhrOk=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211104420-863ff8fc2535/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211131456-ede951183da7 h1:5KZ1y+jPDf572OW5xrrm0cMhpTbnAxKaDMJW13P7AWA=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211131456-ede951183da7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211132718-87536ed342b5 h1:Bt+bNBIYPDROpk9V8Vdr+iSBQsjaYeYJusXGAXqQxYQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250211132718-87536ed342b5/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212025811-9b8f9f1277a3 h1:J6mQy1zYbBeFDdCECev2DS1HEAnuroTfC4EP4FtzmFA=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212025811-9b8f9f1277a3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212081438-4cafb1f562a2 h1:Ctl4GEYsQoykkNvWM9RjV7qF5OntEzTU0smigA5iX2M=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212081438-4cafb1f562a2/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212083935-9847adaab5cc h1:MENa5LOICsSJ4cRl81+SZJyWq1xxUVZikKJlF3uwsKo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212083935-9847adaab5cc/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212100748-0f1f0b733b1a h1:R8ys1+phiHtAWETRRb88/WWGheExHA6MnH89LXwGVz0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250212100748-0f1f0b733b1a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213075704-04d28f7cc1b4 h1:1og9G9acY6DAQIcDwzebzGln44iN/cQgsxCl2BtIg+U=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213075704-04d28f7cc1b4/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213095231-1b0f5b519ad7 h1:pVbZ/drwC1J38N/qD+ViiiCz2Q4mdX+bgVQxpGsPeNU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213095231-1b0f5b519ad7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100110-e0ec5e535968 h1:2yr5yk82gT8j4qV8T4iFstiw5EhX5bJ+NGrfgvjmUB4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100110-e0ec5e535968/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100400-33572489c398 h1:bLWaZq0NWBK0ggH/9xVh21+JcUTqkY0zbry/h7kd/FI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100400-33572489c398/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100800-994fcef7c178 h1:lNDW0YZJxsgpdvf8AjIXXEi4MZuaozJ5cGVn46Wn8Fw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250213100800-994fcef7c178/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250214013933-cb3deefdc2c2 h1:6caRCC4vbF35vqwiwVZx2JQiT+xzIdbJpz8o73oSu+I=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250214013933-cb3deefdc2c2/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250214034351-6a1e63ae61df h1:hRX98TBecH9ZhD/fkfaHBMgledNaTjvtPM82TcK/MYU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250214034351-6a1e63ae61df/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219061539-24a66cc91328 h1:7a4DWta1z7N/8GfRtfKd373gtJx9xpKXjqU2L3yaLTo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219061539-24a66cc91328/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219063306-5bb1eacb9b64 h1:uGXyW3YONY/fghuELyHNWfyaMY6sGcB7vGY+ZRZFciM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219063306-5bb1eacb9b64/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219063822-ad6a9e001705 h1:jeoEilErVJWabJeQYK2ghchO2itrHPH9tO97qgeh9M8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219063822-ad6a9e001705/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219072933-dbf894cb06f3 h1:UryIJcqY98WGbJMatvvHQpIICDrXWXPu9kRgdl3YTh8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219072933-dbf894cb06f3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219095939-fc998ba6aa9a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219100438-c4f02e9cb488 h1:A8xflIqHLyKropvrppNLZgsYBl8RmUNH6bkAPGpZne4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250219100438-c4f02e9cb488/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220020545-53cf6b7e129c h1:nIPb6cZSvWezwVwwhGMWqbggpFhL37r8955fzdQ0XnE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220020545-53cf6b7e129c/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220023058-9a5a7f8cc04a h1:MBavBgyTc3oFGpomMOzjIqIM57zYtIre7Yex+Ef/eDQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220023058-9a5a7f8cc04a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220090818-98fa5abffb33 h1:1anBE/Z+35WmwJjMh5T4LP4JeakKq/64oFz6Ade2RoU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250220090818-98fa5abffb33/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224021008-13ba78841d1c h1:AUAAlITK1qZde9WtRdq3VLDlQswMQbrIgF7pkJZwZnY=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224021008-13ba78841d1c/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224030051-3f56f915121f h1:vQQm68Tmop7R88c8+6i1CWY/DCtQ7dORL4pmr0uLIug=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224030051-3f56f915121f/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224035655-3401deeb3d59 h1:xHsE9KlguSyJA/VxXX8X2ObPOjCWbukX4V3yQ/X9N5Q=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224035655-3401deeb3d59/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224061833-6c7b2a3558b8 h1:PYUFDZcDc6mH59HsfZLmjvyxGbI28JVow6imE4XyW+Q=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224061833-6c7b2a3558b8/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224070445-464185db4857 h1:fYMnYdzFo/crU6pXCiCpvFtLBsztN8/gyrXJaYrgj64=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224070445-464185db4857/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224081427-8e93b44844e3 h1:nu6bj5oaJafnP4IcboUz+27RiKVUU5FC7nLAFZUvnPM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224081427-8e93b44844e3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224084846-f92b34bad24c h1:SfrHXto4YBe3cUAJ91ANdaNYBhc90Vys4o6dCsYLO6M=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224084846-f92b34bad24c/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224085851-f9b6573afee1 h1:sG6KjT6KTR7l8MzkCGzq5WhR8ggaR5G98yRhYLSdIcI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224085851-f9b6573afee1/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224100909-32e2afe20cd1 h1:shMT9JudB6zrONYM+ORVIODDW+JCvSLIMVuYRvER39A=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224100909-32e2afe20cd1/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224101733-fe1933dd5c95 h1:rFUrO43EQWO8sCPkN0CEvxjpG3Zz2AiAin+ihdDlw7s=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224101733-fe1933dd5c95/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224130350-5bbe5630870a h1:wG/q1duur2eslYXjQqoR83EyN1x9cKvkP97+fDxXjBQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224130350-5bbe5630870a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224130629-8acdbff851e5 h1:r11lo90UNSksUGhfhpxzOva2g91z9fFXk9TNhHBFvy8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250224130629-8acdbff851e5/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225013948-765a2467f706 h1:rZ7hscSiajeXQnO2+4vkO9Vmm8qlphY4SgtWxqmWjp8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225013948-765a2467f706/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225022411-1e7c5a6e9e23 h1:m3QzUjWJuUobE9Pk6s2b9nsYLzjYWs1RVj/KalLqEGI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225022411-1e7c5a6e9e23/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225100328-cf8cdf9dc5eb h1:JxEedbwLuzyhJIKTUtlZloUotoU9x+U+eF7vyCdmJjE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250225100328-cf8cdf9dc5eb/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250226010813-bf031c8abb4b h1:kXph//3sWQTSLKG6gqsBt+i90g/NFIIcL8lDEctTBgg=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250226010813-bf031c8abb4b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250226025759-0b8545dc8254 h1:H+WZ8r7nTguIAv2m4wGkHyxQZrjTFgGfxxpNeRsQ6Kk=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250226025759-0b8545dc8254/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250227023705-ca70c0b4a71c h1:6uBVCPNUO70wMPF9NklLmQXNfbNFTv3xpfza5UmXhsc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250227023705-ca70c0b4a71c/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228024549-cbb245fed491 h1:UkG2VOHupyqS6F83tp6ryJ0NoaWrcFwwCm8CfAfR8k4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228024549-cbb245fed491/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228024930-7175605e33bd h1:8oa74WCD2mu9I7FHXW4MZftUGMtauy4CclrAzQytU5s=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228024930-7175605e33bd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228032637-7b92e2ab4093 h1:qToZSPcyoZbw905RQDUavtOaaUycFU2vXT85RT3G7ZY=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228032637-7b92e2ab4093/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228074230-29f485ce3854 h1:Mo2B8XwgrdJqrlBSahle2NC1z3jl2E00FyOGyB6yGXQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228074230-29f485ce3854/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228081242-8794bd89a603 h1:15ZmN1TmK+XgSqce67/GUnMJvdhRjOcNzzUTyYns/28=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228081242-8794bd89a603/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228082905-a9a0b77f1247/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228083339-f6b9576918dd h1:hqSeKVOL1YQHz7WoHmGKlm+T3MoczJvJ9kDd7qoPdMM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250228083339-f6b9576918dd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250301090359-debc53863000 h1:gGF+69uDuE1ocf7k5tbvdqs730wEYYyMA2Vtsu2z/R8=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250301090359-debc53863000/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303011351-e52717847500 h1:i7hjSJLO99fLsDsu/DMihZtDmmGx83cS5/EXBhA4mH4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303011351-e52717847500/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303083156-fe44c0a9957d h1:vSbxOcwGH8IXtHyLJkm5LaO8S2dQiTdHw/I5SVQztmg=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303083156-fe44c0a9957d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303084040-e9be94c74c2a h1:vJXz6WZY0xG+UH8UwNoK1z2IJgB3oR3/vKZO5GYhvZw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303084040-e9be94c74c2a/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303092843-e61a247edc34 h1:7AgTMu6xEV/YjLtE2folQZwNZc0DWPUMWEVX1h18/2g=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250303092843-e61a247edc34/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250304111146-e555a797cab7 h1:dO2ztuxGme88Jxg68f1IR3fpZDIG/ZKCg9EwnpdoEss=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250304111146-e555a797cab7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250304112845-3373faaec7ac h1:m7JV7qhf8D32HFxT+XLdOi1+ie4c1beRVCSd0LOhgYA=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250304112845-3373faaec7ac/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305011349-1c6814a960ae h1:lmQOMWaC3Ccaaoejw+BccqlHVOHUZ2jWLr+G7zpIt0M=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305011349-1c6814a960ae/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305064639-4b9734707396 h1:xm6PExB8ww1BHw8GLJ+lRVIEGH68p1fNxlKOTr7b5FQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305064639-4b9734707396/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305080621-428c3913a7fc h1:O4LcrVeIKmS4MTbrGiIu/FIoAeoRT+oeLsHUN+ln8K0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305080621-428c3913a7fc/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305082022-ecb715590604 h1:o1DvM98KD8g1HJAcThjnrQmCntUwxdvdMN4ueHRbMzI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305082022-ecb715590604/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305093352-5acd87c93e37 h1:/81LuiezVCXETpE3itLvDlCbQTeVGb4CeTU707s/lu4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305093352-5acd87c93e37/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250305125910-0c6e47c2e274 h1:zbGuv1f9ZimRe8ViLJc16Pdvow7OV03itkuo7p/LDzM=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250305125910-0c6e47c2e274/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b h1:w05MxH7yqveRlaRbxHhbif5YjPrJFodRPfOjYhXn7Zk=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -429,7 +172,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
@@ -867,7 +609,6 @@ go.uber.org/dig v1.15.0/go.mod h1:pKHs0wMynzL6brANhB2hLMro+zalv1osARTviTcqHLM=
 go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=

+ 61 - 46
module/backend/calendar.go

@@ -22,40 +22,23 @@ func (s *StoreEntry) CalendarToDoList(ctx context.Context, req *pasturePb.Calend
 	}
 
 	calendarToDoList := make([]*pasturePb.CalendarToDoList, 0)
-	pastureWhereSql := fmt.Sprintf(" AND pasture_id = %d", userModel.AppPasture.Id)
-	whereSql := ""
-	if req.CowId > 0 {
-		whereSql += fmt.Sprintf(" AND cow_id = %d", req.CowId)
-	}
-
-	if req.CalendarType > 0 {
-		calendarTypeMap := CalendarTypeMap()
-		calendarTypeName := calendarTypeMap[req.CalendarType]
-		if len(calendarTypeName) > 0 {
-			re := regexp.MustCompile(`[a-zA-Z]`) // 使用正则表达式替换匹配的字母为空字符串
-			calendarTypeName = re.ReplaceAllString(calendarTypeName, "")
-			whereSql += fmt.Sprintf(" AND calendar_type_name = '%s'", calendarTypeName)
-		}
-	}
-
-	sql := `SELECT a.cow_id,b.pen_name,a.calendar_type_name,DATE_FORMAT(FROM_UNIXTIME(a.plan_day), '%Y-%m-%d') AS plan_day,a.remaining_days,
-	b.lact,b.ear_number FROM (
-		SELECT cow_id,plan_day,'免疫' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_immunization_plan WHERE status = 2 ` + pastureWhereSql + `
+	sql := `SELECT a.cow_id,b.pen_name,a.calendar_type_name,DATE_FORMAT(FROM_UNIXTIME(a.plan_day), '%Y-%m-%d') AS plan_day,a.remaining_days,b.lact,b.ear_number FROM (
+		SELECT cow_id,plan_day,'免疫' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_immunization_plan WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,plan_day,'同期' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_cow_same_time WHERE status = 2 ` + pastureWhereSql + `
+		SELECT cow_id,plan_day,'同期' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_cow_same_time WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,plan_day,'孕检' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_pregnant_check WHERE status = 2 ` + pastureWhereSql + `
+		SELECT cow_id,plan_day,'孕检' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_pregnant_check WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,plan_day,'断奶' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_weaning WHERE status = 2 ` + pastureWhereSql + `
+		SELECT cow_id,plan_day,'断奶' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_weaning WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,plan_day,'配种' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_mating WHERE status = 2 ` + pastureWhereSql + `
+		SELECT cow_id,plan_day,'配种' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_mating WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,plan_day,'产犊' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_calving WHERE status = 2 ` + pastureWhereSql + `
+		SELECT cow_id,plan_day,'产犊' as calendar_type_name,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days FROM event_calving WHERE status = 2 AND pasture_id = ` + fmt.Sprintf("%d", userModel.AppPasture.Id) + `
 		UNION ALL
-		SELECT cow_id,disease_at as plan_day,'疾病' as calendar_type_name,0 AS remaining_days FROM event_cow_disease WHERE diagnosed_result IN (2,3) ` + pastureWhereSql + `
+		SELECT cow_id,disease_at as plan_day,'疾病' as calendar_type_name,0 AS remaining_days FROM event_cow_disease WHERE diagnosed_result IN (2,3)
 	) as a JOIN cow b ON a.cow_id = b.id WHERE 1 = 1 `
 
-	completeSql := fmt.Sprintf("%s %s ORDER BY a.plan_day DESC", sql, whereSql)
+	completeSql := fmt.Sprintf("%s ORDER BY a.plan_day DESC", sql)
 	if err = s.DB.Raw(completeSql).Find(&calendarToDoList).Error; err != nil {
 		return nil, err
 	}
@@ -87,7 +70,8 @@ func (s *StoreEntry) CalendarToDoList(ctx context.Context, req *pasturePb.Calend
 		toDayCompletedCountMap[v.CalendarTypeName] = v.Count
 	}
 
-	list := Paginate(calendarToDoList, pagination.Page, pagination.PageSize)
+	list := Paginate(calendarToDoList, req, pagination)
+
 	return &pasturePb.CalendarToDoResponse{
 		Code: http.StatusOK,
 		Msg:  "ok",
@@ -584,9 +568,36 @@ func (s *StoreEntry) TreatmentCowList(ctx context.Context, req *pasturePb.ItemsR
 }
 
 // Paginate 函数用于对切片进行分页
-func Paginate(slice []*pasturePb.CalendarToDoList, page int32, pageSize int32) []*pasturePb.CalendarToDoList {
+func Paginate(slice []*pasturePb.CalendarToDoList, req *pasturePb.CalendarToDoRequest, pagination *pasturePb.PaginationModel) []*pasturePb.CalendarToDoList {
+	newSlice := make([]*pasturePb.CalendarToDoList, 0)
+	if req.CalendarType > 0 {
+		calendarTypeName := CalendarTypeMap()[req.CalendarType]
+		if len(calendarTypeName) > 0 {
+			re := regexp.MustCompile(`[a-zA-Z]`) // 使用正则表达式替换匹配的字母为空字符串
+			calendarTypeName = re.ReplaceAllString(calendarTypeName, "")
+			for _, v := range slice {
+				if v.CalendarTypeName != calendarTypeName {
+					continue
+				}
+				newSlice = append(newSlice, v)
+			}
+		}
+	} else {
+		newSlice = append(newSlice, slice...)
+	}
+
+	if req.CowId > 0 {
+		filteredSlice := make([]*pasturePb.CalendarToDoList, 0)
+		for _, v := range newSlice {
+			if v.CowId != req.CowId {
+				continue
+			}
+			filteredSlice = append(filteredSlice, v)
+		}
+		newSlice = filteredSlice
+	}
 	// 计算起始索引
-	start := (page - 1) * pageSize
+	start := (pagination.Page - 1) * pagination.PageSize
 
 	// 如果起始索引超出切片长度,返回空切片
 	if start >= int32(len(slice)) {
@@ -594,7 +605,7 @@ func Paginate(slice []*pasturePb.CalendarToDoList, page int32, pageSize int32) [
 	}
 
 	// 计算结束索引
-	end := start + pageSize
+	end := start + pagination.PageSize
 
 	// 如果结束索引超出切片长度,调整到切片末尾
 	if end > int32(len(slice)) {
@@ -605,25 +616,29 @@ func Paginate(slice []*pasturePb.CalendarToDoList, page int32, pageSize int32) [
 	return slice[start:end]
 }
 
-func ProgressList(dataList []*pasturePb.CalendarToDoList, toDayCompletedCountMap map[string]int32) map[int32]*pasturePb.ProgressList {
-	res := make(map[int32]*pasturePb.ProgressList)
-	incompleteTotalMap := make(map[int32]int32)
-	for _, v := range dataList {
-		incompleteTotalMap[int32(v.CalendarType)] += 1
-		calendarName := CalendarTypeMap()[v.CalendarType]
-		res[int32(v.CalendarType)] = &pasturePb.ProgressList{
-			CalendarName:     calendarName,
-			CalendarTypeKind: v.CalendarType,
-			CompletedCount:   toDayCompletedCountMap[calendarName],
+func ProgressList(dataList []*pasturePb.CalendarToDoList, toDayCompletedCountMap map[string]int32) map[string]*pasturePb.ProgressList {
+	res := make(map[string]*pasturePb.ProgressList)
+	for cn, cc := range toDayCompletedCountMap {
+		res[cn] = &pasturePb.ProgressList{
+			CalendarName:   cn,
+			CompletedCount: cc,
 		}
-	}
 
-	for k, v := range incompleteTotalMap {
-		res[k].IncompleteTotal = v
-		res[k].Progress = fmt.Sprintf("0%")
-		if v > 0 && res[k].CompletedCount > 0 {
-			res[k].Progress = strconv.FormatFloat(float64(res[k].CompletedCount)/float64(v)*100, 'f', 2, 64) //fmt.Sprintf("%d%%", int32(float32(res[k].CompletedCount)/float32(v)*100))
+		for _, d := range dataList {
+			calendarName := CalendarTypeMap()[d.CalendarType]
+			if calendarName != cn {
+				continue
+			}
+			res[cn].CalendarTypeKind = d.CalendarType
+			res[cn].IncompleteTotal += 1
+		}
+
+		if res[cn].IncompleteTotal > 0 && res[cn].CompletedCount > 0 {
+			res[cn].Progress = strconv.FormatFloat(float64(res[cn].CompletedCount)/float64(res[cn].IncompleteTotal)*100, 'f', 2, 64)
+		} else {
+			res[cn].Progress = "0%"
 		}
 	}
+
 	return res
 }

+ 1 - 1
module/backend/event_health.go

@@ -662,7 +662,7 @@ func (s *StoreEntry) CowDiseaseCurable(ctx context.Context, req *pasturePb.Event
 			if err = tx.Table(cowLogs.TableName()).
 				Where("event_type = ?", pasturePb.EventType_Disease).
 				Where("event_at = ?", eventCowDisease.DiseaseAt).
-				Update("desc", fmt.Sprintf("疾病名称: %s; 状态: 已治愈; 治愈时间: %s; 治疗天数: %d;", eventCowDisease.DiseaseName, curableAtFormat, curableDays)).
+				Update("event_description", fmt.Sprintf("疾病名称: %s; 状态: 已治愈; 治愈时间: %s; 治疗天数: %d;", eventCowDisease.DiseaseName, curableAtFormat, curableDays)).
 				Error; err != nil {
 				return xerr.WithStack(err)
 			}