From 053d17a73ec3dd7a2872cb42a963496f15983a5b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 20 八月 2024 17:47:41 +0800
Subject: [PATCH] 平台管理优化

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java |    1 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java           |    5 ++++-
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java             |    4 ++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java               |    3 +++
 ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml                    |    4 +++-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
index 0a4a0c5..8f75456 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
@@ -22,6 +22,10 @@
     /** 骞冲彴鍚嶇О */
     private String platformName;
 
+    @TableField("sub_platform_name")
+    /** 瀛愮骇骞冲彴鍚嶇О */
+    private String subPlatformName;
+
     @TableField("platform_ip")
     /** 骞冲彴鍚嶇О */
     private String platformIP;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
index d81528d..c820bad 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
@@ -24,10 +24,13 @@
 @ApiModel(value = "Platform琛ㄥ崟", description = "骞冲彴杩愯鐩戞帶琛ㄥ崟")
 public class PlatformForm extends AbsForm {
 
-    @NotBlank(message = "骞冲彴鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("骞冲彴鍚嶇О")
     private String platformName;
 
+    /** 瀛愮骇骞冲彴鍚嶇О */
+    @ApiModelProperty("骞冲彴鍚嶇О")
+    private String subPlatformName;
+
     @NotBlank(message = "骞冲彴IP涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("骞冲彴IP")
     private String platformIP;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
index c0c328b..7e8f169 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
@@ -19,6 +19,9 @@
     /** 骞冲彴鍚嶇О */
     private String platformName;
 
+    /** 瀛愮骇骞冲彴鍚嶇О */
+    private String subPlatformName;
+
     /** 骞冲彴IP */
     private String platformIP;
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
index b1bb3f9..aa4c25c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
@@ -54,6 +54,7 @@
             List<Platform> childList = form.getDeployList().stream().map(deploy -> {
                 Platform child = new Platform();
                 BeanUtils.copyProperties(deploy, child);
+                child.setPlatformName(entity.getPlatformName());
                 child.setParentId(entity.getId());
                 child.setCreateTime(now);
                 child.setUpdateTime(now);
diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
index 5102e2b..962b43a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
@@ -10,6 +10,7 @@
         <result column="area" property="area" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
+        <result column="sub_platform_name" property="subPlatformName" />
     </resultMap>
 
 
@@ -45,7 +46,8 @@
             TP.create_time,
             TP.update_time,
             TP.id,
-            TP.parent_id
+            TP.parent_id,
+            TP.sub_platform_name
         FROM
             t_platform TP
         WHERE

--
Gitblit v1.8.0