From df702972ff8ae890991021663d919f47dc864606 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 24 十二月 2024 10:35:23 +0800
Subject: [PATCH] 优化ReportDataHandler响应处理逻辑
---
src/main/java/com/zy/asrs/entity/AgvBasDevp.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
index f606cd1..c39e1a0 100644
--- a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
+import com.zy.asrs.service.BasLocType1Service;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -129,9 +130,9 @@
private Integer floor;
/**
- * 瀹瑰櫒绫诲瀷
+ * 璐ф灦绫诲瀷
*/
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ @ApiModelProperty(value= "璐ф灦绫诲瀷")
@TableField("ctn_type")
private Integer ctnType;
@@ -243,20 +244,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "浣庡簱浣�";
- case 2:
- return "楂樺簱浣�";
- default:
- return String.valueOf(this.locType1);
- }
- }
-
public String getLocType2$() {
if (null == this.locType2){ return null; }
switch (this.locType2){
@@ -285,6 +272,15 @@
}
}
+ public String getLocType1$() {
+ BasLocType1Service service = SpringUtils.getBean(BasLocType1Service.class);
+ BasLocType1 basLocType1 = service.selectById(this.locType1);
+ if (!Cools.isEmpty(basLocType1)){
+ return String.valueOf(basLocType1.getLocDesc());
+ }
+ return null;
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
--
Gitblit v1.9.1