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/Wave.java | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
index cfd4a73..99d78cd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
@@ -3,7 +3,11 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -14,6 +18,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +29,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_wave")
@@ -109,6 +116,9 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -123,6 +133,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -130,11 +143,26 @@
@TableLogic
private Integer deleted;
+ @Version
+ private Integer version;
+
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鎸囧畾绔欑偣
+ */
+ @ApiModelProperty(value= "鎸囧畾绔欑偣")
+ private String stationId;
+
+ /**
+ * 鎸囧畾搴撲綅
+ */
+ @ApiModelProperty(value= "鎸囧畾搴撲綅")
+ private String locCode;
public Wave() {}
@@ -185,19 +213,17 @@
}
public String getExceStatus$(){
- if (null == this.exceStatus){ return null; }
- switch (this.exceStatus){
- case 0:
- return "鍒濆鍖�";
- case 1:
- return "鐢熸垚浠诲姟";
- case 2:
- return "浠诲姟鎾";
- case 3:
- return "瀹屾垚";
- default:
- return String.valueOf(this.exceStatus);
+ if (Cools.isEmpty(this.exceStatus)) {
+ return null;
}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_WAVE_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
}
public String getStatus$(){
@@ -219,29 +245,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- 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 getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
}
--
Gitblit v1.9.1