From 8eb62ee0efe77e264cd48b3f1fd835e9b8430318 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 28 十月 2026 15:02:12 +0800
Subject: [PATCH] fix 设备数采
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java | 75 ++++++++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java | 26 ++++++
yudao-server/src/main/resources/application-chdl.yaml | 19 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 8 -
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 9 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java | 34 +++++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java | 27 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java | 9 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java | 2
11 files changed, 199 insertions(+), 15 deletions(-)
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index dbc337c..a19a1e0 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -94,6 +94,15 @@
ErrorCode ATTENDANCE_EXCEPTION_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_004_015, "鑰冨嫟寮傚父瀹℃壒娴佺▼涓嶅瓨鍦�");
ErrorCode ATTENDANCE_CLOCK_ALREADY_CLOCKED = new ErrorCode(1_030_004_016, "宸叉墦杩囧崱锛岃鍕块噸澶嶆墦鍗�");
ErrorCode ATTENDANCE_HOLIDAY_DATE_RANGE_INVALID = new ErrorCode(1_030_004_017, "缁撴潫鏃ユ湡銆恵}銆戜笉鑳芥棭浜庡紑濮嬫棩鏈熴�恵}銆戯紝鏃犳硶淇濆瓨銆傝閲嶆柊閫夋嫨姝g‘鐨勬棩鏈熷尯闂�");
+ /**
+ * 鐧诲綍璐﹀彿鏈粦瀹氬憳宸ユ。妗堛��
+ *
+ * 娉ㄦ剰锛氫笉瑕佸鐢ㄩ�氱敤鐨� EMPLOYEE_NOT_EXISTS锛�1_030_000_000锛夊幓浼犺嚜瀹氫箟鏂囨 鈥斺��
+ * 璇ラ敊璇爜鐨勬秷鎭槸銆屽憳宸ヤ笉瀛樺湪銆嶏紝涓嶅惈 {} 鍗犱綅绗︼紝ServiceExceptionUtil 浼氭墦
+ * 銆屽弬鏁拌繃澶氥�嶈鍛婂苟涓㈠純浼犲叆鐨勬枃妗堬紝鐢ㄦ埛鍙兘鐪嬪埌銆屽憳宸ヤ笉瀛樺湪銆嶏紝
+ * 鎷夸笉鍒般�岃鑱旂郴绠$悊鍛樼粦瀹氬憳宸ユ。妗堛�嶈繖鍙ュ彲鎿嶄綔鐨勬彁绀恒��
+ */
+ ErrorCode ATTENDANCE_EMPLOYEE_NOT_BOUND = new ErrorCode(1_030_004_018, "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸�");
ErrorCode ATTENDANCE_LOCATION_RULE_INVALID = new ErrorCode(1_030_004_050, "鑰冨嫟瑙勫垯鍦扮偣閰嶇疆涓嶅畬鏁达紝璇疯仈绯荤鐞嗗憳");
ErrorCode ATTENDANCE_LOCATION_REQUIRED = new ErrorCode(1_030_004_051, "璇峰紑鍚畾浣嶅苟鎻愪緵缁忕含搴︺�佺簿搴﹀拰鍧愭爣绯诲悗鎵撳崱");
ErrorCode ATTENDANCE_LOCATION_COORDINATE_INVALID = new ErrorCode(1_030_004_052, "鎵撳崱缁忕含搴﹁秴鍑烘湁鏁堣寖鍥�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 38b8d46..735cc69 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -46,7 +46,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.EMPLOYEE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.ATTENDANCE_EMPLOYEE_NOT_BOUND;
import static cn.iocoder.yudao.module.hrm.enums.LogRecordConstants.*;
@Tag(name = "绠$悊鍚庡彴 - HRM 鑰冨嫟璁板綍")
@@ -73,8 +73,7 @@
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ throw exception(ATTENDANCE_EMPLOYEE_NOT_BOUND);
}
HrmAttendanceClockResult result = attendanceRecordService.clockIn(
employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
@@ -90,8 +89,7 @@
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ throw exception(ATTENDANCE_EMPLOYEE_NOT_BOUND);
}
HrmAttendanceClockResult result = attendanceRecordService.clockOut(
employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index dc658dd..ec2c25a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -84,8 +84,7 @@
// 1. 鐧诲綍鐢ㄦ埛 -> 鍛樺伐妗f
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ throw exception(ATTENDANCE_EMPLOYEE_NOT_BOUND);
}
HrmAttendanceMyStatusRespVO respVO = new HrmAttendanceMyStatusRespVO();
respVO.setUserId(loginUserId);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
index 1bf8c69..13554aa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
@@ -52,5 +52,14 @@
private String workOrderCode;
@Schema(description = "鏈秷闄ゆ姤璀︽暟閲�", example = "1")
private Long activeAlarmCount;
+ /**
+ * 鏈�杩戜竴娆¢噰闆嗙殑瀹屾暣鏁版嵁 JSON銆�
+ *
+ * <p>璁惧缃戝叧涓婃姤鐨勬槸涓枃閿殑鐬椂鍊硷紙濡� {"璁$背":268.35,"绾块�熷害":0.0}锛夛紝
+ * 涓庢敞濉戞満鍗忚鐨� STS/OPM/OT 缁撴瀯涓嶅悓锛岀粨鏋勫寲瀛楁锛坰ts/opm/ot/temps锛変細鏄┖鐨勶紝
+ * 鍓嶇灞曠ず銆屽綋鍓嶆暟鎹�嶉渶瑕佽繖涓師濮� JSON銆�</p>
+ */
+ @Schema(description = "鏈�杩戦噰闆嗘暟鎹� JSON", example = "{\"璁$背\":268.35}")
+ private String dataJson;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
index 1480664..a86a59e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
@@ -17,6 +17,8 @@
TECH("tech", "宸ヨ壓鍙傛暟"),
OP_LOG("opLog", "鍙傛暟鍙樻洿鏃ュ織"),
ALARM("alarm", "鎶ヨ"),
+ CONNECT("connect", "璁惧涓婄嚎"),
+ DISCONNECT("disconnect", "璁惧绂荤嚎"),
UNKNOWN("unknown", "鏈煡绫诲瀷");
private final String type;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
index 2571fec..c4ef755 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
@@ -14,6 +14,15 @@
@Data
public class MesCollectProperties {
+ /**
+ * 鎶ユ枃鏍煎紡锛氭敞濉戞満 /YLCY/IMM 鍗忚锛堟姤鏂囧甫 topic 瀛楁锛屼富棰樻湯娈典负鎶ユ枃绫诲瀷锛�
+ */
+ public static final String FORMAT_YLCY = "ylcy";
+ /**
+ * 鎶ユ枃鏍煎紡锛氳澶囩綉鍏冲崗璁紙涓婚鍥哄畾 gateway/xxx锛屾姤鏂囬灞� key 涓鸿澶囧悕锛屽�间负灞炴�у瓧鍏革級
+ */
+ public static final String FORMAT_GATEWAY = "gateway";
+
private Mqtt mqtt = new Mqtt();
private Retention retention = new Retention();
@@ -35,9 +44,17 @@
*/
private String clientIdPrefix = "mes-collect";
/**
- * 涓婚鍓嶇紑锛屼緥濡� /YLCY/IMM
+ * 涓婚鍓嶇紑锛屼緥濡� /YLCY/IMM銆乬ateway
*/
private String topicPrefix = "/YLCY/IMM";
+ /**
+ * 鎶ユ枃鏍煎紡锛岃 {@link MesCollectProperties#FORMAT_YLCY}銆亄@link MesCollectProperties#FORMAT_GATEWAY}
+ */
+ private String format = FORMAT_YLCY;
+ /**
+ * 鏄惧紡鎸囧畾璁㈤槄涓婚锛屽涓敤閫楀彿鍒嗛殧锛涗负绌烘椂鎸� format + topicPrefix 鑷姩鎺ㄥ
+ */
+ private String topics;
private Integer qos = 0;
private Integer keepAlive = 65;
private Integer connectionTimeout = 10;
@@ -46,6 +63,13 @@
*/
private String alarmTopicSuffix = "wm";
+ /**
+ * 鏄惁涓鸿澶囩綉鍏虫牸寮忔姤鏂�
+ */
+ public boolean isGatewayFormat() {
+ return FORMAT_GATEWAY.equalsIgnoreCase(format == null ? "" : format.trim());
+ }
+
}
@Data
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
index 6e20934..6cb6818 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
@@ -12,6 +12,9 @@
import java.net.InetAddress;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -114,15 +117,34 @@
private void subscribe() {
MesCollectProperties.Mqtt mqtt = properties.getMqtt();
- String topic = normalizeTopicPrefix(mqtt.getTopicPrefix()) + "+/+";
- try {
- client.subscribe(topic, mqtt.getQos());
- log.info("[subscribe][鏁伴噰 MQTT 璁㈤槄鎴愬姛锛歿}]", topic);
- } catch (Exception e) {
- log.error("[subscribe][鏁伴噰 MQTT 璁㈤槄澶辫触锛歿}]", topic, e);
+ for (String topic : resolveSubscribeTopics(mqtt)) {
+ try {
+ client.subscribe(topic, mqtt.getQos());
+ log.info("[subscribe][鏁伴噰 MQTT 璁㈤槄鎴愬姛锛歿}]", topic);
+ } catch (Exception e) {
+ log.error("[subscribe][鏁伴噰 MQTT 璁㈤槄澶辫触锛歿}]", topic, e);
+ }
}
}
+ /**
+ * 瑙f瀽闇�瑕佽闃呯殑涓婚銆�
+ *
+ * <p>鏄惧紡閰嶇疆 topics 浼樺厛锛涚綉鍏虫牸寮忚闃呮暣涓墠缂�锛坓ateway/#锛夛紝
+ * 鍥犱负缃戝叧闄� attributes 澶栬繕浼氬彂 connect / disconnect锛屽悗缁篃鍙兘鏂板涓婚锛�
+ * 鍏朵綑鏍煎紡娌跨敤 /YLCY/IMM/+/+ 涓ょ骇閫氶厤銆�</p>
+ */
+ private List<String> resolveSubscribeTopics(MesCollectProperties.Mqtt mqtt) {
+ if (StrUtil.isNotBlank(mqtt.getTopics())) {
+ return Arrays.stream(mqtt.getTopics().split(","))
+ .map(String::trim)
+ .filter(StrUtil::isNotBlank)
+ .toList();
+ }
+ String prefix = normalizeTopicPrefix(mqtt.getTopicPrefix());
+ return Collections.singletonList(mqtt.isGatewayFormat() ? prefix + "#" : prefix + "+/+");
+ }
+
private String normalizeTopicPrefix(String prefix) {
if (StrUtil.isBlank(prefix)) {
return "";
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
index 931b38a..2215a08 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
@@ -201,7 +201,32 @@
return parts.length >= 2 ? parts[parts.length - 2] : null;
}
- private String extractTopicSuffix(String mqttTopic) {
+ /**
+ * 缃戝叧鏍煎紡鎶ユ枃鎷嗗寘锛氭姤鏂囬灞� key 鏄澶囧悕锛寁alue 鏄璁惧鐨勫睘鎬у瓧鍏搞��
+ *
+ * <p>渚嬪 {"630妗嗙粸鏈�2":{"璁$背":268.3499}} 鎷嗘垚 {630妗嗙粸鏈�2 -> {"璁$背":268.3499}}锛�
+ * 杩炴帴浜嬩欢 {"device":"澶ф媺"} 杩欑被鎵佸钩鎶ユ枃娌℃湁宓屽瀵硅薄锛岃繑鍥炵┖ Map 鐢辫皟鐢ㄦ柟鍙﹁澶勭悊銆�</p>
+ */
+ public Map<String, JsonNode> splitGatewayDevices(JsonNode root) {
+ Map<String, JsonNode> devices = new LinkedHashMap<>();
+ if (root == null || !root.isObject()) {
+ return devices;
+ }
+ root.properties().forEach(entry -> {
+ String deviceCode = StrUtil.trim(entry.getKey());
+ JsonNode data = entry.getValue();
+ if (StrUtil.isBlank(deviceCode) || data == null || !data.isObject()) {
+ return;
+ }
+ devices.put(deviceCode, data);
+ });
+ return devices;
+ }
+
+ /**
+ * 鍙栦富棰樻湯娈典綔涓烘姤鏂囩被鍨嬶紝濡� gateway/attributes -> attributes銆乬ateway/disconnect -> disconnect
+ */
+ public String extractTopicSuffix(String mqttTopic) {
if (StrUtil.isBlank(mqttTopic)) {
return null;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
index 5b1a468..5d58a8e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
+import java.util.Map;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -26,6 +27,11 @@
@Component
@Slf4j
public class MesCollectMessageDispatcher {
+
+ /**
+ * 缃戝叧鏍煎紡閲屾壙杞借澶囧睘鎬у揩鐓х殑涓婚鏈
+ */
+ private static final String ATTR_TOPIC_SUFFIX = "attributes";
@Resource
private MesCollectProperties properties;
@@ -61,6 +67,11 @@
}
private void process(String topic, String payload) {
+ // 缃戝叧鏍煎紡鎶ユ枃缁撴瀯瀹屽叏涓嶅悓锛堜富棰樺浐瀹氥�佽澶囦互鎶ユ枃棣栧眰 key 鍖哄垎锛夛紝鍗曠嫭澶勭悊
+ if (properties.getMqtt().isGatewayFormat()) {
+ processGateway(topic, payload);
+ return;
+ }
JsonNode root;
try {
root = parser.parsePayload(payload);
@@ -111,6 +122,70 @@
}
}
+ /**
+ * 缃戝叧鏍煎紡鎶ユ枃澶勭悊銆�
+ *
+ * <p>attributes锛氭姤鏂囬灞� key 鏄澶囧悕銆乿alue 鏄睘鎬у瓧鍏革紝鎸夎澶囬�愬彴钀藉疄鏃舵暟鎹紱
+ * connect / disconnect锛氳繛鎺ヤ簨浠讹紝鍙暀鐥曚笉钀藉疄鏃舵暟鎹紝渚夸簬鎺掓煡璁惧绂荤嚎銆�</p>
+ */
+ private void processGateway(String topic, String payload) {
+ JsonNode root;
+ try {
+ root = parser.parsePayload(payload);
+ } catch (Exception e) {
+ log.warn("[processGateway][涓婚({}) 鎶ユ枃涓嶆槸鍚堟硶 JSON锛歿}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.markRawMessageFailed(
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN,
+ LocalDateTime.now(), payload),
+ "鎶ユ枃涓嶆槸鍚堟硶 JSON锛�" + e.getMessage());
+ return;
+ }
+
+ // 杩炴帴浜嬩欢锛歿"device":"澶ф媺"}锛屾病鏈夊睘鎬у瓧鍏�
+ if (!ATTR_TOPIC_SUFFIX.equalsIgnoreCase(parser.extractTopicSuffix(topic))) {
+ String deviceCode = StrUtil.trim(parser.getText(root, "device"));
+ MesDvMachineryDO machinery = StrUtil.isBlank(deviceCode) ? null
+ : machineryMapper.selectByCollectDeviceCode(deviceCode);
+ dataService.saveRawMessage(deviceCode, machinery == null ? null : machinery.getId(), topic,
+ MesCollectMsgTypeEnum.getByType(parser.extractTopicSuffix(topic)),
+ LocalDateTime.now(), payload);
+ return;
+ }
+
+ Map<String, JsonNode> devices = parser.splitGatewayDevices(root);
+ if (devices.isEmpty()) {
+ log.debug("[processGateway][涓婚({}) 鎶ユ枃閲屾病鏈夎澶囧睘鎬э細{}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN, LocalDateTime.now(), payload);
+ return;
+ }
+ // 缃戝叧鎶ユ枃涓嶅甫鏃堕棿鎴筹紝缁熶竴鎸夋帴鏀舵椂闂磋惤搴�
+ LocalDateTime eventTime = parser.parseEventTime(root);
+ devices.forEach((deviceCode, data) -> {
+ MesDvMachineryDO machinery = machineryMapper.selectByCollectDeviceCode(deviceCode);
+ if (machinery == null) {
+ warnUnboundDevice(deviceCode);
+ }
+ Long machineryId = machinery == null ? null : machinery.getId();
+ Long taskId = null;
+ Long workOrderId = null;
+ if (machinery != null && machinery.getWorkstationId() != null) {
+ MesProTaskDO task = taskResolver.resolve(machinery.getWorkstationId());
+ if (task != null) {
+ taskId = task.getId();
+ workOrderId = task.getWorkOrderId();
+ }
+ }
+ Long rawId = dataService.saveRawMessage(deviceCode, machineryId, topic,
+ MesCollectMsgTypeEnum.REALTIME, eventTime, payload);
+ try {
+ dataService.saveRealtime(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ } catch (Exception e) {
+ dataService.markRawMessageFailed(rawId, e.getMessage());
+ log.error("[processGateway][涓婚({}) 璁惧({}) 澶勭悊澶辫触]", topic, deviceCode, e);
+ }
+ });
+ }
+
private void warnUnboundDevice(String deviceCode) {
long now = System.currentTimeMillis();
Long last = unboundWarnCache.get(deviceCode);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
index 0fc24e2..a99818e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
@@ -92,6 +92,8 @@
vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(realtime.getOpm()));
vo.setOt(realtime.getOt());
vo.setTemps(realtime.getTemps());
+ // 缃戝叧鏍煎紡鎶ユ枃鐨勭粨鏋勫寲瀛楁涓虹┖锛屽墠绔�屽綋鍓嶆暟鎹�嶅垪鐩存帴灞曠ず鍘熷 JSON
+ vo.setDataJson(realtime.getDataJson());
} else {
vo.setOnline(false);
}
diff --git a/yudao-server/src/main/resources/application-chdl.yaml b/yudao-server/src/main/resources/application-chdl.yaml
index b1c92fe..7845d11 100644
--- a/yudao-server/src/main/resources/application-chdl.yaml
+++ b/yudao-server/src/main/resources/application-chdl.yaml
@@ -235,3 +235,22 @@
username: root # 澶囦唤璐﹀彿锛岀暀绌轰娇鐢ㄦ暟鎹簮璐﹀彿
password: 'changhui@123456..' # 澶囦唤瀵嗙爜锛岀暀绌轰娇鐢ㄦ暟鎹簮瀵嗙爜
command: # mysqldump 鍛戒护锛岀暀绌鸿嚜鍔ㄦ娴嬮儴缃茬幆澧冿紙鏈満 mysqldump 鎴� Docker MySQL 瀹瑰櫒锛夛紱鍙墜鍔ㄦ寚瀹氾紝濡傦細docker exec mysql8 mysqldump
+
+ mes:
+ collect:
+ mqtt: # 闀胯緣绾跨紗璁惧缃戝叧鏁伴噰锛氫富棰樺浐瀹� gateway/attributes锛屾姤鏂囬灞� key 涓鸿澶囧悕锛屽�间负灞炴�у瓧鍏革紙濡� {"630妗嗙粸鏈�2":{"璁$背":268.3499}}锛�
+ enabled: true # 鍏虫帀鍚庝笉鍐嶈繛鎺� Broker锛屼粎淇濈暀鍘嗗彶鏁版嵁鏌ヨ
+ url: tcp://101.245.92.159:1888
+ username: admin
+ password: admin
+ client-id-prefix: mes-collect-chdl
+ format: gateway # 鎶ユ枃鏍煎紡锛歽lcy=娉ㄥ鏈� /YLCY/IMM 鍗忚锛沢ateway=璁惧缃戝叧鍗忚锛堥灞� key 涓鸿澶囧悕锛屽�间负灞炴�у瓧鍏革級
+ topic-prefix: gateway # 缃戝叧涓婚鍓嶇紑锛岀綉鍏虫牸寮忎笅璁㈤槄 gateway/#
+ qos: 0
+ keep-alive: 65
+ connection-timeout: 10
+ alarm-topic-suffix: wm # 鎶ユ枃 topic 瀛楁鎴栦富棰樻湯娈靛懡涓鍚庣紑鍗虫寜鎶ヨ澶勭悊
+ retention:
+ raw-days: 7 # 鍘熷鎶ユ枃淇濈暀澶╂暟
+ realtime-days: 30 # 瀹炴椂鐘舵�佸巻鍙蹭繚鐣欏ぉ鏁�
+ batch-size: 50000 # 鍗曟娓呯悊鏉℃暟
--
Gitblit v1.9.3