From d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:36:24 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
index eed16c8..8af1911 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
@@ -30,8 +30,9 @@
if(!stringRedisTemplate.hasKey(comPropertyEquipment.getSerialNo())){
ComPropertyAlarm comPropertyAlarm=new ComPropertyAlarm();
comPropertyAlarm.setCreateTime(DateUtil.date());
+ comPropertyAlarm.setPhone(comPropertyEquipment.getPhone());
comPropertyAlarm.setSerialNo(comPropertyEquipment.getSerialNo());
- comPropertyAlarm.setType(ComPropertyAlarm.type.one);
+ comPropertyAlarm.setType(ComPropertyAlarm.type.time);
comPropertyAlarm.setCommunityId(comPropertyEquipment.getCommunityId());
comPropertyAlarm.setName(comPropertyEquipment.getUsername());
comPropertyAlarm.setStatus(ComPropertyAlarm.status.dcl);
--
Gitblit v1.7.1