From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 5cb74ab..3e25c35 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.manager.service.LocTypeService;
@@ -63,7 +64,7 @@
@ApiModelProperty("搴撲綅绫诲瀷(*)[man_loc_type]")
@TableField(exist = false)
- private String typeIds;
+ private List<Long> typeIds;
/**
* 铏氭嫙搴撲綅
@@ -107,13 +108,18 @@
*/
@ApiModelProperty(value= "瀹�")
private Double width;
-
/**
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
@TableField("`row`")
private Integer row;
+
+ /**
+ * 璁惧鍙�
+ */
+ @ApiModelProperty(value= "璁惧鍙�")
+ private Integer deviceNo;
/**
* 鍒�
@@ -195,6 +201,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -208,6 +215,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -280,9 +288,10 @@
// null // 澶囨敞
// );
- public String getType$(){
+ public String getTypeIds$(){
if (null == this.type){ return null; }
- List<String> asList = Arrays.asList(this.type);
+ String[] split = this.type.split(",");
+ List<String> asList = Arrays.asList(split);
if (asList.isEmpty()) {
return null;
}
@@ -295,6 +304,7 @@
return StringUtils.join(strings, ",");
}
+
public String getUseStatus$(){
if (null == this.useStatus){ return null; }
switch (this.useStatus){
--
Gitblit v1.9.1