From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 92 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index 54bb6f8..986a67a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -1,16 +1,25 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.BasStationService;
+import com.vincent.rsf.server.manager.service.LocTypeService;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.entity.DictType;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,8 +29,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.stream.Collectors;
@Data
+@Accessors(chain = true)
@TableName("man_device_site")
public class DeviceSite implements Serializable {
@@ -38,7 +49,7 @@
* 鍏ュ嚭搴撶被鍨�
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- private Integer type;
+ private String type;
/**
* 绔欑偣缂栧彿
@@ -55,8 +66,8 @@
/**
* wcs绔欑偣缂栧彿
*/
- @ApiModelProperty(value= "wcs绔欑偣缂栧彿")
- private String wcsCode;
+ @ApiModelProperty(value= "鐩爣浣嶇疆")
+ private String target;
/**
* 绔欑偣鏍囩
@@ -73,7 +84,7 @@
/**
* 璁惧缂栧彿
*/
- @ApiModelProperty(value= "璁惧缂栧彿")
+ @ApiModelProperty(value= "鎺ラ┏浣�")
private String deviceCode;
/**
@@ -95,6 +106,10 @@
@TableLogic
private Integer deleted;
+ @ApiModelProperty(value= "宸烽亾")
+ private Integer channel;
+
+
/**
* 绉熸埛
*/
@@ -107,11 +122,15 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -120,26 +139,49 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
+
+ /**
+ * 浣滀笟绫诲瀷
+ */
+ @TableField(exist = false)
+ private String typeIds;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty("婧愬簱鍖�")
+ private Long areaIdStart;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ private Long areaIdEnd;
+ @TableField(exist = false)
+ private String type$;
+
+ @TableField(exist = false)
+ private String device$;
+
+
+
public DeviceSite() {}
- public DeviceSite(Integer type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public DeviceSite(String type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.type = type;
this.site = site;
this.name = name;
- this.wcsCode = wcsCode;
+ this.target = wcsCode;
this.label = label;
this.device = device;
this.deviceCode = deviceCode;
@@ -173,6 +215,16 @@
// null // 澶囨敞
// );
+
+
+ public String getType$(){
+ return this.type$;
+ }
+
+ public String getDevice$(){
+ return this.device$;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -185,29 +237,11 @@
}
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getUpdateTime$(){
--
Gitblit v1.9.1