From 9797318a4c6867fb49d701c240fe877ee953d930 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期三, 15 十二月 2021 18:33:21 +0800
Subject: [PATCH] Merge branch 'master' of http://112.74.63.130:8088/r/XimengPole/XMPoleManager

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
index b407bc9..dbf0de1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
@@ -132,6 +132,7 @@
                                     .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
             if ("00".equals(rebootFrame.getPayload())) {
                 lampPost.setMacCode(uniqueMac);
+
                 save= save(lampPost);
 
                 System.out.println("閲嶅惎鎴愬姛");
@@ -202,6 +203,7 @@
         for (Long id : Id
         ) {
             lampPostMapper.serGroup(group, id);
+
         }
 
         // return updateBatchById(update);
@@ -229,7 +231,7 @@
                     post.setOnLineState(deviceStatus.getStatus());
                 }
             }
-            MacCodes.add(post.getMacCode());
+          //  MacCodes.add(post.getMacCode());
         }
 
 

--
Gitblit v1.9.3