From 78a2a99a5d70a58a7eaf737833335e0b18e59794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 18 Dec 2023 17:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=8F=91=E6=B6=88?=
=?UTF-8?q?=E6=81=AF=E4=B8=BA=E7=BA=BF=E7=A8=8B=E6=B1=A0=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/mortals/xhx/busiz/web/DeviceApiController.java | 8 ++++----
.../java/com/mortals/xhx/common/utils/DownMsgTask.java | 10 ++++++++++
.../DeviceComsumersRegisterService.java | 4 ++--
.../mortals/httpclient/device/DeviceController.http | 4 ----
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
index e7c359c8..088e02a4 100644
--- a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+++ b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
@@ -667,13 +667,13 @@ public class DeviceApiController {
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
try {
- list.stream()
+/* list.stream()
.sorted(Comparator.comparing(DeviceMsgReq::getTimestamp))
.forEach(item -> {
cacheService.lpush(KEY_DEVICE_DOWN_MSG_QUEUE, item);
- });
-/* DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService, messageProducer);
- sendTaskThreadPool.execute(downMsgTask);*/
+ });*/
+ DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService, messageProducer);
+ sendTaskThreadPool.execute(downMsgTask);
} catch (AppException e) {
log.error("鎺ユ敹鏁版嵁澶辫触", e);
rsp.setCode(e.getCode());
diff --git a/device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java b/device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java
index a080cf61..ece8890e 100644
--- a/device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java
+++ b/device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java
@@ -23,6 +23,7 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -49,6 +50,7 @@ public class DownMsgTask implements Runnable {
@Override
public void run() {
try {
+ ArrayList<DeviceLogEntity> deviceLogList = new ArrayList<>();
List<DeviceMsgReq> collect = list.stream().sorted(Comparator.comparing(DeviceMsgReq::getTimestamp)).collect(Collectors.toList());
List<List<DeviceMsgReq>> partition = ListUtil.partition(collect, 10);
for (List<DeviceMsgReq> deviceMsgReqs : partition) {
@@ -83,6 +85,7 @@ public class DownMsgTask implements Runnable {
deviceLogEntity.setLogType(LogTypeEnum.涓嬪彂鏈嶅姟.getValue());
deviceLogEntity.setCreateUserId(1L);
deviceLogEntity.setCreateTime(new Date());
+ // deviceLogList.add(deviceLogEntity);
deviceLogService.save(deviceLogEntity, null);
} else {
log.info("鏈壘鍒拌澶囷紝deviceCode:{}", item.getDeviceCode());
@@ -92,6 +95,13 @@ public class DownMsgTask implements Runnable {
TimeUnit.SECONDS.sleep(1);
}
+ /* if (!ObjectUtils.isEmpty(deviceLogList)) {
+ List<List<DeviceLogEntity>> partitionlogs = ListUtil.partition(deviceLogList, 100);
+ for (List<DeviceLogEntity> deviceLogEntities : partitionlogs) {
+ deviceLogService.save(deviceLogEntities);
+ }
+ }*/
+
} catch (Exception e) {
log.error("寮傚父锛�", e);
}
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
index a88ddfe4..521bb541 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
@@ -84,8 +84,8 @@ public class DeviceComsumersRegisterService implements IApplicationStartedServic
}
log.info("绗笁鏂瑰彂閫佺嚎绋嬪惎鍔�");
sendThirdPartyThread.start();
- log.info("娑堟伅涓嬪彂鍙戦€佺嚎绋嬪惎鍔�");
- deviceDownMsgThread.start();
+ //log.info("娑堟伅涓嬪彂鍙戦€佺嚎绋嬪惎鍔�");
+ // deviceDownMsgThread.start();
log.info("鏈嶅姟绔秷鎭槦鍒楀垵濮嬪寲鏈嶅姟寮€濮�..");
deviceService.find(new DeviceEntity())
diff --git a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
index 7498d47f..a87206f2 100644
--- a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
+++ b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
@@ -119,10 +119,6 @@ Content-Type: application/json
"deviceCode": "12-31-70-9C-BF-A3"
}
-> {%
-client.global.set("content", JSON.parse(response.body).data.content);
-%}
-
###鑾峰彇浜у搧涓�
GET {{baseUrl}}/api/deviceInit
Accept: application/json
--
2.24.3