From cd0fa3261b49dbab89bb01dfa94dc3ebdb08dec4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 07 七月 2022 16:32:11 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index cfccca7..e6f118b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -65,7 +65,7 @@
      * @param isOnLine
      * @return
      */
-    public List<PoleLightemitEntity> listLed(String keyword,Integer order,Integer seq, boolean isOnLine) {
+    public List<PoleLightemitEntity> listLed(String keyword, Integer order, Integer seq, boolean isOnLine) {
         List<PoleLightemitEntity> poleLightemitEntityList;
         //鎺掑簭瀛楁
         String orderByResult = "id";
@@ -105,9 +105,9 @@
 
         //瓒呯
         if (SecurityUtils.getClientId() == null) {
-            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null,orderBy);
+            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null, orderBy);
         } else {
-            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(),orderBy);
+            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(), orderBy);
         }
 
         List<PoleLightemitEntity> temp = new ArrayList<>();
@@ -123,6 +123,35 @@
             }
         }
         return temp;
+    }
+
+
+    /**
+     * 缁戝畾浣跨敤
+     *
+     * @param keyword
+     * @return
+     */
+    public List<PoleLightemitEntity> listLedOnBinding(String keyword) {
+        List<PoleLightemitEntity> poleLightemitEntityList;
+
+
+        //瓒呯
+        if (SecurityUtils.getClientId() == null) {
+            poleLightemitEntityList = poleLightemitDao.listLedOnBinding(keyword, null);
+        } else {
+            poleLightemitEntityList = poleLightemitDao.listLedOnBinding(keyword, SecurityUtils.getUserId());
+        }
+
+        for (PoleLightemitEntity poleLightemitEntity : poleLightemitEntityList) {
+            //鏌ヨ璁惧鍦ㄧ嚎鐘舵��
+            boolean onLine = lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode());
+            //鏌ヨ灞忓箷鐨勫紑鍚姸鎬�
+            String isOpen = lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode());
+            poleLightemitEntity.setIsOpen(String.valueOf(isOpen));
+            poleLightemitEntity.setOnLine(onLine);
+        }
+        return poleLightemitEntityList;
     }
 
     /**
@@ -216,12 +245,12 @@
         boolean save = this.save(poleLightemit);
         // 缁戝畾鐏潌
 
-        if (save && poleLightemit.getPoleId() != null) {
+        if (save && poleLightemit.getStreetlightId() != null) {
             PoleBindingParam poleBindingParam = new PoleBindingParam();
             poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
             poleBindingParam.setDeviceType(1);
             poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
-            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
+            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
         }
 
         /**
@@ -244,15 +273,17 @@
             throw new BusinessException("鏈壘鍒癓ED灞�");
         }
 
-        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getLightemitControlCode(), PoleBindingEnums.XIXUN);
-        if (!belong) {
-            throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+        if (SecurityUtils.getClientId() != null) {
+            boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getLightemitControlCode(), PoleBindingEnums.XIXUN);
+            if (!belong) {
+                throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+            }
         }
         poleLightemit.setLightemitId(ledId);
         boolean b = this.updateById(poleLightemit);
         // 缁戝畾鐏潌
 
-        if (b && poleLightemit.getPoleId() != null) {
+        if (b && poleLightemit.getStreetlightId() != null) {
             //鍏堝垹闄ょ粦瀹氬叧绯�
             poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
             //鍐嶇粦瀹�
@@ -260,7 +291,7 @@
             poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
             poleBindingParam.setDeviceType(10);
             poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
-            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
+            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
         }
 
         /**

--
Gitblit v1.9.3