From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java |   61 ++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 21 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 432eb1c..ced56c0 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
@@ -7,6 +7,7 @@
 import com.sandu.ximon.admin.config.NginxConfigBean;
 import com.sandu.ximon.admin.config.RealtimeServerBean;
 import com.sandu.ximon.admin.entity.*;
+import com.sandu.ximon.admin.param.PoleBindingParam;
 import com.sandu.ximon.admin.utils.Constant;
 import com.sandu.ximon.admin.utils.FileUtil;
 import com.sandu.ximon.admin.utils.HtmlTemplateUtils;
@@ -34,6 +35,8 @@
 @EnableCaching
 public class PoleLightemitService extends BaseServiceImpl<PoleLightemitEntityMapper, PoleLightemitEntity> {
 
+    @Autowired
+    private PoleBindingService poleBindingService;
     //    @Autowired
 //    PoleStreetlightLightemitService poleStreetlightLightemitService;
 
@@ -182,19 +185,18 @@
     }
 */
 
-    public List<PoleLightemitEntity> ledList(){
+    public List<PoleLightemitEntity> ledList() {
 //        Wrappers.lambdaQuery()
         List<PoleLightemitEntity> list = list();
-       return ledOnlineCheck(list);
+        return ledOnlineCheck(list);
     }
 
 
-
     public List<PoleLightemitEntity> ledOnlineCheck(List<PoleLightemitEntity> list) {
-        List<PoleLightemitEntity> onLineList=new ArrayList<>();
-        for(PoleLightemitEntity poleLightemitEntity : list){
+        List<PoleLightemitEntity> onLineList = new ArrayList<>();
+        for (PoleLightemitEntity poleLightemitEntity : list) {
             poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
-            if(poleLightemitEntity.getIsOpen()){
+            if (poleLightemitEntity.getIsOpen()) {
                 onLineList.add(poleLightemitEntity);
             }
         }
@@ -206,37 +208,54 @@
         boolean save = this.save(poleLightemit);
         // 缁戝畾鐏潌
 
-        if(save&&poleLightemit.getStreetlightId()!=null){
-            System.out.println("-------------");
+        if (save && poleLightemit.getStreetlightId() != null) {
+            PoleBindingParam poleBindingParam = new PoleBindingParam();
+            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
+            poleBindingParam.setDeviceType(1);
+            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
+            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
         }
-      //  poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
+        //  poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
     }
 
 
-    public void updatePoleLightemit(Long ledId,PoleLightemitEntity poleLightemit) {
+    public void updatePoleLightemit(Long ledId, PoleLightemitEntity poleLightemit) {
         PoleLightemitEntity byId = getById(ledId);
-        if(byId==null){
+        if (byId == null) {
             throw new BusinessException("鏈壘鍒癓ED灞�");
         }
         poleLightemit.setLightemitId(ledId);
         boolean b = this.updateById(poleLightemit);
         // 缁戝畾鐏潌
 
-        if(b&&poleLightemit.getStreetlightId()!=null){
-            System.out.println("-------------");
+        if (b && poleLightemit.getStreetlightId() != null) {
+            //鍏堝垹闄ょ粦瀹氬叧绯�
+            poleBindingService.unBindPole(poleLightemit.getLightemitControlCode());
+            //鍐嶇粦瀹�
+            PoleBindingParam poleBindingParam = new PoleBindingParam();
+            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
+            poleBindingParam.setDeviceType(1);
+            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
+            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
         }
-       // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
+        // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
     }
 
     public boolean deletePoleLightemit(List<Long> ledIds) {
+
+        List<PoleLightemitEntity> poleLightemitEntities = listByIds(ledIds);
+
+        // 鍒犻櫎璁惧缁戝畾
+        if (poleLightemitEntities != null && poleLightemitEntities.size() != 0) {
+            for (PoleLightemitEntity poleLightemitEntitie : poleLightemitEntities) {
+                if (poleLightemitEntitie.getLightemitControlCode() != null) {
+                    //鍒犻櫎缁戝畾鍏崇郴//鍏堝垹闄ょ粦瀹氬叧绯�
+                    poleBindingService.unBindPole(poleLightemitEntitie.getLightemitControlCode());
+                }
+            }
+        }
+        //鍒犻櫎璁惧
         boolean b = removeByIds(ledIds);
-
-        // 缁戝畾鐏潌
-
-//        if(b&&byId.getStreetlightId()!=null){
-//            //鍒犻櫎缁戝畾鍏崇郴
-//            System.out.println("-------------");
-//        }
         return b;
         // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
     }

--
Gitblit v1.9.3