From 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 06 六月 2022 11:05:17 +0800
Subject: [PATCH] bug修复

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java |   80 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 7 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 ad35832..616465a 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
@@ -16,6 +16,7 @@
 import com.sandu.ximon.admin.vo.EquipmentInfomation;
 import com.sandu.ximon.dao.domain.Pole;
 import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+import com.sandu.ximon.dao.enums.OrderByEnums;
 import com.sandu.ximon.dao.enums.PoleBindingEnums;
 import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,13 +65,49 @@
      * @param isOnLine
      * @return
      */
-    public List<PoleLightemitEntity> listLed(String keyword, boolean isOnLine) {
+    public List<PoleLightemitEntity> listLed(String keyword, Integer order, Integer seq, boolean isOnLine) {
         List<PoleLightemitEntity> poleLightemitEntityList;
+        //鎺掑簭瀛楁
+        String orderByResult = "id";
+        //姝ｅ簭銆佸�掑彊
+        String orderBySeq = OrderByEnums.ASC.getCode();
+        if (order != null) {
+            switch (order) {
+                case 1:
+                    orderByResult = OrderByEnums.LED_S_CODE.getCode();
+                    break;
+                case 2:
+                    orderByResult = OrderByEnums.LED_S_NAME.getCode();
+                    break;
+                case 3:
+                    orderByResult = OrderByEnums.LED_S_POLE_NAME.getCode();
+                    break;
+                case 4:
+                    orderByResult = OrderByEnums.LED_S_CREATE_TIME.getCode();
+                    break;
+                default:
+            }
+        }
+        if (seq != null) {
+            switch (seq) {
+                case 1:
+                    orderBySeq = " ASC";
+                    break;
+                case 2:
+                    orderBySeq = " DESC";
+                    break;
+                default:
+                    break;
+            }
+        }
+        //鎺掑簭鏂瑰紡
+        String orderBy = orderByResult + " " + orderBySeq;
+
         //瓒呯
         if (SecurityUtils.getClientId() == null) {
-            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null);
+            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null, orderBy);
         } else {
-            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId());
+            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(), orderBy);
         }
 
         List<PoleLightemitEntity> temp = new ArrayList<>();
@@ -86,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;
     }
 
     /**
@@ -179,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);
         }
 
         /**
@@ -215,7 +281,7 @@
         boolean b = this.updateById(poleLightemit);
         // 缁戝畾鐏潌
 
-        if (b && poleLightemit.getPoleId() != null) {
+        if (b && poleLightemit.getStreetlightId() != null) {
             //鍏堝垹闄ょ粦瀹氬叧绯�
             poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
             //鍐嶇粦瀹�
@@ -223,7 +289,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