#
Junjie
昨天 34b3f498a7c3663431073a91df35d9936decc5e0
#
8个文件已修改
20 ■■■■■ 已修改文件
src/main/java/com/zy/ai/service/LlmChatService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/network/ZyCrnConnectDriver.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/network/ZyRgvConnectDriver.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/network/ZyStationConnectDriver.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZyStationThread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
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();
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();
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();
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) {
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;
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;
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());