srgv通信

ruoyi-admin/src/main/java/com/ruoyi/device/srgv/domain/DeviceSrgv.java

@@ -18,69 +18,40 @@ import lombok.NoArgsConstructor;
 public class DeviceSrgv extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
+    /*
+     * 实时数据
+     * */
+    private int taskNo;//任务号
+    private String srcSite;//原地址
+    private String tarSite;//目标地址
+    private String currSite;//当期地址
 
-    /** $column.columnComment */
-    private Long id;
+    private int taskType;//任务类型
 
-    /** 设备唯一编码 */
-    @Excel(name = "设备唯一编码")
-    private String deviceCode ;
+    private int battery;//电量
+    private int workMode;//工作模式
+    private int alarm;//报警
+    private int status;//车状态
+    private int finish;//接收完成标志  1接收完成
+    private int chargeFlag;//充电标志  todo 充电状态值确认
+    private int workPhase;//工作阶段
+    private int errorMsg;//异常信息
+    private int deviceRequest;//输送机对接请求
+    private int changeLayer;//换层标志
+    private int cargoFlag;//载货  0未知 1空载 2载货
+    private int manualCharge;//手动充电  0未知 1充电
 
-    /** 设备名称 */
-    @Excel(name = "设备名称")
-    private String name ;
+    private int undefined1;//
+    private int undefined2;//
 
-    /** 类型 */
-    @Excel(name = "类型")
-    private String type;
+    private String path;//路径
 
-    /** 设备IP */
-    @Excel(name = "设备IP")
-    private String ipAddress;
+    //其他属性
+    private int currFloor;//当前层
 
-    /** PLC读取地址 */
-    @Excel(name = "PLC读取地址")
-    private String plcDbReadAddress;
+    private String spaceArea;//当前库存  01小库  02大库
 
-    /** 0-F 1-T */
-    @Excel(name = "0-F 1-T")
-    private String isActive;
-
-    /** PLC写入地址 */
-    @Excel(name = "PLC写入地址")
-    private String plcDbWriteAddress;
-
-    /** 入库请求 */
-    @Excel(name = "入库请求")
-    private int rkqq;
-
-    /** 空闲 */
-    @Excel(name = "空闲")
-    private int kx;
-
-    /** 到位 */
-    @Excel(name = "到位")
-    private int dw;
-
-    /** 条码 */
-    @Excel(name = "条码")
-    private String trayCode;
-
-    /** 任务号 */
-    @Excel(name = "任务号")
-    private int taskNo;
-
-    @Excel(name = "异常")
-    private int exception;
-
-    @Excel(name = "托盘尺寸")
-    private int traySize;
-
-    @Excel(name="允许放货")
-    private int allowPut;
-
-    @Excel(name="输送线模式 1-入库 2-出库")
-    private int model;
+    private int allowSend;//1允许下发