From 34b3f498a7c3663431073a91df35d9936decc5e0 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 15 十二月 2025 08:46:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java | 2 +-
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java | 2 +-
src/main/java/com/zy/core/network/ZyRgvConnectDriver.java | 2 +-
src/main/java/com/zy/ai/service/LlmChatService.java | 4 +++-
src/main/java/com/zy/core/network/ZyCrnConnectDriver.java | 2 +-
src/main/java/com/zy/core/network/ZyStationConnectDriver.java | 2 +-
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 4 ++--
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 2 +-
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/ai/service/LlmChatService.java b/src/main/java/com/zy/ai/service/LlmChatService.java
index 5e709af..0736951 100644
--- a/src/main/java/com/zy/ai/service/LlmChatService.java
+++ b/src/main/java/com/zy/ai/service/LlmChatService.java
@@ -48,7 +48,7 @@
.uri("/chat/completions")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey)
.contentType(MediaType.APPLICATION_JSON)
- .bodyValue(req) // 2.5.14 宸叉敮鎸� bodyValue
+ .bodyValue(req)
.retrieve()
.bodyToMono(ChatCompletionResponse.class)
.doOnError(ex -> log.error("璋冪敤 LLM 澶辫触", ex))
@@ -80,6 +80,8 @@
req.setMax_tokens(maxTokens != null ? maxTokens : 1024);
req.setStream(true);
+ System.out.println(JSON.toJSONString(req));
+
Flux<String> flux = llmWebClient.post()
.uri("/chat/completions")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey)
diff --git a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
index 18b90e1..6691d0b 100644
--- a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
@@ -28,7 +28,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
diff --git a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
index 23852ab..bd015f1 100644
--- a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
@@ -23,7 +23,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index d2beb2e..1d722d6 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -29,7 +29,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
diff --git a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
index 78263cb..ff4adce 100644
--- a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
@@ -264,7 +264,7 @@
}
try {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
ZyStationStatusEntity nextStatus = statusList.stream()
.filter(item -> item.getStationId().equals(currentStationId)).findFirst().orElse(null);
if (nextStatus == null) {
diff --git a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
index f58b262..420650f 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
@@ -51,7 +51,7 @@
public void run() {
connect();
initRgv();
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
int step = 1;
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 2676093..77683af 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -56,7 +56,7 @@
public void run() {
this.connect();
this.initCrn();
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
int step = 1;
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 2624e46..3d932ea 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -59,7 +59,7 @@
//璁惧璇诲彇
Thread readThread = new Thread(() -> {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
readStatus();
Thread.sleep(200);
@@ -70,7 +70,7 @@
});
readThread.start();
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
int step = 1;
Task task = MessageQueue.poll(SlaveType.Devp, deviceConfig.getDeviceNo());
--
Gitblit v1.9.1