From fb47fc829e2f081c6aef37e837e9d50e79c9b701 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 27 七月 2022 11:40:34 +0800
Subject: [PATCH] 优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index b8d973c..268fc5d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -5,16 +5,18 @@
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5AtmosphereReportEnum;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.vo.EquipmentInfomation;
 import com.sandu.ximon.dao.bo.AirEquipmentBo;
 import com.sandu.ximon.dao.domain.AirEquipment;
 import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -25,7 +27,7 @@
 
 
     /**
-     * 妯＄硦鏌ヨ
+     * 澶ф皵璁惧鍒楄〃妯＄硦鏌ヨ
      */
     public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
         if (baseConditionVO != null) {
@@ -36,6 +38,20 @@
             airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, null);
         } else {
             airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+        }
+
+        return airEquipmentBos;
+    }
+
+    /**
+     * 澶ф皵璁惧鍔ｅ垪琛紙鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
+     */
+    public List<AirEquipmentBo> listAirEquipmentOnHome() {
+        List<AirEquipmentBo> airEquipmentBos;
+        if (SecurityUtils.getClientId() == null) {
+            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, null);
+        } else {
+            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
         }
 
         return airEquipmentBos;
@@ -53,6 +69,18 @@
 //                , 1, 300L);
         if (one == null) {
             save(airEquipment);
+            /**
+             * 娣诲姞澶ф皵璁惧 鏃ュ織璁板綍寮�濮�
+             */
+            List<String> listCode = new ArrayList<>(1);
+            listCode.add(airEquipment.getMac());
+            String content = "{ 璁惧id:" + airEquipment.getId() + "璁惧code锛�" + airEquipment.getMac() +
+                    "}";
+
+            StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞澶ф皵璁惧", content);
+            /**
+             * 娣诲姞澶ф皵璁惧 鏃ュ織璁板綍缁撴潫
+             */
         }
     }
 
@@ -67,19 +95,41 @@
         if (airEquipment == null) {
             throw new BusinessException("鎵句笉鍒板ぇ姘旇澶囨暟鎹�");
         }
+        /**
+         * 鍒犻櫎澶ф皵璁惧 鏃ュ織璁板綍寮�濮�
+         */
+        List<String> listCode=new ArrayList<>(1);
+        listCode.add(airEquipment.getMac());
+        String content = "{璁惧code锛�" + airEquipment.getMac() + "}";
+
+        StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎澶ф皵璁惧", content);
+        /**
+         * 鍒犻櫎澶ф皵璁惧 鏃ュ織璁板綍缁撴潫
+         */
         return removeById(Id);
     }
 
     /**
      * 鏍规嵁Mac澶ф皵璁惧鏁版嵁璇︽儏
      */
-    public AirEquipment getAirEquipment(String mac) {
-        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
-        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + mac) != null) {
-            one.setState(1);
-        } else {
-            one.setState(0);
+    public EquipmentInfomation getAirEquipmentInfo(String mac) {
+        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+        equipmentInfo.setEquipmentType("澶ф皵璁惧");
+        if (mac == null || mac.trim().length() == 0) {
+            return equipmentInfo;
         }
-        return one;
+
+        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + mac) != null) {
+            equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+        } else {
+            equipmentInfo.setEquipmentState("绂荤嚎");
+        }
+
+        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
+        if (one != null) {
+            equipmentInfo.setEquipmentMac(mac);
+            equipmentInfo.setEquipmentCreateTime(one.getCreateTime());
+        }
+        return equipmentInfo;
     }
 }

--
Gitblit v1.9.3