From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java index 51a78be..a7abce6 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java @@ -7,21 +7,26 @@ * @author ZhuBaoMin * @date 2025-04-07 21:08 * @LastEditTime 2025-04-07 21:08 - * @Description 鍙栨按鍙c�佽櫄鎷熷崱瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃� + * @Description 寮�闃�淇℃伅瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃� */ @Data -@JsonPropertyOrder({"intakeId", "vcId"}) +@JsonPropertyOrder({"rtuAddr", "vcNum", "orderNo"}) public class VoIntakeVc { public static final long serialVersionUID = 202411281712001L; /** - * 鍙栨按鍙D + * 闃�鎺у櫒鍦板潃 */ - private Long intakeId; + private String rtuAddr; /** - * 铏氭嫙鍗D + * 铏氭嫙鍗$紪鍙� */ - private Long vcId; + private String vcNum; + + /** + * 璁㈠崟鍙� + */ + private String orderNo; } -- Gitblit v1.8.0