From 2c2a75dd0f37ce4fbfabe93a9d8eec35af332eed Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Sun, 11 Jun 2023 20:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=20=E9=87=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-supervise-monitor-biz/pom.xml                  |  5 +++++
 .../supervise/monitor/biz/callpolice/CallRest.java |  9 ++++-----
 .../monitor/biz/device/YDeviceService.java         | 14 ++++++++++++++
 .../src/main/resources/application-test.yml        |  6 ++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/yxt-supervise-monitor-biz/pom.xml b/yxt-supervise-monitor-biz/pom.xml
index 66fd93a..4cfc42c 100644
--- a/yxt-supervise-monitor-biz/pom.xml
+++ b/yxt-supervise-monitor-biz/pom.xml
@@ -106,6 +106,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java
index 021e9ba..677042c 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java
@@ -28,8 +28,8 @@ public class CallRest {
     @Autowired
     private DemoBaseentityService demoBaseentityService;
 
-//    @Autowired
-//    private SimpMessagingTemplate messagingTemplate;
+    @Autowired
+    private SimpMessagingTemplate messagingTemplate;
 
     @ApiOperation("获取token")
     @GetMapping("/getCallToken")
@@ -172,9 +172,8 @@ public class CallRest {
     @ApiOperation("临时测试")
     @GetMapping("/callTempFunc")
     public String callTempFunc() throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
-//        SimpMessagingTemplate simpMessagingTemplate = new SimpMessagingTemplate();
-//        String errorMessage = "这是一条新的报警消息。";
-//        simpMessagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息");
+        String errorMessage = "这是一条新的报警消息。";
+        messagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息");
         String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/get?deviceSerial=L20560109";
         String result = HttpUtils.sendGet(url, "35ad3e80-1de4-4477-827e-0473320cf644");
         return result;
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
index 91f2ee7..ea36a69 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
@@ -163,6 +163,7 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
         String deviceSerial = "";
         IPage<Device> iPage = new Page<>();
         List<Device> list = new ArrayList<>();
+        String notIds = "";
         for (Object obj : jsonArray) {
             JSONObject objJson = (JSONObject) obj;
             deviceSerial = objJson.get("deviceSerial").toString();
@@ -172,12 +173,25 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
                 wrapper.eq("type", searchVo.get("type"));
             }
             wrapper.eq("serialNumber", deviceSerial);
+            notIds += deviceSerial;
             List<Device> listSmall = this.list(wrapper);
             if (listSmall.size() > 0) {
                 listSmall.get(0).setStatus(objJson.get("deviceStatus").toString()); // 设备状态 0：离线 1：在线
                 list.add(listSmall.get(0));
             }
         }
+
+        QueryWrapper<Device> wrapper2 = new QueryWrapper<>();
+        if (StrUtil.isNotBlank(searchVo.get("type"))) {
+            wrapper2.eq("type", searchVo.get("type"));
+        }
+        notIds += deviceSerial;
+        wrapper2.notIn("serialNumber", notIds);
+        List<Device> notList = this.list(wrapper2);
+        for(Device device : notList){
+            device.setStatus("1"); //默认在线
+            list.add(device);
+        }
         iPage.setRecords(list);
         iPage.setCurrent(pageVo.getCurrent());
         iPage.setSize(pageVo.getSize());
diff --git a/yxt-supervise-monitor-biz/src/main/resources/application-test.yml b/yxt-supervise-monitor-biz/src/main/resources/application-test.yml
index c5c8df0..9abc3a0 100644
--- a/yxt-supervise-monitor-biz/src/main/resources/application-test.yml
+++ b/yxt-supervise-monitor-biz/src/main/resources/application-test.yml
@@ -32,4 +32,10 @@ scheduleTime:
   cron: 0 59 * * * ?
 #  folder: D:\resources\download
   folder: /root/huirong/monitor-java/imagesDownload
+websocket:
+  port: 19800
+  boss:
+    thread: 4
+  worker:
+    thread: 8