Merge branch 'feature/event' of http://192.168.1.8:3000/xuyiping/kpt-pasture into feature/event

module/backend/mock/CowService.go

@@ -66,6 +66,21 @@ func (mr *MockCowServiceMockRecorder) CowGrowthCurve(arg0, arg1 interface{}) *go
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CowGrowthCurve", reflect.TypeOf((*MockCowService)(nil).CowGrowthCurve), arg0, arg1)
 }
 
+// Detail mocks base method.
+func (m *MockCowService) Detail(arg0 context.Context, arg1 *cowPb.SearchEventRequest) (*cowPb.CowInfoResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Detail", arg0, arg1)
+	ret0, _ := ret[0].(*cowPb.CowInfoResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Detail indicates an expected call of Detail.
+func (mr *MockCowServiceMockRecorder) Detail(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Detail", reflect.TypeOf((*MockCowService)(nil).Detail), arg0, arg1)
+}
+
 // EventList mocks base method.
 func (m *MockCowService) EventList(arg0 context.Context, arg1 *cowPb.SearchCowEventListRequest, arg2 *cowPb.PaginationModel) (*cowPb.CowEventListResponse, error) {
 	m.ctrl.T.Helper()
@@ -81,6 +96,21 @@ func (mr *MockCowServiceMockRecorder) EventList(arg0, arg1, arg2 interface{}) *g
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EventList", reflect.TypeOf((*MockCowService)(nil).EventList), arg0, arg1, arg2)
 }
 
+// IndicatorsComparison mocks base method.
+func (m *MockCowService) IndicatorsComparison(arg0 context.Context, arg1 *cowPb.IndicatorsComparisonRequest) (*model.IndicatorsComparisonResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IndicatorsComparison", arg0, arg1)
+	ret0, _ := ret[0].(*model.IndicatorsComparisonResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// IndicatorsComparison indicates an expected call of IndicatorsComparison.
+func (mr *MockCowServiceMockRecorder) IndicatorsComparison(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IndicatorsComparison", reflect.TypeOf((*MockCowService)(nil).IndicatorsComparison), arg0, arg1)
+}
+
 // List mocks base method.
 func (m *MockCowService) List(arg0 context.Context, arg1 *cowPb.SearchEventRequest, arg2 *cowPb.PaginationModel) (*cowPb.SearchCowListResponse, error) {
 	m.ctrl.T.Helper()

module/backend/mock/EventService.go

@@ -425,7 +425,7 @@ func (mr *MockEventServiceMockRecorder) SameTimeList(arg0, arg1, arg2 interface{
 }
 
 // SubmitEventLog mocks base method.
-func (m *MockEventService) SubmitEventLog(arg0 context.Context, arg1 *model.SystemUser, arg2 *model.Cow, arg3 cowPb.EventType_Kind, arg4 cowPb.ExposeEstrusType_Kind, arg5 interface{}) *model.EventCowLog {
+func (m *MockEventService) SubmitEventLog(arg0 context.Context, arg1 int64, arg2 *model.Cow, arg3 cowPb.EventType_Kind, arg4 cowPb.ExposeEstrusType_Kind, arg5 interface{}) *model.EventCowLog {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SubmitEventLog", arg0, arg1, arg2, arg3, arg4, arg5)
 	ret0, _ := ret[0].(*model.EventCowLog)

module/backend/mock/SystemService.go

@@ -91,21 +91,6 @@ func (mr *MockSystemServiceMockRecorder) DeleteSystemUser(arg0, arg1 interface{}
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSystemUser", reflect.TypeOf((*MockSystemService)(nil).DeleteSystemUser), arg0, arg1)
 }
 
-// GetCurrentUserName mocks base method.
-func (m *MockSystemService) GetCurrentUserName(arg0 context.Context) (string, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetCurrentUserName", arg0)
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetCurrentUserName indicates an expected call of GetCurrentUserName.
-func (mr *MockSystemServiceMockRecorder) GetCurrentUserName(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentUserName", reflect.TypeOf((*MockSystemService)(nil).GetCurrentUserName), arg0)
-}
-
 // GetRoleMenuList mocks base method.
 func (m *MockSystemService) GetRoleMenuList(arg0 context.Context, arg1 int64) (*cowPb.SystemRoleMenuResponse, error) {
 	m.ctrl.T.Helper()
@@ -267,6 +252,21 @@ func (mr *MockSystemServiceMockRecorder) SearchSystemUserList(arg0, arg1, arg2 i
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchSystemUserList", reflect.TypeOf((*MockSystemService)(nil).SearchSystemUserList), arg0, arg1, arg2)
 }
 
+// SearchUserPastureList mocks base method.
+func (m *MockSystemService) SearchUserPastureList(arg0 context.Context) (*cowPb.SystemUserPastureListResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SearchUserPastureList", arg0)
+	ret0, _ := ret[0].(*cowPb.SystemUserPastureListResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SearchUserPastureList indicates an expected call of SearchUserPastureList.
+func (mr *MockSystemServiceMockRecorder) SearchUserPastureList(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchUserPastureList", reflect.TypeOf((*MockSystemService)(nil).SearchUserPastureList), arg0)
+}
+
 // SystemDepDelete mocks base method.
 func (m *MockSystemService) SystemDepDelete(arg0 context.Context, arg1 int64) error {
 	m.ctrl.T.Helper()

module/backend/mock/kptservice.go

@@ -786,6 +786,21 @@ func (mr *MockKptServiceMockRecorder) DepartureBatch(arg0, arg1 interface{}) *go
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DepartureBatch", reflect.TypeOf((*MockKptService)(nil).DepartureBatch), arg0, arg1)
 }
 
+// Detail mocks base method.
+func (m *MockKptService) Detail(arg0 context.Context, arg1 *cowPb.SearchEventRequest) (*cowPb.CowInfoResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Detail", arg0, arg1)
+	ret0, _ := ret[0].(*cowPb.CowInfoResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Detail indicates an expected call of Detail.
+func (mr *MockKptServiceMockRecorder) Detail(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Detail", reflect.TypeOf((*MockKptService)(nil).Detail), arg0, arg1)
+}
+
 // DiseaseCureReport mocks base method.
 func (m *MockKptService) DiseaseCureReport(arg0 context.Context, arg1 *cowPb.DiseaseCureRateRequest) (*cowPb.DiseaseCureRateResponse, error) {
 	m.ctrl.T.Helper()
@@ -963,21 +978,6 @@ func (mr *MockKptServiceMockRecorder) FrozenSemenList(arg0, arg1, arg2 interface
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FrozenSemenList", reflect.TypeOf((*MockKptService)(nil).FrozenSemenList), arg0, arg1, arg2)
 }
 
-// GetCurrentUserName mocks base method.
-func (m *MockKptService) GetCurrentUserName(arg0 context.Context) (string, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetCurrentUserName", arg0)
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetCurrentUserName indicates an expected call of GetCurrentUserName.
-func (mr *MockKptServiceMockRecorder) GetCurrentUserName(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentUserName", reflect.TypeOf((*MockKptService)(nil).GetCurrentUserName), arg0)
-}
-
 // GetRoleMenuList mocks base method.
 func (m *MockKptService) GetRoleMenuList(arg0 context.Context, arg1 int64) (*cowPb.SystemRoleMenuResponse, error) {
 	m.ctrl.T.Helper()
@@ -1082,6 +1082,21 @@ func (mr *MockKptServiceMockRecorder) ImmunizationList(arg0, arg1, arg2 interfac
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImmunizationList", reflect.TypeOf((*MockKptService)(nil).ImmunizationList), arg0, arg1, arg2)
 }
 
+// IndicatorsComparison mocks base method.
+func (m *MockKptService) IndicatorsComparison(arg0 context.Context, arg1 *cowPb.IndicatorsComparisonRequest) (*model.IndicatorsComparisonResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IndicatorsComparison", arg0, arg1)
+	ret0, _ := ret[0].(*model.IndicatorsComparisonResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// IndicatorsComparison indicates an expected call of IndicatorsComparison.
+func (mr *MockKptServiceMockRecorder) IndicatorsComparison(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IndicatorsComparison", reflect.TypeOf((*MockKptService)(nil).IndicatorsComparison), arg0, arg1)
+}
+
 // IsShowSystemRole mocks base method.
 func (m *MockKptService) IsShowSystemRole(arg0 context.Context, arg1 int64) error {
 	m.ctrl.T.Helper()
@@ -1846,6 +1861,21 @@ func (mr *MockKptServiceMockRecorder) SearchTransferPenReasonList(arg0, arg1, ar
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchTransferPenReasonList", reflect.TypeOf((*MockKptService)(nil).SearchTransferPenReasonList), arg0, arg1, arg2)
 }
 
+// SearchUserPastureList mocks base method.
+func (m *MockKptService) SearchUserPastureList(arg0 context.Context) (*cowPb.SystemUserPastureListResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SearchUserPastureList", arg0)
+	ret0, _ := ret[0].(*cowPb.SystemUserPastureListResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SearchUserPastureList indicates an expected call of SearchUserPastureList.
+func (mr *MockKptServiceMockRecorder) SearchUserPastureList(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchUserPastureList", reflect.TypeOf((*MockKptService)(nil).SearchUserPastureList), arg0)
+}
+
 // SingleFactorInfantSurvivalRateAnalysis mocks base method.
 func (m *MockKptService) SingleFactorInfantSurvivalRateAnalysis(arg0 context.Context, arg1 *cowPb.SingleFactorPregnancyRateRequest) (*cowPb.SingleFactorPregnancyRateResponse, error) {
 	m.ctrl.T.Helper()
@@ -1862,7 +1892,7 @@ func (mr *MockKptServiceMockRecorder) SingleFactorInfantSurvivalRateAnalysis(arg
 }
 
 // SubmitEventLog mocks base method.
-func (m *MockKptService) SubmitEventLog(arg0 context.Context, arg1 *model.SystemUser, arg2 *model.Cow, arg3 cowPb.EventType_Kind, arg4 cowPb.ExposeEstrusType_Kind, arg5 interface{}) *model.EventCowLog {
+func (m *MockKptService) SubmitEventLog(arg0 context.Context, arg1 int64, arg2 *model.Cow, arg3 cowPb.EventType_Kind, arg4 cowPb.ExposeEstrusType_Kind, arg5 interface{}) *model.EventCowLog {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SubmitEventLog", arg0, arg1, arg2, arg3, arg4, arg5)
 	ret0, _ := ret[0].(*model.EventCowLog)