From 335352a8697f0c03b3ea3a1e0c055c40ea7fdde8 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 23 二月 2024 10:49:35 +0800 Subject: [PATCH] #显示器更新 --- src/main/java/com/zy/asrs/entity/BasLift.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java index 2cddf57..cc7b5fa 100644 --- a/src/main/java/com/zy/asrs/entity/BasLift.java +++ b/src/main/java/com/zy/asrs/entity/BasLift.java @@ -1,5 +1,6 @@ package com.zy.asrs.entity; +import com.alibaba.fastjson.JSON; import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.annotations.TableField; @@ -78,7 +79,7 @@ */ @ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�") @TableField("point") - private NyShuttleProtocol.NyShuttlePointClass point; + private String point; /** * 妯″紡 @@ -187,7 +188,7 @@ public BasLift() {} - public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, NyShuttleProtocol.NyShuttlePointClass point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) { + public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, String point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) { this.liftNo = liftNo; this.status = status; this.wrkNo = wrkNo; @@ -229,5 +230,12 @@ return null; } + public NyShuttleProtocol.NyShuttlePointClass getPoint$() { + if (Cools.isEmpty(this.point)){ + return null; + } + return JSON.parseObject(this.point, NyShuttleProtocol.NyShuttlePointClass.class); + } + } -- Gitblit v1.9.1