From 7392f08349f8df8c19422f164838d229e504cb06 Mon Sep 17 00:00:00 2001
From: 上海郢昱 <15922366+miu-haiqing@user.noreply.gitee.com>
Date: 星期二, 15 九月 2026 09:02:44 +0800
Subject: [PATCH] 日志路径名称修改
---
src/main/java/com/hwtd/mes/collect/controller/DataCollectionController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/hwtd/mes/collect/controller/DataCollectionController.java b/src/main/java/com/hwtd/mes/collect/controller/DataCollectionController.java
new file mode 100644
index 0000000..4b569fd
--- /dev/null
+++ b/src/main/java/com/hwtd/mes/collect/controller/DataCollectionController.java
@@ -0,0 +1,79 @@
+package com.hwtd.mes.collect.controller;
+
+import com.hwtd.mes.collect.dto.DatabaseDTO;
+import com.hwtd.mes.collect.dto.SerialPortDTO;
+import com.hwtd.mes.collect.handler.SerialPortListener;
+import com.hwtd.mes.collect.service.DataCollectionService;
+import com.hwtd.mes.collect.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/collection")
+public class DataCollectionController {
+
+ @Autowired
+ private DataCollectionService dataCollectionService;
+
+ @Autowired
+ private SerialPortListener serialPortListener;
+
+ /**
+ * 鎵嬪姩寮�鍚覆鍙ｇ洃鍚紝骞惰繑鍥炲綋鍓嶆帴鏀跺埌鐨勬暟鎹垪琛紙闃熷垪寮忕紦瀛橈紝鏈�澶� maxCount 鏉★紝娌℃湁鏁版嵁鏃惰繑鍥炵┖闆嗗悎锛夈��
+ * <p>
+ * 涓插彛鍙傛暟閫氳繃璇锋眰鍙傛暟浼犲叆锛堜笉浼犵殑瀛楁浣跨敤榛樿鍊硷紝listenName 蹇呬紶锛夛細
+ * listenName銆乥audRate銆乨ataBits銆乻topBits銆乸arity銆乫lowControl銆乺eadTimeout銆乪ndMark銆乵axCount銆�
+ * 骞傜瓑鎺ュ彛锛氬弬鏁颁竴鑷存椂鐩存帴澶嶇敤宸叉墦寮�鐨勪覆鍙ｃ�佷笉浼氶噸澶嶆墦寮�锛屽弬鏁板彉鍖栨椂鎸夋柊鍙傛暟閲嶆柊鎵撳紑锛�
+ * 澶氱嚎绋嬪苟鍙戣皟鐢ㄥ悓鏍峰彧浼氭墦寮�涓�娆°�傚弬鏁伴潪娉曟椂鐢� GlobalExceptionHandler 杩斿洖鍏蜂綋鍘熷洜銆�
+ */
+ @GetMapping("/openSerialPort")
+ public Result<?> openSerialPort(SerialPortDTO serialPortDTO) {
+ if (!serialPortListener.startListening(serialPortDTO)) {
+ String listenName = serialPortDTO == null || serialPortDTO.getSerialPortName() == null
+ ? "" : serialPortDTO.getSerialPortName();
+ return Result.failed("涓插彛 " + listenName + " 鐩戝惉寮�鍚け璐ワ紝璇锋鏌ヤ覆鍙ｆ槸鍚﹀瓨鍦ㄣ�佹槸鍚﹁鍏朵粬绋嬪簭鍗犵敤锛�");
+ }
+ return Result.ok(serialPortListener.drainData());
+ }
+
+ /**
+ * 鎵嬪姩鍏抽棴涓插彛鐩戝惉銆�
+ * 骞傜瓑鎺ュ彛锛氭湭寮�鍚椂璋冪敤涔熶細姝ｅ父杩斿洖锛屼笉浼氭姤閿欍��
+ */
+ @GetMapping("/closeSerialPort")
+ public Result<?> closeSerialPort() {
+ if (serialPortListener.closeListening()) {
+ return Result.ok("涓插彛 " + serialPortListener.getListenName() + " 鐩戝惉宸插叧闂�");
+ }
+ return Result.failed("涓插彛 " + serialPortListener.getListenName() + " 鐩戝惉鍏抽棴澶辫触锛岃妫�鏌ヤ覆鍙ｇ姸鎬侊紒");
+ }
+
+ /**
+ * 鏌ヨ涓插彛鐩戝惉鐘舵�侊紝渚夸簬鍓嶇鍒ゆ柇鏄惁闇�瑕佽皟鐢ㄥ紑鍚� / 鍏抽棴鎺ュ彛
+ */
+ @GetMapping("/serialPortStatus")
+ public Result<?> serialPortStatus() {
+ Map<String, Object> status = new LinkedHashMap<>();
+ status.put("listenName", serialPortListener.getListenName());
+ status.put("listening", serialPortListener.isListening());
+ status.put("portOpen", serialPortListener.isPortOpen());
+ status.put("dataSize", serialPortListener.dataSize());
+ return Result.ok(status);
+ }
+
+ @GetMapping("/getAccessData")
+ public Result<?> getAccessData(DatabaseDTO databaseDTO) {
+ return Result.ok(dataCollectionService.getAccessData(databaseDTO));
+ }
+
+ @GetMapping("/getPostgreSqlData")
+ public Result<?> getPostgreSqlData(DatabaseDTO databaseDTO) {
+ return Result.ok(dataCollectionService.getPostgreSqlData(databaseDTO));
+ }
+
+}
--
Gitblit v1.9.3