From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 15 一月 2024 17:24:02 +0800 Subject: [PATCH] 1、增加流浪控制器实体(和数据库表); 2、修改部分通信协议实现; 3、增加部分通信协议实现; 4、增加通信中间件RTU上行数据处理任务树部分节点。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java index 5973c5c..63190d4 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java @@ -1,5 +1,8 @@ package com.dy.pipIrrGlobal.voPr; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -21,25 +24,43 @@ private static final long serialVersionUID = 1L; @Schema(title = "ID") + @ExcelProperty("ID") + @ColumnWidth(10) private Long id; + @Schema(title = "鍒嗘按鎴跨紪鍙�") + @ExcelProperty("鍒嗘按鎴跨紪鍙�") + @ColumnWidth(15) + private Long divideId; + @Schema(title = "鍒嗘按鎴垮悕绉�") + @ExcelProperty("鍒嗘按鎴垮悕绉�") + @ColumnWidth(15) private String divideName; @Schema(title = "鎵�灞炵墖鍖�") + @ExcelProperty("鎵�灞炵墖鍖�") + @ColumnWidth(15) private String blockName; @Schema(title = "璐熻矗浜�") + @ExcelProperty("璐熻矗浜�") + @ColumnWidth(10) private String header; @Schema(title = "鑱旂郴鐢佃瘽") + @ExcelProperty("鑱旂郴鐢佃瘽") + @ColumnWidth(15) private String phone; @Schema(title = "褰掑睘鍦�") + @ExcelProperty("褰掑睘鍦�") + @ColumnWidth(25) private String address; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Schema(title = "鎿嶄綔鏃堕棿") + @ExcelIgnore private Date operateDt; } -- Gitblit v1.8.0