From 4eb9a3a99e21522ede60dcb8bee5b5856b515dc7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 20 十月 2026 14:00:41 +0800
Subject: [PATCH] feat(mes): 添加MES数采功能支持MQTT设备数据采集
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java | 42 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java | 188 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java | 39 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java | 103 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java | 176 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryPageReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java | 39 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java | 56 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java | 21
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java | 58 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java | 39 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java | 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java | 202 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java | 45 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java | 69 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java | 27
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java | 14
yudao-server/src/main/resources/application-test.yaml | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java | 212 +++++
yudao-server/src/main/resources/application-local.yaml | 21
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java | 56 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java | 129 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java | 45 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java | 48 +
yudao-module-mes/pom.xml | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java | 8
yudao-server/src/main/resources/application-kyzn.yaml | 17
50 files changed, 2,323 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index 8cf5b36..3234b8e 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -103,6 +103,12 @@
<artifactId>yudao-spring-boot-starter-excel</artifactId>
</dependency>
+ <!-- 鏁伴噰 MQTT 瀹㈡埛绔� -->
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+ </dependency>
+
<!-- Test 娴嬭瘯鐩稿叧 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java
new file mode 100644
index 0000000..8e0edd1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java
@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.*;
+import cn.iocoder.yudao.module.mes.service.collect.MesCollectQueryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 鏁伴噰鐩戞帶")
+@RestController
+@RequestMapping("/mes/collect")
+@Validated
+public class MesCollectController {
+
+ @Resource
+ private MesCollectQueryService queryService;
+
+ @GetMapping("/device/list")
+ @Operation(summary = "鑾峰彇鏁伴噰璁惧鐘舵�佸垪琛�")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<List<MesCollectDeviceRespVO>> getDeviceList() {
+ return success(queryService.getDeviceList());
+ }
+
+ @GetMapping("/realtime/get")
+ @Operation(summary = "鑾峰彇璁惧鏈�鏂板疄鏃剁姸鎬�")
+ @Parameter(name = "deviceCode", description = "鏁伴噰璁惧缂栧彿", required = true, example = "C01")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectRealtimeRespVO> getRealtime(@RequestParam("deviceCode") String deviceCode) {
+ return success(queryService.getRealtime(deviceCode));
+ }
+
+ @GetMapping("/realtime/history-page")
+ @Operation(summary = "鍒嗛〉鏌ヨ瀹炴椂鐘舵�佸巻鍙�")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectRealtimeRespVO>> getRealtimeHistoryPage(
+ @Valid MesCollectRealtimeHistoryPageReqVO reqVO) {
+ return success(queryService.getRealtimeHistoryPage(reqVO));
+ }
+
+ @GetMapping("/cycle/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鍛ㄦ湡杩囩▼鏁版嵁")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectCycleRespVO>> getCyclePage(@Valid MesCollectCyclePageReqVO reqVO) {
+ return success(queryService.getCyclePage(reqVO));
+ }
+
+ @GetMapping("/cycle/get")
+ @Operation(summary = "鑾峰彇鍛ㄦ湡杩囩▼鏁版嵁鏄庣粏")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectCycleRespVO> getCycle(@RequestParam("id") Long id) {
+ return success(queryService.getCycle(id));
+ }
+
+ @GetMapping("/tech/get")
+ @Operation(summary = "鑾峰彇璁惧鏈�鏂板伐鑹哄弬鏁板揩鐓�")
+ @Parameter(name = "deviceCode", description = "鏁伴噰璁惧缂栧彿", required = true, example = "C01")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectTechRespVO> getTech(@RequestParam("deviceCode") String deviceCode) {
+ return success(queryService.getTech(deviceCode));
+ }
+
+ @GetMapping("/operate-log/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鍙傛暟鍙樻洿鏃ュ織")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectOperateLogRespVO>> getOperateLogPage(
+ @Valid MesCollectOperateLogPageReqVO reqVO) {
+ return success(queryService.getOperateLogPage(reqVO));
+ }
+
+ @GetMapping("/alarm/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎶ヨ璁板綍")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectAlarmRespVO>> getAlarmPage(@Valid MesCollectAlarmPageReqVO reqVO) {
+ return success(queryService.getAlarmPage(reqVO));
+ }
+
+ @PutMapping("/alarm/ack")
+ @Operation(summary = "浜哄伐纭娑堥櫎鎶ヨ")
+ @Parameter(name = "id", description = "鎶ヨ璁板綍缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('mes:collect-alarm:ack')")
+ public CommonResult<Boolean> ackAlarm(@RequestParam("id") Long id) {
+ queryService.ackAlarm(id);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java
new file mode 100644
index 0000000..41b5c70
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鎶ヨ鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectAlarmPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "鐘舵�侊細0鏈秷闄� 1宸叉秷闄�", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎶ヨ鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] wmTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java
new file mode 100644
index 0000000..22bc693
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鎶ヨ Response VO")
+@Data
+public class MesCollectAlarmRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鎶ヨ鏍囪瘑锛�2浜х敓 0娑堝け", example = "2")
+ private Integer wmId;
+ @Schema(description = "鎶ヨ鍐呭", example = "瀹夊叏闂ㄦ湭鍏�")
+ private String wmMsg;
+ @Schema(description = "鎶ヨ鏃堕棿")
+ private LocalDateTime wmTime;
+ @Schema(description = "鐘舵�侊細0鏈秷闄� 1宸叉秷闄�", example = "0")
+ private Integer status;
+ @Schema(description = "鐘舵�佸悕绉�", example = "鏈秷闄�")
+ private String statusName;
+ @Schema(description = "娑堥櫎鏃堕棿")
+ private LocalDateTime clearTime;
+ @Schema(description = "鎶ユ枃閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java
new file mode 100644
index 0000000..da6ad44
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍛ㄦ湡杩囩▼鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectCyclePageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java
new file mode 100644
index 0000000..9a9b5bb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍛ㄦ湡杩囩▼鏁版嵁 Response VO")
+@Data
+public class MesCollectCycleRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鍛ㄦ湡搴忓彿锛圕YCN锛�", example = "100")
+ private Long cycleNo;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "鍛ㄦ湡鏃堕棿锛圗CYCT锛�")
+ private BigDecimal ecyct;
+ @Schema(description = "灏勫嚭璧风偣锛圗ISS锛�")
+ private BigDecimal eiss;
+ @Schema(description = "鏈�澶у皠閫燂紙EIVM锛�")
+ private BigDecimal eivm;
+ @Schema(description = "鏈�澶у皠鍘嬶紙EIPM锛�")
+ private BigDecimal eipm;
+ @Schema(description = "杞繚鍘嬫椂闂达紙ESIPT锛�")
+ private BigDecimal esipt;
+ @Schema(description = "杞繚鍘嬪帇鍔涳紙ESIPP锛�")
+ private BigDecimal esipp;
+ @Schema(description = "杞繚鍘嬩綅缃紙ESIPS锛�")
+ private BigDecimal esips;
+ @Schema(description = "灏勫嚭鏃堕棿锛圗IPT锛�")
+ private BigDecimal eipt;
+ @Schema(description = "灏勫嚭缁堢偣浣嶇疆锛圗IPSE锛�")
+ private BigDecimal eipse;
+ @Schema(description = "鍌ㄦ枡鏃堕棿锛圗PLST锛�")
+ private BigDecimal eplst;
+ @Schema(description = "鍌ㄦ枡缁堢偣锛圗PLSSE锛�")
+ private BigDecimal eplsse;
+ @Schema(description = "鏈�澶у偍鏂欏帇鍔涳紙EPLSPM锛�")
+ private BigDecimal eplspm;
+ @Schema(description = "鐢熶骇娓╁害 JSON锛圗T1..ETn锛�")
+ private String etTemps;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
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
new file mode 100644
index 0000000..1bf8c69
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰璁惧鐘舵�� Response VO")
+@Data
+public class MesCollectDeviceRespVO {
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "璁惧缂栫爜", example = "MC_20260818001")
+ private String machineryCode;
+ @Schema(description = "璁惧鍚嶇О", example = "娉ㄥ鏈� 1 鍙�")
+ private String machineryName;
+ @Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
+ private Long workstationId;
+ @Schema(description = "宸ヤ綔绔欏悕绉�", example = "娉ㄥ宸ヤ綔绔�")
+ private String workstationName;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String collectDeviceCode;
+ @Schema(description = "鏄惁鍚敤鏁伴噰", example = "true")
+ private Boolean collectEnabled;
+ @Schema(description = "鏈�杩戦噰闆嗘椂闂�")
+ private LocalDateTime lastCollectTime;
+ @Schema(description = "鏄惁鍦ㄧ嚎锛�5 鍒嗛挓鍐呮湁鏁版嵁锛�", example = "true")
+ private Boolean online;
+ @Schema(description = "杩愯鐘舵�侊細1寰呮満 2鐢熶骇", example = "2")
+ private Integer sts;
+ @Schema(description = "杩愯鐘舵�佸悕绉�", example = "鐢熶骇")
+ private String stsName;
+ @Schema(description = "杩愯妯″紡锛�0鎵嬪姩 1鍗婅嚜鍔� 2鐢电溂鑷姩 3鏃堕棿鑷姩 4璋冩ā浣跨敤", example = "2")
+ private Integer opm;
+ @Schema(description = "杩愯妯″紡鍚嶇О", example = "鐢电溂鑷姩")
+ private String opmName;
+ @Schema(description = "娌规俯", example = "26.5")
+ private BigDecimal ot;
+ @Schema(description = "鍚勬娓╁害 JSON")
+ private String temps;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇浠诲姟缂栫爜", example = "PT202610200001")
+ private String taskCode;
+ @Schema(description = "鐢熶骇浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ private String taskName;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栫爜", example = "PO202610200001")
+ private String workOrderCode;
+ @Schema(description = "鏈秷闄ゆ姤璀︽暟閲�", example = "1")
+ private Long activeAlarmCount;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java
new file mode 100644
index 0000000..1f84d39
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍙傛暟鍙樻洿鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectOperateLogPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "鍙橀噺缂栫爜", example = "SIPS")
+ private String varId;
+
+ @Schema(description = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] modifyTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java
new file mode 100644
index 0000000..88598b4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍙傛暟鍙樻洿 Response VO")
+@Data
+public class MesCollectOperateLogRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鍙橀噺缂栫爜", example = "SIPS")
+ private String varId;
+ @Schema(description = "淇敼鍓嶇殑鍊�", example = "37")
+ private String oldValue;
+ @Schema(description = "淇敼鍚庣殑鍊�", example = "37.5")
+ private String newValue;
+ @Schema(description = "鍙傛暟淇敼鏃堕棿")
+ private LocalDateTime modifyTime;
+ @Schema(description = "鎶ユ枃閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java
new file mode 100644
index 0000000..c5a5cee
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰瀹炴椂鍘嗗彶鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectRealtimeHistoryPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java
new file mode 100644
index 0000000..7097653
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰瀹炴椂鏁版嵁 Response VO")
+@Data
+public class MesCollectRealtimeRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "杩愯鐘舵�侊細1寰呮満 2鐢熶骇", example = "2")
+ private Integer sts;
+ @Schema(description = "杩愯鐘舵�佸悕绉�", example = "鐢熶骇")
+ private String stsName;
+ @Schema(description = "杩愯妯″紡锛�0鎵嬪姩 1鍗婅嚜鍔� 2鐢电溂鑷姩 3鏃堕棿鑷姩 4璋冩ā浣跨敤", example = "2")
+ private Integer opm;
+ @Schema(description = "杩愯妯″紡鍚嶇О", example = "鐢电溂鑷姩")
+ private String opmName;
+ @Schema(description = "闄勫姞鐘舵��", example = "0")
+ private Integer asts;
+ @Schema(description = "娌规俯", example = "26.5")
+ private BigDecimal ot;
+ @Schema(description = "鍚勬娓╁害 JSON")
+ private String temps;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java
new file mode 100644
index 0000000..ce043c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰宸ヨ壓鍙傛暟 Response VO")
+@Data
+public class MesCollectTechRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "宸ヨ壓鍙傛暟瀹屾暣蹇収 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
index fe5729d..c527381 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
@@ -52,4 +52,7 @@
@ExcelProperty("宸ヤ綔绔欑紪鐮�")
private String workstationCode;
+ @ExcelProperty("鏁伴噰璁惧缂栧彿")
+ private String collectDeviceCode;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryPageReqVO.java
index 2eea5ba..116e7af 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryPageReqVO.java
@@ -38,4 +38,10 @@
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "300")
private Long workstationId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿锛圡QTT devId锛�", example = "C01")
+ private String collectDeviceCode;
+
+ @Schema(description = "鏄惁鍚敤鏁伴噰", example = "true")
+ private Boolean collectEnabled;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
index 9834bbe..a08b7d6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
@@ -81,6 +81,14 @@
@ExcelProperty("宸ヤ綔绔�")
private String workstationName;
+ @Schema(description = "鏁伴噰璁惧缂栧彿锛圡QTT devId锛�", example = "C01")
+ @ExcelProperty("鏁伴噰璁惧缂栧彿")
+ private String collectDeviceCode;
+
+ @Schema(description = "鏄惁鍚敤鏁伴噰", example = "true")
+ @ExcelProperty("鏄惁鍚敤鏁伴噰")
+ private Boolean collectEnabled;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
index c9fecbc..295fff9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
@@ -58,4 +58,10 @@
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "300")
private Long workstationId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿锛圡QTT devId锛�", example = "C01")
+ private String collectDeviceCode;
+
+ @Schema(description = "鏄惁鍚敤鏁伴噰", example = "true")
+ private Boolean collectEnabled;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java
new file mode 100644
index 0000000..8bbcd57
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鎶ヨ璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_alarm")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectAlarmDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private Integer wmId;
+ private String wmMsg;
+ private LocalDateTime wmTime;
+ private Integer status;
+ private LocalDateTime clearTime;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java
new file mode 100644
index 0000000..a7e218f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍛ㄦ湡杩囩▼鏁版嵁 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_cycle")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectCycleDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private Long cycleNo;
+ private LocalDateTime collectTime;
+ private BigDecimal ecyct;
+ private BigDecimal eiss;
+ private BigDecimal eivm;
+ private BigDecimal eipm;
+ private BigDecimal esipt;
+ private BigDecimal esipp;
+ private BigDecimal esips;
+ private BigDecimal eipt;
+ private BigDecimal eipse;
+ private BigDecimal eplst;
+ private BigDecimal eplsse;
+ private BigDecimal eplspm;
+ private String etTemps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java
new file mode 100644
index 0000000..ab7d1dc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍘熷鎶ユ枃 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_message")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectMessageDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private String mqttTopic;
+ private String msgType;
+ private LocalDateTime eventTime;
+ private String rawPayload;
+ private Integer processStatus;
+ private String errorMsg;
+ private LocalDateTime receiveTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java
new file mode 100644
index 0000000..1b2a21f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍙傛暟鍙樻洿鏃ュ織 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_operate_log")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectOperateLogDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private String varId;
+ private String oldValue;
+ private String newValue;
+ private LocalDateTime modifyTime;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java
new file mode 100644
index 0000000..f663f9e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-璁惧瀹炴椂鐘舵�� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_realtime")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectRealtimeDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private Integer sts;
+ private Integer opm;
+ private Integer asts;
+ private BigDecimal ot;
+ private String temps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java
new file mode 100644
index 0000000..301e2c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-瀹炴椂鐘舵�佸巻鍙� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_realtime_history")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectRealtimeHistoryDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private Integer sts;
+ private Integer opm;
+ private Integer asts;
+ private BigDecimal ot;
+ private String temps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java
new file mode 100644
index 0000000..59ba7bb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-宸ヨ壓鍙傛暟蹇収 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_tech")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectTechDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
index d533b23..cc7652c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
@@ -90,5 +90,13 @@
* 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO#getId()}
*/
private Long workstationId;
+ /**
+ * 鏁伴噰璁惧缂栧彿锛圡QTT devId锛屽 C01锛�
+ */
+ private String collectDeviceCode;
+ /**
+ * 鏄惁鍚敤鏁伴噰
+ */
+ private Boolean collectEnabled;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java
new file mode 100644
index 0000000..8de8008
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectAlarmPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectAlarmDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鎶ヨ璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectAlarmMapper extends BaseMapperX<MesCollectAlarmDO> {
+
+ default PageResult<MesCollectAlarmDO> selectPage(MesCollectAlarmPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectAlarmDO>()
+ .eqIfPresent(MesCollectAlarmDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectAlarmDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectAlarmDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesCollectAlarmDO::getStatus, reqVO.getStatus())
+ .betweenIfPresent(MesCollectAlarmDO::getWmTime, reqVO.getWmTime())
+ .orderByDesc(MesCollectAlarmDO::getWmTime));
+ }
+
+ default Long selectActiveCountByDeviceCode(String deviceCode) {
+ return selectCount(new LambdaQueryWrapperX<MesCollectAlarmDO>()
+ .eq(MesCollectAlarmDO::getDeviceCode, deviceCode)
+ .eq(MesCollectAlarmDO::getStatus, 0));
+ }
+
+ default int clearActiveByDeviceCode(String deviceCode, LocalDateTime clearTime) {
+ return update(null, new LambdaUpdateWrapper<MesCollectAlarmDO>()
+ .eq(MesCollectAlarmDO::getDeviceCode, deviceCode)
+ .eq(MesCollectAlarmDO::getStatus, 0)
+ .set(MesCollectAlarmDO::getStatus, 1)
+ .set(MesCollectAlarmDO::getClearTime, clearTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java
new file mode 100644
index 0000000..bc05297
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectCyclePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectCycleDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-鍛ㄦ湡杩囩▼鏁版嵁 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectCycleMapper extends BaseMapperX<MesCollectCycleDO> {
+
+ default PageResult<MesCollectCycleDO> selectPage(MesCollectCyclePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectCycleDO>()
+ .eqIfPresent(MesCollectCycleDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectCycleDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectCycleDO::getTaskId, reqVO.getTaskId())
+ .eqIfPresent(MesCollectCycleDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .betweenIfPresent(MesCollectCycleDO::getCollectTime, reqVO.getCollectTime())
+ .orderByDesc(MesCollectCycleDO::getCollectTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java
new file mode 100644
index 0000000..714b3ea
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectMessageDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍘熷鎶ユ枃 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectMessageMapper extends BaseMapperX<MesCollectMessageDO> {
+
+ default int deleteBefore(LocalDateTime before, int limit) {
+ return delete(new LambdaQueryWrapperX<MesCollectMessageDO>()
+ .lt(MesCollectMessageDO::getReceiveTime, before)
+ .last("LIMIT " + limit));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java
new file mode 100644
index 0000000..81073c0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectOperateLogPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectOperateLogDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-鍙傛暟鍙樻洿鏃ュ織 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectOperateLogMapper extends BaseMapperX<MesCollectOperateLogDO> {
+
+ default PageResult<MesCollectOperateLogDO> selectPage(MesCollectOperateLogPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectOperateLogDO>()
+ .eqIfPresent(MesCollectOperateLogDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectOperateLogDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectOperateLogDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesCollectOperateLogDO::getVarId, reqVO.getVarId())
+ .betweenIfPresent(MesCollectOperateLogDO::getModifyTime, reqVO.getModifyTime())
+ .orderByDesc(MesCollectOperateLogDO::getModifyTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java
new file mode 100644
index 0000000..9162195
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectRealtimeHistoryPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeHistoryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-瀹炴椂鐘舵�佸巻鍙� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectRealtimeHistoryMapper extends BaseMapperX<MesCollectRealtimeHistoryDO> {
+
+ default PageResult<MesCollectRealtimeHistoryDO> selectPage(MesCollectRealtimeHistoryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getTaskId, reqVO.getTaskId())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .betweenIfPresent(MesCollectRealtimeHistoryDO::getCollectTime, reqVO.getCollectTime())
+ .orderByDesc(MesCollectRealtimeHistoryDO::getCollectTime));
+ }
+
+ default int deleteBefore(LocalDateTime before, int limit) {
+ return delete(new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+ .lt(MesCollectRealtimeHistoryDO::getCollectTime, before)
+ .last("LIMIT " + limit));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java
new file mode 100644
index 0000000..fd019b3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-璁惧瀹炴椂鐘舵�� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectRealtimeMapper extends BaseMapperX<MesCollectRealtimeDO> {
+
+ default MesCollectRealtimeDO selectByDeviceCode(String deviceCode) {
+ return selectOne(MesCollectRealtimeDO::getDeviceCode, deviceCode);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java
new file mode 100644
index 0000000..f77f844
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectTechDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-宸ヨ壓鍙傛暟蹇収 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectTechMapper extends BaseMapperX<MesCollectTechDO> {
+
+ default MesCollectTechDO selectByDeviceCode(String deviceCode) {
+ return selectOne(MesCollectTechDO::getDeviceCode, deviceCode);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
index 56c2161..6c3904b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* MES 璁惧鍙拌处 Mapper
*
@@ -25,6 +27,8 @@
.inIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeIds())
.eqIfPresent(MesDvMachineryDO::getWorkshopId, reqVO.getWorkshopId())
.eqIfPresent(MesDvMachineryDO::getWorkstationId, reqVO.getWorkstationId())
+ .eqIfPresent(MesDvMachineryDO::getCollectDeviceCode, reqVO.getCollectDeviceCode())
+ .eqIfPresent(MesDvMachineryDO::getCollectEnabled, reqVO.getCollectEnabled())
.eqIfPresent(MesDvMachineryDO::getStatus, reqVO.getStatus())
.orderByDesc(MesDvMachineryDO::getId));
}
@@ -33,6 +37,16 @@
return selectOne(MesDvMachineryDO::getCode, code);
}
+ default MesDvMachineryDO selectByCollectDeviceCode(String collectDeviceCode) {
+ return selectOne(MesDvMachineryDO::getCollectDeviceCode, collectDeviceCode);
+ }
+
+ default List<MesDvMachineryDO> selectListWithCollectDeviceCode() {
+ return selectList(new LambdaQueryWrapperX<MesDvMachineryDO>()
+ .isNotNull(MesDvMachineryDO::getCollectDeviceCode)
+ .orderByAsc(MesDvMachineryDO::getId));
+ }
+
default Long selectCountByMachineryTypeId(Long machineryTypeId) {
return selectCount(MesDvMachineryDO::getMachineryTypeId, machineryTypeId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 9f089fe..52303ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -80,6 +80,19 @@
return selectPage(reqVO, query);
}
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝e湪杩愯鐨勪换鍔★細鐢熶骇涓�侀儴鍒嗗畬鎴愩�佸凡鍋滃伐
+ */
+ default MesProTaskDO selectRunningTaskByWorkstationId(Long workstationId) {
+ return selectOne(new LambdaQueryWrapperX<MesProTaskDO>()
+ .eq(MesProTaskDO::getWorkstationId, workstationId)
+ .in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PRODUCING.getStatus(),
+ MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(), MesProTaskStatusEnum.PAUSED.getStatus())
+ .orderByDesc(MesProTaskDO::getLastFeedbackTime)
+ .orderByDesc(MesProTaskDO::getId)
+ .last("LIMIT 1"));
+ }
+
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.eqIfPresent(MesProTaskDO::getWorkOrderId, workOrderId)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 9e011de..1de1474 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -170,6 +170,7 @@
ErrorCode DV_MACHINERY_HAS_MAINTEN_RECORD = new ErrorCode(1_040_301_005, "璁惧宸插叧鑱斾繚鍏昏褰曪紝鏃犳硶鍒犻櫎");
ErrorCode DV_MACHINERY_HAS_REPAIR = new ErrorCode(1_040_301_006, "璁惧宸插叧鑱旂淮淇伐鍗曪紝鏃犳硶鍒犻櫎");
ErrorCode DV_MACHINERY_WORKSTATION_NOT_EXISTS = new ErrorCode(1_040_301_008, "宸ヤ綔绔欑紪鐮佷笉瀛樺湪");
+ ErrorCode DV_MACHINERY_COLLECT_CODE_DUPLICATE = new ErrorCode(1_040_301_009, "鏁伴噰璁惧缂栧彿宸茶鍏朵粬璁惧鍗犵敤");
// ========== MES 璁惧绠$悊-鐐规淇濆吇椤圭洰锛�1-040-304-000锛� ==========
ErrorCode DV_SUBJECT_NOT_EXISTS = new ErrorCode(1_040_304_000, "鐐规淇濆吇椤圭洰涓嶅瓨鍦�");
@@ -839,4 +840,9 @@
ErrorCode WMS_APPROVAL_STATUS_INVALID = new ErrorCode(1_040_900_004, "鍗曟嵁鐘舵�佷笉姝g‘锛屾棤娉曟彁浜ゅ鎵�");
ErrorCode WMS_APPROVAL_ALREADY_SUBMITTED = new ErrorCode(1_040_900_005, "鍗曟嵁宸叉彁浜ゅ鎵癸紝璇峰嬁閲嶅鎻愪氦");
+ // ========== MES 璁惧绠$悊-鏁伴噰锛�1-040-920-000锛� ==========
+ ErrorCode COLLECT_DEVICE_NOT_BOUND = new ErrorCode(1_040_920_000, "鏁伴噰璁惧[{}]鏈粦瀹氳澶囧彴璐︼紝璇峰厛鍦ㄨ澶囧彴璐︾淮鎶ゆ暟閲囪澶囩紪鍙�");
+ ErrorCode COLLECT_ALARM_NOT_EXISTS = new ErrorCode(1_040_920_001, "鎶ヨ璁板綍涓嶅瓨鍦�");
+ ErrorCode COLLECT_ALARM_ALREADY_CLEARED = new ErrorCode(1_040_920_002, "璇ユ姤璀﹀凡娑堥櫎锛屾棤闇�閲嶅纭");
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java
new file mode 100644
index 0000000..3ebab17
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰鎶ヨ鐘舵��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectAlarmStatusEnum {
+
+ ACTIVE(0, "鏈秷闄�"),
+ CLEARED(1, "宸叉秷闄�");
+
+ private final Integer status;
+ private final String name;
+
+}
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
new file mode 100644
index 0000000..1480664
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰鎶ユ枃绫诲瀷
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectMsgTypeEnum {
+
+ REALTIME("realtime", "瀹炴椂鏁版嵁"),
+ SPC("spc", "鍛ㄦ湡杩囩▼鏁版嵁"),
+ TECH("tech", "宸ヨ壓鍙傛暟"),
+ OP_LOG("opLog", "鍙傛暟鍙樻洿鏃ュ織"),
+ ALARM("alarm", "鎶ヨ"),
+ UNKNOWN("unknown", "鏈煡绫诲瀷");
+
+ private final String type;
+ private final String name;
+
+ public static MesCollectMsgTypeEnum getByType(String type) {
+ for (MesCollectMsgTypeEnum value : values()) {
+ if (value.type.equalsIgnoreCase(type)) {
+ return value;
+ }
+ }
+ return UNKNOWN;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java
new file mode 100644
index 0000000..b12bc34
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰璁惧杩愯妯″紡
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectOperateModeEnum {
+
+ MANUAL(0, "鎵嬪姩"),
+ SEMI_AUTO(1, "鍗婅嚜鍔�"),
+ EYE_AUTO(2, "鐢电溂鑷姩"),
+ TIME_AUTO(3, "鏃堕棿鑷姩"),
+ MOLD_ADJUST(4, "璋冩ā浣跨敤");
+
+ private final Integer mode;
+ private final String name;
+
+ public static String getNameByMode(Integer mode) {
+ if (mode == null) {
+ return null;
+ }
+ for (MesCollectOperateModeEnum value : values()) {
+ if (value.mode.equals(mode)) {
+ return value.name;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java
new file mode 100644
index 0000000..d8e4949
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰璁惧杩愯鐘舵��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectRunStatusEnum {
+
+ STANDBY(1, "寰呮満"),
+ PRODUCING(2, "鐢熶骇");
+
+ private final Integer status;
+ private final String name;
+
+ public static String getNameByStatus(Integer status) {
+ if (status == null) {
+ return null;
+ }
+ for (MesCollectRunStatusEnum value : values()) {
+ if (value.status.equals(status)) {
+ return value.name;
+ }
+ }
+ return null;
+ }
+
+}
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
new file mode 100644
index 0000000..2571fec
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.mes.framework.collect.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * MES 鏁伴噰閰嶇疆
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@ConfigurationProperties(prefix = "yudao.mes.collect")
+@Data
+public class MesCollectProperties {
+
+ private Mqtt mqtt = new Mqtt();
+ private Retention retention = new Retention();
+
+ @Data
+ public static class Mqtt {
+
+ /**
+ * 鏄惁鍚敤鏁伴噰 MQTT 璁㈤槄
+ */
+ private Boolean enabled = false;
+ /**
+ * Broker 鍦板潃锛屼緥濡� tcp://36.213.90.123:1883
+ */
+ private String url;
+ private String username;
+ private String password;
+ /**
+ * 瀹㈡埛绔� ID 鍓嶇紑
+ */
+ private String clientIdPrefix = "mes-collect";
+ /**
+ * 涓婚鍓嶇紑锛屼緥濡� /YLCY/IMM
+ */
+ private String topicPrefix = "/YLCY/IMM";
+ private Integer qos = 0;
+ private Integer keepAlive = 65;
+ private Integer connectionTimeout = 10;
+ /**
+ * 鎶ヨ涓婚鍚庣紑锛屾姤鏂� topic 瀛楁鎴栦富棰樻湯娈靛懡涓椂鎸夋姤璀﹀鐞�
+ */
+ private String alarmTopicSuffix = "wm";
+
+ }
+
+ @Data
+ public static class Retention {
+
+ /**
+ * 鍘熷鎶ユ枃淇濈暀澶╂暟
+ */
+ private Integer rawDays = 7;
+ /**
+ * 瀹炴椂鍘嗗彶淇濈暀澶╂暟
+ */
+ private Integer realtimeDays = 30;
+ /**
+ * 鍗曟娓呯悊鏉℃暟
+ */
+ private Integer batchSize = 50000;
+
+ }
+
+}
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
new file mode 100644
index 0000000..6e20934
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
@@ -0,0 +1,176 @@
+package cn.iocoder.yudao.module.mes.framework.collect.mqtt;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import cn.iocoder.yudao.module.mes.service.collect.MesCollectMessageDispatcher;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.stereotype.Component;
+
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * MES 鏁伴噰 MQTT 瀹㈡埛绔�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectMqttClient implements SmartLifecycle {
+
+ private static final long RECONNECT_DELAY_SECONDS = 30L;
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectMessageDispatcher dispatcher;
+
+ private volatile boolean running = false;
+ private MqttClient client;
+ private ScheduledExecutorService scheduler;
+
+ @Override
+ public void start() {
+ MesCollectProperties.Mqtt mqtt = properties.getMqtt();
+ if (!Boolean.TRUE.equals(mqtt.getEnabled())) {
+ log.info("[start][鏁伴噰 MQTT 鏈惎鐢╙");
+ return;
+ }
+ if (StrUtil.isBlank(mqtt.getUrl())) {
+ log.warn("[start][鏁伴噰 MQTT 宸插惎鐢ㄤ絾 url 涓虹┖锛岃烦杩囪繛鎺");
+ return;
+ }
+ running = true;
+ scheduler = Executors.newSingleThreadScheduledExecutor(runnable -> {
+ Thread thread = new Thread(runnable, "mes-collect-mqtt-reconnect");
+ thread.setDaemon(true);
+ return thread;
+ });
+ scheduler.scheduleWithFixedDelay(this::ensureConnected, 0, RECONNECT_DELAY_SECONDS, TimeUnit.SECONDS);
+ }
+
+ private void ensureConnected() {
+ if (!running) {
+ return;
+ }
+ MesCollectProperties.Mqtt mqtt = properties.getMqtt();
+ try {
+ if (client == null) {
+ client = new MqttClient(mqtt.getUrl(), buildClientId(), new MemoryPersistence());
+ client.setCallback(new MqttCallbackExtended() {
+ @Override
+ public void connectComplete(boolean reconnect, String serverURI) {
+ subscribe();
+ }
+
+ @Override
+ public void connectionLost(Throwable cause) {
+ log.warn("[connectionLost][鏁伴噰 MQTT 杩炴帴鏂紑锛歿}]", cause == null ? "鏈煡鍘熷洜" : cause.getMessage());
+ }
+
+ @Override
+ public void messageArrived(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload(), StandardCharsets.UTF_8);
+ try {
+ dispatcher.dispatch(topic, payload);
+ } catch (Exception e) {
+ log.error("[messageArrived][涓婚({}) 鍏ラ槦澶辫触]", topic, e);
+ }
+ }
+
+ @Override
+ public void deliveryComplete(IMqttDeliveryToken token) {
+ // 褰撳墠鍙闃咃紝涓嶅彂甯�
+ }
+ });
+ }
+ if (!client.isConnected()) {
+ MqttConnectOptions options = new MqttConnectOptions();
+ options.setAutomaticReconnect(true);
+ options.setCleanSession(true);
+ options.setKeepAliveInterval(mqtt.getKeepAlive());
+ options.setConnectionTimeout(mqtt.getConnectionTimeout());
+ if (StrUtil.isNotBlank(mqtt.getUsername())) {
+ options.setUserName(mqtt.getUsername());
+ }
+ if (mqtt.getPassword() != null) {
+ options.setPassword(mqtt.getPassword().toCharArray());
+ }
+ client.connect(options);
+ log.info("[ensureConnected][鏁伴噰 MQTT 宸茶繛鎺ワ細{}]", mqtt.getUrl());
+ }
+ } catch (Exception e) {
+ log.warn("[ensureConnected][鏁伴噰 MQTT 杩炴帴/璁㈤槄澶辫触锛寋} 绉掑悗閲嶈瘯锛歿}]",
+ RECONNECT_DELAY_SECONDS, e.getMessage());
+ }
+ }
+
+ 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);
+ }
+ }
+
+ private String normalizeTopicPrefix(String prefix) {
+ if (StrUtil.isBlank(prefix)) {
+ return "";
+ }
+ return prefix.endsWith("/") ? prefix : prefix + "/";
+ }
+
+ private String buildClientId() {
+ String host;
+ try {
+ host = InetAddress.getLocalHost().getHostName();
+ } catch (Exception e) {
+ host = "host";
+ }
+ host = host.replaceAll("[^a-zA-Z0-9_-]", "_");
+ String clientId = properties.getMqtt().getClientIdPrefix() + "-" + host + "-"
+ + Long.toHexString(System.nanoTime());
+ return StrUtil.maxLength(clientId, 64);
+ }
+
+ @Override
+ public void stop() {
+ running = false;
+ if (scheduler != null) {
+ scheduler.shutdownNow();
+ scheduler = null;
+ }
+ if (client != null) {
+ try {
+ if (client.isConnected()) {
+ client.disconnect();
+ }
+ } catch (Exception e) {
+ log.warn("[stop][鏁伴噰 MQTT 鏂紑澶辫触锛歿}]", e.getMessage());
+ }
+ try {
+ client.close(true);
+ } catch (Exception e) {
+ log.warn("[stop][鏁伴噰 MQTT 鍏抽棴澶辫触锛歿}]", e.getMessage());
+ }
+ client = null;
+ }
+ log.info("[stop][鏁伴噰 MQTT 宸插仠姝");
+ }
+
+ @Override
+ public boolean isRunning() {
+ return running;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java
new file mode 100644
index 0000000..82101e3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.mes.job.collect;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectMessageMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeHistoryMapper;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰鍘嗗彶鏁版嵁娓呯悊浠诲姟
+ *
+ * <p>鍘熷鎶ユ枃淇濈暀 7 澶╋紝瀹炴椂鍘嗗彶淇濈暀 30 澶╋紝姣忔棩 03:30 鎵ц銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectCleanupJob {
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectMessageMapper messageMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+
+ @Scheduled(cron = "0 30 3 * * ?")
+ public void execute() {
+ MesCollectProperties.Retention retention = properties.getRetention();
+ int batchSize = retention.getBatchSize() == null || retention.getBatchSize() <= 0
+ ? 50000 : retention.getBatchSize();
+ int rawDeleted = deleteInBatches(() -> messageMapper.deleteBefore(
+ LocalDateTime.now().minusDays(retention.getRawDays()), batchSize), batchSize);
+ int realtimeDeleted = deleteInBatches(() -> realtimeHistoryMapper.deleteBefore(
+ LocalDateTime.now().minusDays(retention.getRealtimeDays()), batchSize), batchSize);
+ log.info("[execute][鏁伴噰鍘嗗彶娓呯悊瀹屾垚锛氬師濮嬫姤鏂� {} 鏉★紝瀹炴椂鍘嗗彶 {} 鏉", rawDeleted, realtimeDeleted);
+ }
+
+ private int deleteInBatches(DeleteAction action, int batchSize) {
+ int total = 0;
+ int deleted;
+ do {
+ deleted = action.delete();
+ total += deleted;
+ } while (deleted >= batchSize);
+ return total;
+ }
+
+ @FunctionalInterface
+ private interface DeleteAction {
+ int delete();
+ }
+
+}
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
new file mode 100644
index 0000000..931b38a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
@@ -0,0 +1,212 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import tools.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * MES 鏁伴噰鎶ユ枃瑙f瀽宸ュ叿
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectDataParser {
+
+ private static final DateTimeFormatter DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSS]");
+
+ public JsonNode parsePayload(String payload) {
+ return JsonUtils.parseTree(payload);
+ }
+
+ public JsonNode parseData(JsonNode root) {
+ JsonNode data = root.get("Data");
+ if (data != null && data.isTextual()) {
+ try {
+ data = JsonUtils.parseTree(data.asText());
+ } catch (Exception e) {
+ log.warn("[parseData][Data 瀛楁涓嶆槸鍚堟硶 JSON锛屾寜鍘熸枃澶勭悊锛歿}]", StrUtil.maxLength(data.asText(), 200));
+ return root;
+ }
+ }
+ return data != null && data.isObject() ? data : root;
+ }
+
+ public String getText(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ return value == null || value.isNull() ? null : value.asText();
+ }
+
+ public Integer getInteger(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.intValue();
+ }
+ try {
+ return Integer.valueOf(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ public Long getLong(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.longValue();
+ }
+ try {
+ return Long.valueOf(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ public BigDecimal getDecimal(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.decimalValue();
+ }
+ try {
+ return new BigDecimal(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 鎻愬彇鎸囧畾鍓嶇紑 + 鏁板瓧鐨勫瓧娈碉紝濡� T1..Tn銆丒T1..ETn
+ */
+ public String extractNumberedFields(JsonNode data, String prefix) {
+ Map<String, Object> result = new LinkedHashMap<>();
+ data.properties().forEach(entry -> {
+ String name = entry.getKey();
+ if (!name.startsWith(prefix) || name.length() == prefix.length()) {
+ return;
+ }
+ String suffix = name.substring(prefix.length());
+ if (!suffix.chars().allMatch(Character::isDigit)) {
+ return;
+ }
+ JsonNode value = entry.getValue();
+ result.put(name, value != null && value.isNumber() ? value.decimalValue() : value == null ? null : value.asText());
+ });
+ if (result.isEmpty()) {
+ return null;
+ }
+ return JsonUtils.toJsonString(result);
+ }
+
+ public LocalDateTime parseEventTime(JsonNode root) {
+ LocalDateTime time = parseTimeText(getText(root, "time"));
+ if (time != null) {
+ return time;
+ }
+ Long timestamp = getLong(root, "timestamp");
+ if (timestamp == null) {
+ timestamp = getLong(root, "sendStamp");
+ }
+ if (timestamp != null && timestamp > 0) {
+ Instant instant = timestamp > 1_000_000_000_000L
+ ? Instant.ofEpochMilli(timestamp) : Instant.ofEpochSecond(timestamp);
+ return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+ }
+ return LocalDateTime.now();
+ }
+
+ public LocalDateTime parseTimeText(String text) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
+ try {
+ return LocalDateTime.parse(text.trim(), DATE_TIME_FORMATTER);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public String valueToString(JsonNode value) {
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ return value.isValueNode() ? value.asText() : value.toString();
+ }
+
+ public MesCollectMsgTypeEnum resolveMsgType(String topicField, String mqttTopic,
+ JsonNode data, String alarmTopicSuffix) {
+ MesCollectMsgTypeEnum type = MesCollectMsgTypeEnum.getByType(topicField);
+ if (type != MesCollectMsgTypeEnum.UNKNOWN) {
+ return type;
+ }
+ if (StrUtil.isNotBlank(topicField) && StrUtil.equalsIgnoreCase(topicField, alarmTopicSuffix)) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ String suffix = extractTopicSuffix(mqttTopic);
+ if (StrUtil.isNotBlank(suffix)) {
+ type = MesCollectMsgTypeEnum.getByType(suffix);
+ if (type != MesCollectMsgTypeEnum.UNKNOWN) {
+ return type;
+ }
+ if (StrUtil.equalsIgnoreCase(suffix, alarmTopicSuffix)) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ }
+ if (data == null) {
+ return MesCollectMsgTypeEnum.UNKNOWN;
+ }
+ if (data.has("wmId")) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ if (data.has("varId")) {
+ return MesCollectMsgTypeEnum.OP_LOG;
+ }
+ if (data.has("CYCN")) {
+ return MesCollectMsgTypeEnum.SPC;
+ }
+ if (data.has("STS") || data.has("OPM")) {
+ return MesCollectMsgTypeEnum.REALTIME;
+ }
+ if (data.has("TS1") || data.has("CP1M")) {
+ return MesCollectMsgTypeEnum.TECH;
+ }
+ return MesCollectMsgTypeEnum.UNKNOWN;
+ }
+
+ public String resolveDeviceId(JsonNode root, String mqttTopic) {
+ String deviceId = getText(root, "devId");
+ if (StrUtil.isNotBlank(deviceId)) {
+ return deviceId.trim();
+ }
+ String[] parts = mqttTopic == null ? new String[0] : mqttTopic.split("/");
+ return parts.length >= 2 ? parts[parts.length - 2] : null;
+ }
+
+ private String extractTopicSuffix(String mqttTopic) {
+ if (StrUtil.isBlank(mqttTopic)) {
+ return null;
+ }
+ String[] parts = mqttTopic.split("/");
+ return parts.length == 0 ? null : parts[parts.length - 1];
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java
new file mode 100644
index 0000000..b1624a4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java
@@ -0,0 +1,188 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.*;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectAlarmStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import tools.jackson.databind.JsonNode;
+import jakarta.annotation.Resource;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰鏁版嵁钀藉簱 Service
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectDataService {
+
+ @Resource
+ private MesCollectDataParser parser;
+ @Resource
+ private MesCollectMessageMapper messageMapper;
+ @Resource
+ private MesCollectRealtimeMapper realtimeMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+ @Resource
+ private MesCollectCycleMapper cycleMapper;
+ @Resource
+ private MesCollectTechMapper techMapper;
+ @Resource
+ private MesCollectOperateLogMapper collectOperateLogMapper;
+ @Resource
+ private MesCollectAlarmMapper alarmMapper;
+
+ public Long saveRawMessage(String deviceCode, Long machineryId, String mqttTopic,
+ MesCollectMsgTypeEnum msgType, LocalDateTime eventTime, String payload) {
+ MesCollectMessageDO message = MesCollectMessageDO.builder()
+ .deviceCode(deviceCode).machineryId(machineryId).mqttTopic(mqttTopic)
+ .msgType(msgType.getType()).eventTime(eventTime).rawPayload(payload)
+ .processStatus(0).receiveTime(LocalDateTime.now()).build();
+ messageMapper.insert(message);
+ return message.getId();
+ }
+
+ public void markRawMessageFailed(Long id, String error) {
+ if (id == null) {
+ return;
+ }
+ messageMapper.updateById(MesCollectMessageDO.builder()
+ .id(id).processStatus(1).errorMsg(StrUtil.maxLength(error, 1000)).build());
+ }
+
+ public void saveRealtime(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ MesCollectRealtimeDO snapshot = MesCollectRealtimeDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime)
+ .sts(parser.getInteger(data, "STS"))
+ .opm(parser.getInteger(data, "OPM"))
+ .asts(parser.getInteger(data, "ASTS"))
+ .ot(parser.getDecimal(data, "OT"))
+ .temps(parser.extractNumberedFields(data, "T"))
+ .dataJson(data.toString())
+ .build();
+ MesCollectRealtimeDO existing = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (existing != null) {
+ snapshot.setId(existing.getId());
+ realtimeMapper.updateById(snapshot);
+ } else {
+ try {
+ realtimeMapper.insert(snapshot);
+ } catch (DuplicateKeyException e) {
+ MesCollectRealtimeDO current = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (current != null) {
+ snapshot.setId(current.getId());
+ realtimeMapper.updateById(snapshot);
+ }
+ }
+ }
+
+ MesCollectRealtimeHistoryDO history = MesCollectRealtimeHistoryDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime)
+ .sts(snapshot.getSts())
+ .opm(snapshot.getOpm())
+ .asts(snapshot.getAsts())
+ .ot(snapshot.getOt())
+ .temps(snapshot.getTemps())
+ .dataJson(snapshot.getDataJson())
+ .build();
+ try {
+ realtimeHistoryMapper.insert(history);
+ } catch (DuplicateKeyException ignored) {
+ // 鍚屼竴璁惧鍚屼竴绉掔殑閲嶅鎶ユ枃锛岀洿鎺ュ拷鐣�
+ }
+ }
+
+ public void saveCycle(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ Long cycleNo = parser.getLong(data, "CYCN");
+ MesCollectCycleDO cycle = MesCollectCycleDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .cycleNo(cycleNo == null ? 0L : cycleNo)
+ .collectTime(eventTime)
+ .ecyct(parser.getDecimal(data, "ECYCT"))
+ .eiss(parser.getDecimal(data, "EISS"))
+ .eivm(parser.getDecimal(data, "EIVM"))
+ .eipm(parser.getDecimal(data, "EIPM"))
+ .esipt(parser.getDecimal(data, "ESIPT"))
+ .esipp(parser.getDecimal(data, "ESIPP"))
+ .esips(parser.getDecimal(data, "ESIPS"))
+ .eipt(parser.getDecimal(data, "EIPT"))
+ .eipse(parser.getDecimal(data, "EIPSE"))
+ .eplst(parser.getDecimal(data, "EPLST"))
+ .eplsse(parser.getDecimal(data, "EPLSSE"))
+ .eplspm(parser.getDecimal(data, "EPLSPM"))
+ .etTemps(parser.extractNumberedFields(data, "ET"))
+ .dataJson(data.toString())
+ .build();
+ try {
+ cycleMapper.insert(cycle);
+ } catch (DuplicateKeyException ignored) {
+ // 鍚屼竴鍛ㄦ湡閲嶅涓婃姤锛岀洿鎺ュ拷鐣�
+ }
+ }
+
+ public void saveTech(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ MesCollectTechDO tech = MesCollectTechDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime).dataJson(data.toString()).build();
+ MesCollectTechDO existing = techMapper.selectByDeviceCode(deviceCode);
+ if (existing != null) {
+ tech.setId(existing.getId());
+ techMapper.updateById(tech);
+ } else {
+ try {
+ techMapper.insert(tech);
+ } catch (DuplicateKeyException e) {
+ MesCollectTechDO current = techMapper.selectByDeviceCode(deviceCode);
+ if (current != null) {
+ tech.setId(current.getId());
+ techMapper.updateById(tech);
+ }
+ }
+ }
+ }
+
+ public void saveOperateLog(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ LocalDateTime modifyTime = parser.parseTimeText(parser.getText(data, "modifyTime"));
+ collectOperateLogMapper.insert(MesCollectOperateLogDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .varId(parser.getText(data, "varId"))
+ .oldValue(StrUtil.maxLength(parser.valueToString(data.get("lastValue")), 500))
+ .newValue(StrUtil.maxLength(parser.valueToString(data.get("value")), 500))
+ .modifyTime(modifyTime == null ? eventTime : modifyTime)
+ .collectTime(eventTime).dataJson(data.toString())
+ .build());
+ }
+
+ public void saveAlarm(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ Integer wmId = parser.getInteger(data, "wmId");
+ LocalDateTime wmTime = parser.parseTimeText(parser.getText(data, "wmTime"));
+ if (wmTime == null) {
+ wmTime = eventTime;
+ }
+ if (wmId != null && wmId == 0) {
+ alarmMapper.clearActiveByDeviceCode(deviceCode, wmTime);
+ return;
+ }
+ alarmMapper.insert(MesCollectAlarmDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .wmId(wmId)
+ .wmMsg(StrUtil.maxLength(parser.getText(data, "wmMsg"), 500))
+ .wmTime(wmTime)
+ .status(MesCollectAlarmStatusEnum.ACTIVE.getStatus())
+ .collectTime(eventTime).dataJson(data.toString())
+ .build());
+ }
+
+}
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
new file mode 100644
index 0000000..5b1a468
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
@@ -0,0 +1,129 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import tools.jackson.databind.JsonNode;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * MES 鏁伴噰鎶ユ枃鍒嗗彂鍣�
+ *
+ * <p>Paho 鍥炶皟绾跨▼鍙礋璐e叆闃燂紝瑙f瀽涓庤惤搴撳湪鍗曠嚎绋嬩腑涓茶鎵ц锛屼繚璇佸悓涓�璁惧鎶ヨ绛夌姸鎬佹寜椤哄簭澶勭悊銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectMessageDispatcher {
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectDataParser parser;
+ @Resource
+ private MesCollectDataService dataService;
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
+ @Resource
+ private MesCollectTaskResolver taskResolver;
+
+ private final ExecutorService executor = new ThreadPoolExecutor(1, 1,
+ 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10_000),
+ new ThreadFactory() {
+ private final AtomicInteger index = new AtomicInteger();
+
+ @Override
+ public Thread newThread(Runnable runnable) {
+ Thread thread = new Thread(runnable, "mes-collect-dispatch-" + index.incrementAndGet());
+ thread.setDaemon(true);
+ return thread;
+ }
+ }, new ThreadPoolExecutor.CallerRunsPolicy());
+
+ /**
+ * 璁惧鏈粦瀹氬彴璐︽椂鐨勫憡璀︾紦瀛橈紝閬垮厤姣忔潯鎶ユ枃閲嶅鍒锋棩蹇�
+ */
+ private final ConcurrentHashMap<String, Long> unboundWarnCache = new ConcurrentHashMap<>();
+
+ public void dispatch(String topic, String payload) {
+ executor.execute(() -> process(topic, payload));
+ }
+
+ private void process(String topic, String payload) {
+ JsonNode root;
+ try {
+ root = parser.parsePayload(payload);
+ } catch (Exception e) {
+ log.warn("[process][涓婚({}) 鎶ユ枃涓嶆槸鍚堟硶 JSON锛歿}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.markRawMessageFailed(
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN,
+ LocalDateTime.now(), payload),
+ "鎶ユ枃涓嶆槸鍚堟硶 JSON锛�" + e.getMessage());
+ return;
+ }
+
+ JsonNode data = parser.parseData(root);
+ MesCollectMsgTypeEnum msgType = parser.resolveMsgType(parser.getText(root, "topic"), topic, data,
+ properties.getMqtt().getAlarmTopicSuffix());
+ String deviceCode = parser.resolveDeviceId(root, topic);
+ LocalDateTime eventTime = parser.parseEventTime(root);
+
+ MesDvMachineryDO machinery = StrUtil.isBlank(deviceCode) ? null
+ : machineryMapper.selectByCollectDeviceCode(deviceCode);
+ if (machinery == null && StrUtil.isNotBlank(deviceCode)) {
+ 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, msgType, eventTime, payload);
+ try {
+ switch (msgType) {
+ case REALTIME -> dataService.saveRealtime(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case SPC -> dataService.saveCycle(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case TECH -> dataService.saveTech(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case OP_LOG -> dataService.saveOperateLog(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case ALARM -> dataService.saveAlarm(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ default -> log.debug("[process][蹇界暐鏈煡绫诲瀷鎶ユ枃锛屼富棰�({})]", topic);
+ }
+ } catch (Exception e) {
+ dataService.markRawMessageFailed(rawId, e.getMessage());
+ log.error("[process][涓婚({}) 璁惧({}) 澶勭悊澶辫触]", topic, deviceCode, e);
+ }
+ }
+
+ private void warnUnboundDevice(String deviceCode) {
+ long now = System.currentTimeMillis();
+ Long last = unboundWarnCache.get(deviceCode);
+ if (last != null && now - last < 60_000L) {
+ return;
+ }
+ unboundWarnCache.put(deviceCode, now);
+ log.warn("[process][鏁伴噰璁惧({}) 鏈粦瀹氫换浣曡澶囧彴璐︼紝鏁版嵁灏嗘寜璁惧缂栧彿钀藉簱锛宮achineryId 涓虹┖]", deviceCode);
+ }
+
+ @PreDestroy
+ public void destroy() {
+ executor.shutdownNow();
+ }
+
+}
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
new file mode 100644
index 0000000..0fc24e2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
@@ -0,0 +1,202 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectAlarmStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectOperateModeEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectRunStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.COLLECT_ALARM_ALREADY_CLEARED;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.COLLECT_ALARM_NOT_EXISTS;
+
+/**
+ * MES 鏁伴噰鏁版嵁鏌ヨ Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectQueryService {
+
+ /**
+ * 瓒呰繃璇ユ椂闀挎湭閲囬泦鏁版嵁瑙嗕负绂荤嚎
+ */
+ private static final long ONLINE_TIMEOUT_MINUTES = 5L;
+
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
+ @Resource
+ private MesCollectRealtimeMapper realtimeMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+ @Resource
+ private MesCollectCycleMapper cycleMapper;
+ @Resource
+ private MesCollectTechMapper techMapper;
+ @Resource
+ private MesCollectOperateLogMapper collectOperateLogMapper;
+ @Resource
+ private MesCollectAlarmMapper alarmMapper;
+ @Resource
+ private MesProWorkOrderMapper workOrderMapper;
+ @Resource
+ private MesCollectTaskResolver taskResolver;
+ @Resource
+ private MesMdWorkstationService workstationService;
+
+ /**
+ * 鑾峰彇宸查厤缃暟閲囩紪鐮佺殑璁惧瀹炴椂鐘舵�佸垪琛�
+ */
+ public List<MesCollectDeviceRespVO> getDeviceList() {
+ List<MesDvMachineryDO> machineries = machineryMapper.selectListWithCollectDeviceCode();
+ Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
+ machineries.stream().map(MesDvMachineryDO::getWorkstationId).filter(Objects::nonNull).toList());
+ return machineries.stream().map(machinery -> {
+ MesCollectDeviceRespVO vo = new MesCollectDeviceRespVO();
+ vo.setMachineryId(machinery.getId());
+ vo.setMachineryCode(machinery.getCode());
+ vo.setMachineryName(machinery.getName());
+ vo.setCollectDeviceCode(machinery.getCollectDeviceCode());
+ vo.setCollectEnabled(Boolean.TRUE.equals(machinery.getCollectEnabled()));
+ MesMdWorkstationDO workstation = workstationMap.get(machinery.getWorkstationId());
+ if (workstation != null) {
+ vo.setWorkstationId(workstation.getId());
+ vo.setWorkstationName(workstation.getName());
+ }
+
+ MesCollectRealtimeDO realtime = realtimeMapper.selectByDeviceCode(machinery.getCollectDeviceCode());
+ if (realtime != null) {
+ vo.setLastCollectTime(realtime.getCollectTime());
+ vo.setOnline(realtime.getCollectTime() != null
+ && realtime.getCollectTime().isAfter(LocalDateTime.now().minusMinutes(ONLINE_TIMEOUT_MINUTES)));
+ vo.setSts(realtime.getSts());
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(realtime.getSts()));
+ vo.setOpm(realtime.getOpm());
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(realtime.getOpm()));
+ vo.setOt(realtime.getOt());
+ vo.setTemps(realtime.getTemps());
+ } else {
+ vo.setOnline(false);
+ }
+
+ MesProTaskDO task = taskResolver.resolve(machinery.getWorkstationId());
+ if (task != null) {
+ vo.setTaskId(task.getId());
+ vo.setTaskCode(task.getCode());
+ vo.setTaskName(task.getName());
+ vo.setWorkOrderId(task.getWorkOrderId());
+ MesProWorkOrderDO workOrder = task.getWorkOrderId() != null
+ ? workOrderMapper.selectById(task.getWorkOrderId()) : null;
+ if (workOrder != null) {
+ vo.setWorkOrderCode(workOrder.getCode());
+ }
+ }
+ vo.setActiveAlarmCount(alarmMapper.selectActiveCountByDeviceCode(machinery.getCollectDeviceCode()));
+ return vo;
+ }).toList();
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾鏁伴噰璁惧鐨勫疄鏃剁姸鎬佸揩鐓�
+ */
+ public MesCollectRealtimeRespVO getRealtime(String deviceCode) {
+ MesCollectRealtimeDO realtime = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (realtime == null) {
+ return null;
+ }
+ MesCollectRealtimeRespVO vo = BeanUtils.toBean(realtime, MesCollectRealtimeRespVO.class);
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(realtime.getSts()));
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(realtime.getOpm()));
+ return vo;
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ瀹炴椂鐘舵�佸巻鍙�
+ */
+ public PageResult<MesCollectRealtimeRespVO> getRealtimeHistoryPage(MesCollectRealtimeHistoryPageReqVO reqVO) {
+ PageResult<MesCollectRealtimeHistoryDO> pageResult = realtimeHistoryMapper.selectPage(reqVO);
+ PageResult<MesCollectRealtimeRespVO> result = BeanUtils.toBean(pageResult, MesCollectRealtimeRespVO.class);
+ result.getList().forEach(vo -> {
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(vo.getSts()));
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(vo.getOpm()));
+ });
+ return result;
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鍛ㄦ湡杩囩▼鏁版嵁
+ */
+ public PageResult<MesCollectCycleRespVO> getCyclePage(MesCollectCyclePageReqVO reqVO) {
+ return BeanUtils.toBean(cycleMapper.selectPage(reqVO), MesCollectCycleRespVO.class);
+ }
+
+ /**
+ * 鑾峰彇鍗曟潯鍛ㄦ湡杩囩▼鏁版嵁
+ */
+ public MesCollectCycleRespVO getCycle(Long id) {
+ MesCollectCycleDO cycle = cycleMapper.selectById(id);
+ return cycle == null ? null : BeanUtils.toBean(cycle, MesCollectCycleRespVO.class);
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾鏁伴噰璁惧鐨勬渶鏂板伐鑹哄弬鏁板揩鐓�
+ */
+ public MesCollectTechRespVO getTech(String deviceCode) {
+ MesCollectTechDO tech = techMapper.selectByDeviceCode(deviceCode);
+ return tech == null ? null : BeanUtils.toBean(tech, MesCollectTechRespVO.class);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鍙傛暟鍙樻洿鏃ュ織
+ */
+ public PageResult<MesCollectOperateLogRespVO> getOperateLogPage(MesCollectOperateLogPageReqVO reqVO) {
+ return BeanUtils.toBean(collectOperateLogMapper.selectPage(reqVO), MesCollectOperateLogRespVO.class);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鎶ヨ璁板綍
+ */
+ public PageResult<MesCollectAlarmRespVO> getAlarmPage(MesCollectAlarmPageReqVO reqVO) {
+ PageResult<MesCollectAlarmDO> pageResult = alarmMapper.selectPage(reqVO);
+ PageResult<MesCollectAlarmRespVO> result = BeanUtils.toBean(pageResult, MesCollectAlarmRespVO.class);
+ result.getList().forEach(vo -> vo.setStatusName(MesCollectAlarmStatusEnum.ACTIVE.getStatus().equals(vo.getStatus())
+ ? MesCollectAlarmStatusEnum.ACTIVE.getName() : MesCollectAlarmStatusEnum.CLEARED.getName()));
+ return result;
+ }
+
+ /**
+ * 浜哄伐纭娑堥櫎鎶ヨ
+ */
+ public void ackAlarm(Long id) {
+ MesCollectAlarmDO alarm = alarmMapper.selectById(id);
+ if (alarm == null) {
+ throw exception(COLLECT_ALARM_NOT_EXISTS);
+ }
+ if (MesCollectAlarmStatusEnum.CLEARED.getStatus().equals(alarm.getStatus())) {
+ throw exception(COLLECT_ALARM_ALREADY_CLEARED);
+ }
+ MesCollectAlarmDO updateObj = new MesCollectAlarmDO();
+ updateObj.setId(id);
+ updateObj.setStatus(MesCollectAlarmStatusEnum.CLEARED.getStatus());
+ updateObj.setClearTime(LocalDateTime.now());
+ alarmMapper.updateById(updateObj);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java
new file mode 100644
index 0000000..b6aff97
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * MES 鏁伴噰-鐢熶骇浠诲姟鍏宠仈瑙f瀽
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectTaskResolver {
+
+ private static final long CACHE_MILLIS = 30_000L;
+
+ @Resource
+ private MesProTaskMapper taskMapper;
+
+ private final ConcurrentHashMap<Long, CachedTask> cache = new ConcurrentHashMap<>();
+
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝e湪杩愯鐨勭敓浜т换鍔★紙鐢熶骇涓�/閮ㄥ垎瀹屾垚/宸插仠宸ワ級
+ */
+ public MesProTaskDO resolve(Long workstationId) {
+ if (workstationId == null) {
+ return null;
+ }
+ long now = System.currentTimeMillis();
+ CachedTask cached = cache.get(workstationId);
+ if (cached != null && now - cached.time < CACHE_MILLIS) {
+ return cached.task;
+ }
+ MesProTaskDO task = taskMapper.selectRunningTaskByWorkstationId(workstationId);
+ cache.put(workstationId, new CachedTask(task, now));
+ return task;
+ }
+
+ private record CachedTask(MesProTaskDO task, long time) {
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
index bb3c226..52f1094 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
@@ -82,6 +82,8 @@
workshopService.getWorkshop(createReqVO.getWorkshopId());
// 鏍¢獙缂栫爜鍞竴
validateMachineryCodeUnique(null, createReqVO.getCode());
+ // 鏍¢獙鏁伴噰璁惧缂栧彿鍞竴
+ validateCollectDeviceCodeUnique(null, createReqVO.getCollectDeviceCode());
// 鎻掑叆
MesDvMachineryDO machinery = BeanUtils.toBean(createReqVO, MesDvMachineryDO.class);
@@ -103,6 +105,8 @@
workshopService.getWorkshop(updateReqVO.getWorkshopId());
// 鏍¢獙缂栫爜鍞竴
validateMachineryCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+ // 鏍¢獙鏁伴噰璁惧缂栧彿鍞竴
+ validateCollectDeviceCodeUnique(updateReqVO.getId(), updateReqVO.getCollectDeviceCode());
// 鏇存柊
MesDvMachineryDO updateObj = BeanUtils.toBean(updateReqVO, MesDvMachineryDO.class);
@@ -148,6 +152,19 @@
}
if (ObjUtil.notEqual(machinery.getId(), id)) {
throw exception(DV_MACHINERY_CODE_DUPLICATE);
+ }
+ }
+
+ private void validateCollectDeviceCodeUnique(Long id, String collectDeviceCode) {
+ if (StrUtil.isBlank(collectDeviceCode)) {
+ return;
+ }
+ MesDvMachineryDO machinery = machineryMapper.selectByCollectDeviceCode(collectDeviceCode);
+ if (machinery == null) {
+ return;
+ }
+ if (ObjUtil.notEqual(machinery.getId(), id)) {
+ throw exception(DV_MACHINERY_COLLECT_CODE_DUPLICATE);
}
}
@@ -278,6 +295,15 @@
// 3.5 鍒ゆ柇锛氬垱寤� or 鏇存柊
MesDvMachineryDO existMachinery = machineryMapper.selectByCode(importItem.getCode());
+ if (StrUtil.isNotBlank(importItem.getCollectDeviceCode())) {
+ MesDvMachineryDO collectOwner = machineryMapper.selectByCollectDeviceCode(importItem.getCollectDeviceCode());
+ if (collectOwner != null && (existMachinery == null
+ || ObjUtil.notEqual(collectOwner.getId(), existMachinery.getId()))) {
+ respVO.getFailureCodes().put(key, "鏁伴噰璁惧缂栧彿[" + importItem.getCollectDeviceCode() + "]宸茶璁惧["
+ + collectOwner.getCode() + "]鍗犵敤");
+ return;
+ }
+ }
if (existMachinery == null) {
// 3.5.1 鍒涘缓
MesDvMachineryDO machinery = BeanUtils.toBean(importItem, MesDvMachineryDO.class);
diff --git a/yudao-server/src/main/resources/application-kyzn.yaml b/yudao-server/src/main/resources/application-kyzn.yaml
index a38e27d..9018102 100644
--- a/yudao-server/src/main/resources/application-kyzn.yaml
+++ b/yudao-server/src/main/resources/application-kyzn.yaml
@@ -235,3 +235,20 @@
username: root # 澶囦唤璐﹀彿锛岀暀绌轰娇鐢ㄦ暟鎹簮璐﹀彿
password: 'xd@123456..' # 澶囦唤瀵嗙爜锛岀暀绌轰娇鐢ㄦ暟鎹簮瀵嗙爜
command: # mysqldump 鍛戒护锛岀暀绌鸿嚜鍔ㄦ娴嬮儴缃茬幆澧冿紙鏈満 mysqldump 鎴� Docker MySQL 瀹瑰櫒锛夛紱鍙墜鍔ㄦ寚瀹氾紝濡傦細docker exec mysql8 mysqldump
+ mes:
+ collect:
+ mqtt: # 娉ㄥ鏈烘暟閲囷細EMQX 璁㈤槄锛岃澶囦互 devId锛堝 C01锛夌粡璁惧鍙拌处 collect_device_code 缁戝畾
+ enabled: true # 鍏虫帀鍚庝笉鍐嶈繛鎺� Broker锛屼粎淇濈暀鍘嗗彶鏁版嵁鏌ヨ
+ url: tcp://36.213.90.123:1883
+ username: admin
+ password: public
+ client-id-prefix: mes-collect
+ topic-prefix: /YLCY/IMM
+ qos: 0
+ keep-alive: 65
+ connection-timeout: 10
+ alarm-topic-suffix: wm # 鎶ユ枃 topic 瀛楁鎴栦富棰樻湯娈靛懡涓鍚庣紑鍗虫寜鎶ヨ澶勭悊
+ retention:
+ raw-days: 7 # 鍘熷鎶ユ枃淇濈暀澶╂暟
+ realtime-days: 30 # 瀹炴椂鐘舵�佸巻鍙蹭繚鐣欏ぉ鏁�
+ batch-size: 50000 # 鍗曟娓呯悊鏉℃暟
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index b39e55a..6b02b2f 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -65,7 +65,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://localhost:3306/mom-hm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://localhost:3306/mom-kyzn?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
password: 123456
@@ -222,7 +222,24 @@
database-backup: # 鏁版嵁搴撳浠介厤缃�
host: localhost # 澶囦唤鐩爣 MySQL 涓绘満锛岀暀绌鸿嚜鍔ㄤ粠鏁版嵁婧� JDBC URL 瑙f瀽
port: 3306 # 澶囦唤鐩爣 MySQL 绔彛锛岀暀绌鸿嚜鍔ㄤ粠鏁版嵁婧� JDBC URL 瑙f瀽
- database: ruoyi-vue-pro # 澶囦唤鐩爣鏁版嵁搴擄紝鐣欑┖鑷姩浠庢暟鎹簮 JDBC URL 瑙f瀽
+ database: mom-kyzn # 澶囦唤鐩爣鏁版嵁搴擄紝鐣欑┖鑷姩浠庢暟鎹簮 JDBC URL 瑙f瀽
username: root # 澶囦唤璐﹀彿锛岀暀绌轰娇鐢ㄦ暟鎹簮璐﹀彿
password: '123456' # 澶囦唤瀵嗙爜锛岀暀绌轰娇鐢ㄦ暟鎹簮瀵嗙爜
command: # mysqldump 鍛戒护锛岀暀绌鸿嚜鍔ㄦ娴嬮儴缃茬幆澧冿紙鏈満 mysqldump 鎴� Docker MySQL 瀹瑰櫒锛夛紱鍙墜鍔ㄦ寚瀹氾紝濡傦細docker exec mysql8 mysqldump
+ mes:
+ collect:
+ mqtt: # 娉ㄥ鏈烘暟閲囷細鏈湴榛樿涓嶈繛鐢熶骇 Broker锛岄渶瑕佽仈璋冩椂鎶� enabled 鏀逛负 true
+ enabled: false
+ url: tcp://36.213.90.123:1883
+ username: admin
+ password: public
+ client-id-prefix: mes-collect-local
+ topic-prefix: /YLCY/IMM
+ qos: 0
+ keep-alive: 65
+ connection-timeout: 10
+ alarm-topic-suffix: wm
+ retention:
+ raw-days: 7
+ realtime-days: 30
+ batch-size: 50000
diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml
index ec9915f..30be121 100644
--- a/yudao-server/src/main/resources/application-test.yaml
+++ b/yudao-server/src/main/resources/application-test.yaml
@@ -259,3 +259,20 @@
username: root # 澶囦唤璐﹀彿锛岀暀绌轰娇鐢ㄦ暟鎹簮璐﹀彿
password: 'xd@123456..' # 澶囦唤瀵嗙爜锛岀暀绌轰娇鐢ㄦ暟鎹簮瀵嗙爜
command: # mysqldump 鍛戒护锛岀暀绌鸿嚜鍔ㄦ娴嬮儴缃茬幆澧冿紙鏈満 mysqldump 鎴� Docker MySQL 瀹瑰櫒锛夛紱鍙墜鍔ㄦ寚瀹氾紝濡傦細docker exec mysql8 mysqldump
+ mes:
+ collect:
+ mqtt: # 娉ㄥ鏈烘暟閲囷細娴嬭瘯鐜榛樿涓嶈繛鐢熶骇 Broker锛岄渶瑕佽仈璋冩椂鎶� enabled 鏀逛负 true
+ enabled: false
+ url: tcp://36.213.90.123:1883
+ username: admin
+ password: public
+ client-id-prefix: mes-collect-test
+ topic-prefix: /YLCY/IMM
+ qos: 0
+ keep-alive: 65
+ connection-timeout: 10
+ alarm-topic-suffix: wm
+ retention:
+ raw-days: 7
+ realtime-days: 30
+ batch-size: 50000
--
Gitblit v1.9.3