From 4082af9f2275d501cd47a8a63e34cb266a2fbfd4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 09 十月 2021 18:44:00 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

---
 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