From a8df4c4a80781c02815021a840971ce4b15419f5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 09:38:24 +0800
Subject: [PATCH] refactor: batch fill page operator names
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 62 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 34 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 d8faaa2..81821c0 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
@@ -84,7 +84,7 @@
/**
* 璁惧缂栧彿
*/
- @ApiModelProperty(value= "璁惧缂栧彿")
+ @ApiModelProperty(value= "鎺ラ┏浣�")
private String deviceCode;
/**
@@ -122,6 +122,9 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@@ -135,6 +138,9 @@
*/
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+
+ @TableField(exist = false)
+ private String updateBy$;
/**
* 淇敼鏃堕棿
@@ -155,6 +161,12 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty("婧愬簱鍖�")
+ private Long areaIdStart;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ private Long areaIdEnd;
public DeviceSite() {}
@@ -197,21 +209,21 @@
// );
- public String getSite$() {
- if (this.site == null) {return null;}
- BasStationService service = SpringUtils.getBean(BasStationService.class);
- BasStation station = service.getById(this.site);
- if (Objects.isNull(station)) {return null;}
- return station.getStationName();
- }
-
- public String getDeviceSite$() {
- if (this.deviceSite == null) {return null;}
- BasStationService service = SpringUtils.getBean(BasStationService.class);
- BasStation station = service.getById(this.deviceSite);
- if (Objects.isNull(station)) {return null;}
- return station.getStationName();
- }
+// public String getSite$() {
+// if (this.site == null) {return null;}
+// BasStationService service = SpringUtils.getBean(BasStationService.class);
+// BasStation station = service.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, this.site));
+// if (Objects.isNull(station)) {return null;}
+// return station.getStationName();
+// }
+//
+// public String getDeviceSite$() {
+// if (this.deviceSite == null) {return null;}
+// BasStationService service = SpringUtils.getBean(BasStationService.class);
+// BasStation station = service.getById(this.deviceSite);
+// if (Objects.isNull(station)) {return null;}
+// return station.getStationName();
+// }
public String getType$(){
if (null == this.type){ return null; }
@@ -263,29 +275,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