From 7911497ffa51bd41fc334153b2a456ff02554747 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 15:20:37 +0800
Subject: [PATCH] 整体流程测试修改0401-2
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceBaseModel.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceBaseModel.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceBaseModel.java
index 43d265b..0eeecc5 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceBaseModel.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceBaseModel.java
@@ -1,13 +1,17 @@
package com.by4cloud.platformx.device.entity;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.by4cloud.platformx.admin.api.utils.UpmsCacheUtil;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
import java.time.LocalDateTime;
/**
@@ -74,6 +78,21 @@
columnDefinition = "char(1) default '0'"
)
private String delFlag = "0";
+ @Schema(
+ description = "鍗曚綅id"
+ )
+ @TableField(
+ fill = FieldFill.INSERT
+ )
+ private Long compId;
+ @Transient
+ @TableField(
+ exist = false
+ )
+ @Schema(
+ description = "鍗曚綅鍚嶇О"
+ )
+ private String compName;
@Column(
columnDefinition = "varchar(100) comment '鍚嶇О'"
)
@@ -98,6 +117,14 @@
columnDefinition = "double(10,2) comment '鍗曚环'"
)
private Double price;
+ public String getCompName() {
+ if (StrUtil.isEmpty(this.compName)) {
+ UpmsCacheUtil upmsCacheUtil = (UpmsCacheUtil) SpringUtil.getBean(UpmsCacheUtil.class);
+ this.compName = upmsCacheUtil.getCompNameById(this.compId);
+ }
+
+ return this.compName;
+ }
public String getName() {
return name;
@@ -146,7 +173,15 @@
public void setPrice(Double price) {
this.price = price;
}
-
+ public void setCompId(final Long compId) {
+ this.compId = compId;
+ }
+ public Long getCompId() {
+ return this.compId;
+ }
+ public void setCompName(final String compName) {
+ this.compName = compName;
+ }
public Double getAmount() {
return amount;
}
--
Gitblit v1.9.1