From f7178996ca77a1bccc941c0e7a73b36803e508cb Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 01 三月 2024 16:13:11 +0800
Subject: [PATCH] 优化协议

---
 src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java |  130 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 108 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index fd196ab..7b7b5f4 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -3,20 +3,25 @@
 import com.bstek.dorado.annotation.DataProvider;
 import com.bstek.dorado.annotation.DataResolver;
 import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiCommonDevice;
+import com.fzzy.api.data.DepotType;
+import com.fzzy.api.data.GatewayDeviceType;
 import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.RedisConst;
-import com.fzzy.api.utils.RedisUtil;
 import com.fzzy.gateway.GatewayUtils;
 import com.fzzy.gateway.entity.GatewayDevice;
 import com.fzzy.gateway.service.repository.GatewayDeviceRep;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
+@Slf4j
 @Component
 public class GatewayDeviceService {
 
@@ -30,36 +35,78 @@
      */
     @DataProvider
     public List<GatewayDevice> listAll() {
-        return gatewayDeviceRep.findAll();
+        Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
+
+
+        List<GatewayDevice> list = gatewayDeviceRep.findAll(sort);
+
+        if (null == list || list.isEmpty()) return list;
+
+        List<GatewayDevice> result = new ArrayList<>();
+
+        ApiCommonDevice commonDevice;
+        for (GatewayDevice device : list) {
+            commonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+            if (null != commonDevice) {
+                device.setIp(commonDevice.getIp());
+                device.setPort(commonDevice.getPort());
+                device.setStatus(commonDevice.getStatus());
+                device.setOnlineTime(commonDevice.getOnlineTime());
+            }
+            result.add(device);
+        }
+        return result;
     }
 
     /**
      * gatewayDeviceService#updateSave
      *
-     * @param entity
+     * @param data
      */
     @DataResolver
-    public void updateSave(GatewayDevice entity) {
-        GatewayDevice data = new GatewayDevice();
-        BeanUtils.copyProperties(entity, data);
+    public void updateSave(GatewayDevice data) {
+        GatewayDevice data2 = new GatewayDevice();
+        BeanUtils.copyProperties(data, data2);
 
-        if (null == data.getId()) {
-            data.setId(ContextUtil.getUUID());
+
+        if (null == data2.getStatus()) {
+            data.setStatus(Constant.YN_Y);
+
+            if (GatewayDeviceType.TYPE_07.equals(data2.getType())) {
+                data.setStatus(Constant.YN_N);
+            }
+
         }
 
-
-        if (null == data.getDeviceSn()) {
-            if (null != entity.getIp()) {
-                data.setDeviceSn(entity.getIp());
+        if (null == data2.getDeviceSn()) {
+            if (null != data2.getIp()) {
+                data.setDeviceSn(data2.getIp());
             } else {
-                data.setDeviceSn(data.getDeviceId());
+                data.setDeviceSn(data2.getDeviceId());
             }
         }
 
-        gatewayDeviceRep.save(data);
+        if (null == data2.getDepotType()) {
+            data2.setDepotType(DepotType.TYPE_01.getCode());
+        }
 
+        if (null == data2.getId()) {
+            data2.setId(ContextUtil.getUUID());
+            gatewayDeviceRep.save(data2);
+        } else {
+            gatewayDeviceRep.save(data2);
+        }
         flushCache();
     }
+
+    public void updateData(GatewayDevice device) {
+        device.setStatus(Constant.YN_Y);
+
+        gatewayDeviceRep.save(device);
+
+        flushCacheOne(device);
+    }
+
 
     /**
      * gatewayDeviceService#delData
@@ -78,11 +125,6 @@
         return null;
     }
 
-
-    /**
-     * gatewayDeviceService#flushCache
-     */
-    @Expose
     public void flushCache() {
         List<GatewayDevice> list = listAll();
         if (null == list || list.isEmpty()) return;
@@ -90,4 +132,48 @@
             GatewayUtils.add2Cache(device);
         }
     }
+
+    private void flushCacheOne(GatewayDevice device) {
+        GatewayUtils.add2Cache(device);
+    }
+
+
+    @Expose
+    public String test() {
+        log.info("-----------test-------------------");
+        return "SUCCESS";
+    }
+
+    /**
+     * 鏍规嵁瀹為檯閫氳鍒嗘満璁剧疆锛屽綋鍓嶅垎鏈哄湪绾�
+     *
+     * @param commonDevice 瀹為檯閫氳璁惧
+     */
+    public void onlineByCommonDevice(ApiCommonDevice commonDevice) {
+        List<GatewayDevice> list = GatewayUtils.getCacheByDeviceSn2(commonDevice.getSn());
+        if (null == list || list.isEmpty()) return;
+
+        for (GatewayDevice device : list) {
+            device.setIp(commonDevice.getIp());
+            device.setPort(commonDevice.getPort());
+            device.setOnlineTime(new Date());
+            device.setStatus(Constant.YN_Y);
+
+            GatewayUtils.add2Cache(device);
+        }
+    }
+
+    public void OfflineByCommonDevice(ApiCommonDevice commonDevice) {
+        List<GatewayDevice> list = GatewayUtils.getCacheByDeviceSn2(commonDevice.getSn());
+        if (null == list || list.isEmpty()) return;
+
+        for (GatewayDevice device : list) {
+            device.setIp(commonDevice.getIp());
+            device.setPort(commonDevice.getPort());
+            device.setStatus(Constant.YN_N);
+            GatewayUtils.add2Cache(device);
+        }
+    }
+
+
 }

--
Gitblit v1.9.3