From f033da325dd16825bbca0d1ac71cc76420dfc8a2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 09 一月 2026 11:14:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ai/controller/WcsDiagnosisController.java | 215 +----------------------------------------------------
1 files changed, 4 insertions(+), 211 deletions(-)
diff --git a/src/main/java/com/zy/ai/controller/WcsDiagnosisController.java b/src/main/java/com/zy/ai/controller/WcsDiagnosisController.java
index 07eff9f..15857a0 100644
--- a/src/main/java/com/zy/ai/controller/WcsDiagnosisController.java
+++ b/src/main/java/com/zy/ai/controller/WcsDiagnosisController.java
@@ -1,34 +1,15 @@
package com.zy.ai.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.ai.entity.DeviceConfigsData;
-import com.zy.ai.entity.DeviceRealTimeData;
import com.zy.ai.entity.ChatCompletionRequest;
import com.zy.ai.entity.WcsDiagnosisRequest;
-import com.zy.ai.entity.WcsDiagnosisResponse;
-import com.zy.ai.log.AiLogAppender;
import com.zy.ai.service.WcsDiagnosisService;
-import com.core.annotations.ManagerAuth;
+import com.zy.ai.utils.AiUtils;
import com.zy.common.web.BaseController;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.StationObjModel;
-import com.zy.core.model.protocol.CrnProtocol;
-import com.zy.core.model.protocol.StationProtocol;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.StationThread;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,72 +22,7 @@
@Autowired
private WcsDiagnosisService wcsDiagnosisService;
@Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private BasCrnpService basCrnpService;
-
- @GetMapping("/runAi")
- public WcsDiagnosisResponse runAi() {
- WcsDiagnosisRequest request = new WcsDiagnosisRequest();
-
- request.setAlarmMessage("绯荤粺涓嶆墽琛屼换鍔�");
-
- List<String> logs = AiLogAppender.getRecentLogs(100);
- request.setLogs(logs);
-
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- request.setTasks(wrkMasts);
-
- List<DeviceRealTimeData> deviceRealTimeDataList = new ArrayList<>();
- List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
-
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp : basCrnps) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
- if (crnThread == null) {
- continue;
- }
-
- CrnProtocol protocol = crnThread.getStatus();
-
- for (StationObjModel stationObjModel : basCrnp.getInStationList$()) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> map = stationThread.getStatusMap();
- StationProtocol stationProtocol = map.get(stationObjModel.getStationId());
- if (stationProtocol == null) {
- continue;
- }
-
- DeviceRealTimeData stationData = new DeviceRealTimeData();
- stationData.setDeviceNo(stationObjModel.getDeviceNo());
- stationData.setDeviceType(String.valueOf(SlaveType.Devp));
- stationData.setDeviceData(stationProtocol);
- deviceRealTimeDataList.add(stationData);
- }
-
-
- DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
- deviceRealTimeData.setDeviceNo(basCrnp.getCrnNo());
- deviceRealTimeData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceRealTimeData.setDeviceData(protocol);
- deviceRealTimeDataList.add(deviceRealTimeData);
-
- DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
- deviceConfigsData.setDeviceNo(basCrnp.getCrnNo());
- deviceConfigsData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceConfigsData.setDeviceData(basCrnp);
- deviceConfigsDataList.add(deviceConfigsData);
- }
-
- request.setDeviceRealtimeData(deviceRealTimeDataList);
- request.setDeviceConfigs(deviceConfigsDataList);
- WcsDiagnosisResponse response = diagnose(request);
- return response;
- }
+ private AiUtils aiUtils;
@GetMapping("/runAiStream")
public SseEmitter runAiStream() {
@@ -114,63 +30,7 @@
new Thread(() -> {
try {
- WcsDiagnosisRequest request = new WcsDiagnosisRequest();
- request.setAlarmMessage("绯荤粺涓嶆墽琛屼换鍔�");
-
- List<String> logs = AiLogAppender.getRecentLogs(100);
- request.setLogs(logs);
-
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- request.setTasks(wrkMasts);
-
- List<DeviceRealTimeData> deviceRealTimeDataList = new ArrayList<>();
- List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
-
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp : basCrnps) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
- if (crnThread == null) {
- continue;
- }
-
- CrnProtocol protocol = crnThread.getStatus();
-
- for (StationObjModel stationObjModel : basCrnp.getInStationList$()) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> map = stationThread.getStatusMap();
- StationProtocol stationProtocol = map.get(stationObjModel.getStationId());
- if (stationProtocol == null) {
- continue;
- }
-
- DeviceRealTimeData stationData = new DeviceRealTimeData();
- stationData.setDeviceNo(stationObjModel.getDeviceNo());
- stationData.setDeviceType(String.valueOf(SlaveType.Devp));
- stationData.setDeviceData(stationProtocol);
- deviceRealTimeDataList.add(stationData);
- }
-
-
- DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
- deviceRealTimeData.setDeviceNo(basCrnp.getCrnNo());
- deviceRealTimeData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceRealTimeData.setDeviceData(protocol);
- deviceRealTimeDataList.add(deviceRealTimeData);
-
- DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
- deviceConfigsData.setDeviceNo(basCrnp.getCrnNo());
- deviceConfigsData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceConfigsData.setDeviceData(basCrnp);
- deviceConfigsDataList.add(deviceConfigsData);
- }
-
- request.setDeviceRealtimeData(deviceRealTimeDataList);
- request.setDeviceConfigs(deviceConfigsDataList);
-
+ WcsDiagnosisRequest request = aiUtils.makeAiRequest(1000, "瀵瑰綋鍓嶇郴缁熻繘琛屽贰妫�锛屽鏋滄湁寮傚父鎯呭喌灏辫繘琛岃缁嗙殑鍒嗘瀽锛屽鏋滄病鏈夊紓甯告儏鍐靛垯褰撴垚涓�娆℃鏌n\n");
wcsDiagnosisService.diagnoseStream(request, emitter);
} catch (Exception e) {
emitter.completeWithError(e);
@@ -187,61 +47,7 @@
SseEmitter emitter = new SseEmitter(0L);
new Thread(() -> {
try {
- WcsDiagnosisRequest request = new WcsDiagnosisRequest();
-
- List<String> logs = AiLogAppender.getRecentLogs(100);
- request.setLogs(logs);
-
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- request.setTasks(wrkMasts);
-
- List<DeviceRealTimeData> deviceRealTimeDataList = new ArrayList<>();
- List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
-
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp : basCrnps) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
- if (crnThread == null) {
- continue;
- }
-
- CrnProtocol protocol = crnThread.getStatus();
-
- for (StationObjModel stationObjModel : basCrnp.getInStationList$()) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> map = stationThread.getStatusMap();
- StationProtocol stationProtocol = map.get(stationObjModel.getStationId());
- if (stationProtocol == null) {
- continue;
- }
-
- DeviceRealTimeData stationData = new DeviceRealTimeData();
- stationData.setDeviceNo(stationObjModel.getDeviceNo());
- stationData.setDeviceType(String.valueOf(SlaveType.Devp));
- stationData.setDeviceData(stationProtocol);
- deviceRealTimeDataList.add(stationData);
- }
-
- DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
- deviceRealTimeData.setDeviceNo(basCrnp.getCrnNo());
- deviceRealTimeData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceRealTimeData.setDeviceData(protocol);
- deviceRealTimeDataList.add(deviceRealTimeData);
-
- DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
- deviceConfigsData.setDeviceNo(basCrnp.getCrnNo());
- deviceConfigsData.setDeviceType(String.valueOf(SlaveType.Crn));
- deviceConfigsData.setDeviceData(basCrnp);
- deviceConfigsDataList.add(deviceConfigsData);
- }
-
- request.setDeviceRealtimeData(deviceRealTimeDataList);
- request.setDeviceConfigs(deviceConfigsDataList);
-
+ WcsDiagnosisRequest request = aiUtils.makeAiRequest(100, null);
wcsDiagnosisService.askStream(request, prompt, chatId, reset, emitter);
} catch (Exception e) {
emitter.completeWithError(e);
@@ -263,18 +69,5 @@
@GetMapping("/chats/{chatId}/history")
public List<ChatCompletionRequest.Message> getChatHistory(@PathVariable("chatId") String chatId) {
return wcsDiagnosisService.getChatHistory(chatId);
- }
-
- /**
- * POST /api/ai/diagnose/wcs
- */
- @PostMapping("/wcs")
- public WcsDiagnosisResponse diagnose(@RequestBody WcsDiagnosisRequest request) {
- String analysis = wcsDiagnosisService.diagnose(request);
-
- WcsDiagnosisResponse resp = new WcsDiagnosisResponse();
- resp.setAnalysis(analysis);
- resp.setOriginalRequest(request);
- return resp;
}
}
--
Gitblit v1.9.1