调整kafka推送规则

HealthMonitor.Service/Resolver/PregnancyHeartRateResolver.cs

@@ -587,26 +587,30 @@ namespace HealthMonitor.Service.Resolver
                                 await _serviceIotApi.SetFetalHeartRateConfig(heartRate.Serialno, fetalHeartRate, sampleTimeFHR, fetalHeartRateIsAbnormal);
 
                                 // 推送送微信
-                                var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
-                                var fhrMsgId = $"{heartRate.Serialno}-{sampleTimeFHR}-{Guid.NewGuid().ToString("D")[^3..]}";
-                                var topic = "topic.push.wx";
-                                var fhrMsg = new
+                                if (fetalHeartRateIsAbnormal!=0)
                                 {
-                                    messageId = fhrMsgId,
-                                    topic = topic,
-                                    time = DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(sampleTimeFHR.Length < 13 ? sampleTimeFHR.PadRight(13, '0') : sampleTimeFHR)).ToString("yyyy-MM-dd HH:mm:ss"),
-                                    data = new
+                                    var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
+                                    var fhrMsgId = $"{heartRate.Serialno}-{sampleTimeFHR}-{Guid.NewGuid().ToString("D")[^3..]}";
+                                    var topic = "topic.push.wx";
+                                    var fhrMsg = new
                                     {
-                                        deviceId = device?.DeviceId,
-                                        imei = heartRate.Serialno,
-                                        alarmTypeId = 12,
-                                        alarmDeviceName = heartRate.Serialno,
-                                        alarmRemarks = JsonConvert.SerializeObject(new { fetalHeartValue = fetalHeartRate, isAbnormal = fetalHeartRateIsAbnormal }),
-                                        address = string.Empty,
-                                        deviceKey = device?.DeviceId
-                                    }
-                                };
-                                await _serviceMqProcess.ProcessIMEIEventMessageAsync(fhrMsgId, topic,fhrMsg).ConfigureAwait(false);
+                                        messageId = fhrMsgId,
+                                        topic = topic,
+                                        time = DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(sampleTimeFHR.Length < 13 ? sampleTimeFHR.PadRight(13, '0') : sampleTimeFHR)).ToString("yyyy-MM-dd HH:mm:ss"),
+                                        data = new
+                                        {
+                                            deviceId = device?.DeviceId,
+                                            imei = heartRate.Serialno,
+                                            alarmTypeId = 12,
+                                            alarmDeviceName = heartRate.Serialno,
+                                            alarmRemarks = JsonConvert.SerializeObject(new { fetalHeartValue = fetalHeartRate, isAbnormal = fetalHeartRateIsAbnormal }),
+                                            address = string.Empty,
+                                            deviceKey = device?.DeviceId
+                                        }
+                                    };
+                                    await _serviceMqProcess.ProcessIMEIEventMessageAsync(fhrMsgId, topic, fhrMsg).ConfigureAwait(false);
+                                }
+                                
 
                             }
                         }
@@ -703,27 +707,29 @@ namespace HealthMonitor.Service.Resolver
                                         await _hisFetalMovementApiClient.AddAsync(fm).ConfigureAwait(false);
 
                                         // 发送到微信
-                                        var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
-                                        var fmMsgId = $"{heartRate.Serialno}-{fetalMovementSampleTime}-{Guid.NewGuid().ToString("D")[^3..]}";
-                                        var topic = "topic.push.wx";
-                                        var fmMsg = new
+                                        if (feltalMovementIsAbnormal != 0)
                                         {
-                                            messageId=Guid.NewGuid().ToString("D"),
-                                            topic= topic,
-                                            time= DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(fetalMovementSampleTime.Length < 13 ? fetalMovementSampleTime.PadRight(13, '0') : fetalMovementSampleTime)).ToString("yyyy-MM-dd HH:mm:ss"),
-                                            data=new {
-                                                deviceId= device?.DeviceId,
-                                                imei = heartRate.Serialno,
-                                                alarmTypeId=12,
-                                                alarmDeviceName = heartRate.Serialno,
-                                                alarmRemarks=JsonConvert.SerializeObject(new { fetalMovementValue= fetalMovement, isAbnormal= feltalMovementIsAbnormal }),
-                                                address=string.Empty,
-                                                deviceKey=device?.DeviceId
-                                            }
-                                        };
-                                        await _serviceMqProcess.ProcessIMEIEventMessageAsync(fmMsgId, topic, fmMsg).ConfigureAwait(false);
-
-
+                                            var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
+                                            var fmMsgId = $"{heartRate.Serialno}-{fetalMovementSampleTime}-{Guid.NewGuid().ToString("D")[^3..]}";
+                                            var topic = "topic.push.wx";
+                                            var fmMsg = new
+                                            {
+                                                messageId = Guid.NewGuid().ToString("D"),
+                                                topic = topic,
+                                                time = DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(fetalMovementSampleTime.Length < 13 ? fetalMovementSampleTime.PadRight(13, '0') : fetalMovementSampleTime)).ToString("yyyy-MM-dd HH:mm:ss"),
+                                                data = new
+                                                {
+                                                    deviceId = device?.DeviceId,
+                                                    imei = heartRate.Serialno,
+                                                    alarmTypeId = 12,
+                                                    alarmDeviceName = heartRate.Serialno,
+                                                    alarmRemarks = JsonConvert.SerializeObject(new { fetalMovementValue = fetalMovement, isAbnormal = feltalMovementIsAbnormal }),
+                                                    address = string.Empty,
+                                                    deviceKey = device?.DeviceId
+                                                }
+                                            };
+                                            await _serviceMqProcess.ProcessIMEIEventMessageAsync(fmMsgId, topic, fmMsg).ConfigureAwait(false);
+                                        }
                                         // 设置入库缓存记录
                                         await _deviceCacheMgr.SetFetalMovementAsync(heartRate.Serialno, fetalMovementSampleTime,fm);
                                         
@@ -953,26 +959,31 @@ namespace HealthMonitor.Service.Resolver
                 await _serviceIotApi.SetFetalHeartRateConfig(heartRate.Serialno, fetalHeartRate, sampleTime, isAbnormal);
 
                 // 推送到微信
-                var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
-                var fhrMsgId = $"{heartRate.Serialno}-{sampleTime}-{Guid.NewGuid().ToString("D")[^3..]}";
-                var topic = "topic.push.wx";
-                var fhrMsg = new
+                if (isAbnormal!=0)
                 {
-                    messageId = fhrMsgId,
-                    topic = topic,
-                    time = DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(sampleTime.Length < 13 ? sampleTime.PadRight(13, '0') : sampleTime)).ToString("yyyy-MM-dd HH:mm:ss"),
-                    data = new
+                    var device = await _deviceCacheMgr.GetDeviceBySerialNoAsync(heartRate.Serialno).ConfigureAwait(false);
+                    var fhrMsgId = $"{heartRate.Serialno}-{sampleTime}-{Guid.NewGuid().ToString("D")[^3..]}";
+                    var topic = "topic.push.wx";
+                    var fhrMsg = new
                     {
-                        deviceId = device?.DeviceId,
-                        imei = heartRate.Serialno,
-                        alarmTypeId = 12,
-                        alarmDeviceName = heartRate.Serialno,
-                        alarmRemarks = JsonConvert.SerializeObject(new { fetalHeartValue = fetalHeartRate, isAbnormal = isAbnormal }),
-                        address = string.Empty,
-                        deviceKey = device?.DeviceId
-                    }
-                };
-                await _serviceMqProcess.ProcessIMEIEventMessageAsync(fhrMsgId, topic, fhrMsg).ConfigureAwait(false);
+                        messageId = fhrMsgId,
+                        topic = topic,
+                        time = DateTimeUtil.GetDateTimeFromUnixTimeMilliseconds(long.Parse(sampleTime.Length < 13 ? sampleTime.PadRight(13, '0') : sampleTime)).ToString("yyyy-MM-dd HH:mm:ss"),
+                        data = new
+                        {
+                            deviceId = device?.DeviceId,
+                            imei = heartRate.Serialno,
+                            alarmTypeId = 12,
+                            alarmDeviceName = heartRate.Serialno,
+                            alarmRemarks = JsonConvert.SerializeObject(new { fetalHeartValue = fetalHeartRate, isAbnormal = isAbnormal }),
+                            address = string.Empty,
+                            deviceKey = device?.DeviceId
+                        }
+                    };
+                    await _serviceMqProcess.ProcessIMEIEventMessageAsync(fhrMsgId, topic, fhrMsg).ConfigureAwait(false);
+
+                }
+
 
             }
         }