TzuxinChen 3 сар өмнө
parent
commit
60c0eac3ec
100 өөрчлөгдсөн 2544 нэмэгдсэн , 1504 устгасан
  1. 1 1
      docker/docker-compose.yaml
  2. 0 0
      docker/web-dockerfile
  3. 6 6
      docker/zyc-dockerfile
  4. 1 1
      pom.xml
  5. 18 0
      uml/api-server.plantuml
  6. 75 0
      uml/api-service-class.plantuml
  7. 40 0
      uml/model.plantuml
  8. 35 0
      uml/processor.plantuml
  9. BIN
      uml/processor.png
  10. 1 1
      zyc-admin/pom.xml
  11. 56 54
      zyc-admin/src/main/java/com/zyc/web/controller/api/AiComputingInstancesController.java
  12. 55 55
      zyc-admin/src/main/java/com/zyc/web/controller/api/AlarmInfoController.java
  13. 55 53
      zyc-admin/src/main/java/com/zyc/web/controller/api/AmsApplicationGridServicesController.java
  14. 104 0
      zyc-admin/src/main/java/com/zyc/web/controller/api/ApiInterfaceController.java
  15. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ApmApplicationPerformanceManagementServicesController.java
  16. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ApplicationDataIntegrationServicesController.java
  17. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/BareMetalInstancesController.java
  18. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/BigDataComputeServicesController.java
  19. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/CabinetsController.java
  20. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/CloudDiskServicesController.java
  21. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/CloudInstancesController.java
  22. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ComputerRoomsController.java
  23. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ContainerServicesController.java
  24. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DamengDatabaseServicesController.java
  25. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DataCentersController.java
  26. 2 5
      zyc-admin/src/main/java/com/zyc/web/controller/api/DataGovernanceServicesController.java
  27. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DevicesController.java
  28. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DictDataController.java
  29. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DictTypeController.java
  30. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DisasterRecoveryServicesController.java
  31. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DistributedCacheServicesController.java
  32. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/DomainResolutionController.java
  33. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/EGovernmentNetworkController.java
  34. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ElasticIpServicesController.java
  35. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ElasticScalingServicesController.java
  36. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/FileStorageServicesController.java
  37. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/GovernmentCloudDedicatedLineController.java
  38. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/GovernmentExtranetAccessController.java
  39. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ImageServicesController.java
  40. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/IpAddressResourcesController.java
  41. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/KunpengDesktopCloudHostsController.java
  42. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/KunpengDesktopCloudStorageController.java
  43. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/LoadBalancerServicesController.java
  44. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/MassiveDatabaseServicesController.java
  45. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/MicroservicesController.java
  46. 104 0
      zyc-admin/src/main/java/com/zyc/web/controller/api/NetworkMapController.java
  47. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/ObjectStorageServicesController.java
  48. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/PortOpeningController.java
  49. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/RelationalDatabaseServicesController.java
  50. 104 0
      zyc-admin/src/main/java/com/zyc/web/controller/api/ResourceMetricsInfoController.java
  51. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/SecurityGroupServicesController.java
  52. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/SecurityServicesController.java
  53. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/VirtualPrivateCloudServicesController.java
  54. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/VpnServicesController.java
  55. 2 2
      zyc-admin/src/main/java/com/zyc/web/controller/api/YashanDatabaseServicesController.java
  56. 1 1
      zyc-admin/src/main/resources/application-druid.yml
  57. 1 1
      zyc-admin/src/main/resources/application.yml
  58. 1 1
      zyc-admin/src/main/resources/banner.txt
  59. 1 1
      zyc-common/pom.xml
  60. 1 1
      zyc-framework/pom.xml
  61. 1 1
      zyc-generator/pom.xml
  62. 2 2
      zyc-generator/src/main/resources/generator.yml
  63. 1 1
      zyc-quartz/pom.xml
  64. 1 1
      zyc-system/pom.xml
  65. 46 46
      zyc-system/src/main/java/com/zyc/system/domain/AiComputingInstances.java
  66. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/AlarmInfo.java
  67. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/AmsApplicationGridServices.java
  68. 238 0
      zyc-system/src/main/java/com/zyc/system/domain/ApiInterface.java
  69. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/ApmApplicationPerformanceManagementServices.java
  70. 44 44
      zyc-system/src/main/java/com/zyc/system/domain/ApplicationDataIntegrationServices.java
  71. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/BareMetalInstances.java
  72. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/BigDataComputeServices.java
  73. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/Cabinets.java
  74. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/CloudDiskServices.java
  75. 44 44
      zyc-system/src/main/java/com/zyc/system/domain/CloudInstances.java
  76. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/ComputerRooms.java
  77. 44 43
      zyc-system/src/main/java/com/zyc/system/domain/ContainerServices.java
  78. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/DamengDatabaseServices.java
  79. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/DataCenters.java
  80. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/DataGovernanceServices.java
  81. 57 87
      zyc-system/src/main/java/com/zyc/system/domain/Devices.java
  82. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/DictData.java
  83. 1 1
      zyc-system/src/main/java/com/zyc/system/domain/DictType.java
  84. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/DisasterRecoveryServices.java
  85. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/DistributedCacheServices.java
  86. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/DomainResolution.java
  87. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/EGovernmentNetwork.java
  88. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/ElasticIpServices.java
  89. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/ElasticScalingServices.java
  90. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/FileStorageServices.java
  91. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/GovernmentCloudDedicatedLine.java
  92. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/GovernmentExtranetAccess.java
  93. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/ImageServices.java
  94. 26 26
      zyc-system/src/main/java/com/zyc/system/domain/IpAddressResources.java
  95. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/KunpengDesktopCloudHosts.java
  96. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/KunpengDesktopCloudStorage.java
  97. 57 43
      zyc-system/src/main/java/com/zyc/system/domain/LoadBalancerServices.java
  98. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/MassiveDatabaseServices.java
  99. 43 43
      zyc-system/src/main/java/com/zyc/system/domain/Microservices.java
  100. 252 0
      zyc-system/src/main/java/com/zyc/system/domain/NetworkMap.java

+ 1 - 1
docker/docker-compose.yaml

@@ -1,7 +1,7 @@
 version : '3'
 services:
   mysql:
-#    platform: linux/x86_64
+    platform: linux/x86_64
     container_name: mysql
     image: mysql:5.7
     build:

+ 0 - 0
docker/web-dockerfile


+ 6 - 6
docker/zyc-dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM openjdk:8
 # author
-MAINTAINER landian
+MAINTAINER zyc
 
 # 挂载目录
-VOLUME /home/landian
+VOLUME /home/zyc
 # 创建目录
-RUN mkdir -p /home/landian
+RUN mkdir -p /home/zyc
 # 指定路径
-WORKDIR /home/landian
+WORKDIR /home/zyc
 # 复制jar文件到路径
-COPY ./jar/*.jar /home/landian/landian.jar
+COPY ./jar/*.jar /home/zyc/zyc.jar
 # 启动应用
-ENTRYPOINT ["java","-jar","landian.jar"]
+ENTRYPOINT ["java","-jar","zyc.jar"]

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	
     <groupId>com.landian</groupId>
-    <artifactId>landian</artifactId>
+    <artifactId>zyc_admin</artifactId>
     <version>3.8.8</version>
 
     <name>resourcee</name>

+ 18 - 0
uml/api-server.plantuml

@@ -0,0 +1,18 @@
+@startuml
+title API 数据查询服务 (基于IPO模型)
+
+start
+:用户输入查询条件;
+:发送API请求;
+
+if (验证输入合法性?) then (合法)
+  :调用服务处理逻辑;
+  :查询数据库;
+  :获取结果并处理格式;
+else (非法)
+  :返回错误信息;
+endif
+
+:输出查询结果;
+stop
+@enduml

+ 75 - 0
uml/api-service-class.plantuml

@@ -0,0 +1,75 @@
+@startuml
+title 数据集成服务类图
+
+' 数据获取器
+class ApiDataFetcher {
+  - apiEndpoint: String
+  + fetchApiData(String url)
+  + configureApiEndpoint(String endpoint)
+}
+class KafkaDataFetcher {
+  - kafkaBroker: String
+  - groupId: String
+  + fetchKafkaData(String topic)
+  + configureKafka(String broker, String groupId)
+}
+
+' 抽象处理器
+abstract class Handler {
+  - dataFetcher: DataFetcher
+  - dataCache: List<DataModel>
+  + fetchData(): List<DataModel>
+  + processData(List<DataModel> data): void
+  + validateData(DataModel data): boolean
+}
+
+' 具体处理器
+class AwarenessHandler
+class NetworkHandler
+class DcimHandler
+class CloudHandler
+class MonitoringHandler
+class CDOSHandler
+
+' 数据集成服务
+class IntegrationService {
+  - handlers: List<Handler>
+  + DataIntegrate()
+  + registerHandler(Handler handler): void
+  + scheduleIntegration(): void
+  + generateReport(): String
+}
+
+' 数据库服务
+class DatabaseService {
+  + saveData(data: List<DataModel>)
+  + queryData(String condition): List<DataModel>
+  + deleteData(String condition): void
+  + updateData(DataModel newData): void
+}
+
+' 数据模型
+class DataModel {
+  + id: int
+  + name: String
+  + value: String
+  + timestamp: String
+  + source: String
+}
+
+' 继承关系
+Handler <|-- AwarenessHandler
+Handler <|-- NetworkHandler
+Handler <|-- DcimHandler
+Handler <|-- CloudHandler
+Handler <|-- MonitoringHandler
+Handler <|-- CDOSHandler
+
+' 依赖关系
+Handler --> ApiDataFetcher : uses
+Handler --> KafkaDataFetcher : uses
+IntegrationService --> Handler : uses
+IntegrationService --> DatabaseService : stores
+DatabaseService --> DataModel : saves
+
+@enduml

+ 40 - 0
uml/model.plantuml

@@ -0,0 +1,40 @@
+@startuml
+
+!define RECTANGLE class
+
+' 外部数据获取模块
+package "外部接口获取数据" {
+    RECTANGLE ExternalSystem {
+        :外部系统;
+    }
+
+    RECTANGLE DataFetcher {
+        :数据抓取器;
+        :(抓取和存储数据);
+    }
+
+    ExternalSystem -down-> DataFetcher : 获取数据
+    DataFetcher -down-> Database : 存储数据
+}
+
+' 提供接口查询模块
+package "查询接口提供模块" {
+    RECTANGLE QueryAPI {
+        :查询API接口;
+        :(向外部提供查询接口);
+    }
+
+    RECTANGLE Database {
+        :数据库;
+        :(存储所有数据);
+    }
+
+    QueryAPI -down-> Database : 查询数据
+}
+
+' 流程描述
+ExternalSystem -> DataFetcher : 拉取数据
+DataFetcher -> Database : 存储数据
+QueryAPI -> Database : 提供数据查询
+
+@enduml

+ 35 - 0
uml/processor.plantuml

@@ -0,0 +1,35 @@
+@startuml
+start
+
+:初始化流程;
+
+:数据获取阶段;
+:从 API 调用数据;
+:从 Kafka 调用数据;
+
+:数据处理阶段;
+
+fork
+    :态势感知数据集成;
+fork again
+    :综合网管数据集成;
+fork again
+    :DCIM平台数据集成;
+fork again
+    :网管平台数据集成;
+fork again
+    :IT综合监控数据集成;
+fork again
+    :CDOS数据集成;
+end fork
+
+:数据存储阶段;
+:保存数据到数据库;
+
+:集成与调度阶段;
+:调度集成任务;
+
+:流程结束;
+
+stop
+@enduml

BIN
uml/processor.png


+ 1 - 1
zyc-admin/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 56 - 54
zyc-admin/src/main/java/com/zyc/web/controller/api/AiComputingInstancesController.java

@@ -1,30 +1,34 @@
 package com.zyc.web.controller.api;
 
 import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
 import com.zyc.common.core.controller.BaseController;
 import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
 import com.zyc.system.domain.AiComputingInstances;
 import com.zyc.system.service.IAiComputingInstancesService;
+import com.zyc.common.utils.poi.ExcelUtil;
 import com.zyc.common.core.page.TableDataInfo;
 
 /**
  * AI算力服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
-@Api(value="AI算力服务", tags="AI算力服务")
-@RequestMapping("/ai-computing")
+@RequestMapping("/system/AiComputingInstancesController")
 public class AiComputingInstancesController extends BaseController
 {
     @Autowired
@@ -33,7 +37,6 @@ public class AiComputingInstancesController extends BaseController
     /**
      * 查询AI算力服务列表
      */
-    @ApiOperation("查询AI算力服务列表")
     @PreAuthorize("@ss.hasPermi('system:instances:list')")
     @GetMapping("/list")
     public TableDataInfo list(AiComputingInstances aiComputingInstances)
@@ -42,61 +45,60 @@ public class AiComputingInstancesController extends BaseController
         List<AiComputingInstances> list = aiComputingInstancesService.selectAiComputingInstancesList(aiComputingInstances);
         return getDataTable(list);
     }
-//
-//    /**
-//     * 导出AI算力服务列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:instances:export')")
-//    @Log(title = "AI算力服务", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, AiComputingInstances aiComputingInstances)
-//    {
-//        List<AiComputingInstances> list = aiComputingInstancesService.selectAiComputingInstancesList(aiComputingInstances);
-//        ExcelUtil<AiComputingInstances> util = new ExcelUtil<AiComputingInstances>(AiComputingInstances.class);
-//        util.exportExcel(response, list, "AI算力服务数据");
-//    }
+
+    /**
+     * 导出AI算力服务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:instances:export')")
+    @Log(title = "AI算力服务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AiComputingInstances aiComputingInstances)
+    {
+        List<AiComputingInstances> list = aiComputingInstancesService.selectAiComputingInstancesList(aiComputingInstances);
+        ExcelUtil<AiComputingInstances> util = new ExcelUtil<AiComputingInstances>(AiComputingInstances.class);
+        util.exportExcel(response, list, "AI算力服务数据");
+    }
 
     /**
      * 获取AI算力服务详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:instances:query')")
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据id查询AI算力服务列表")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
         return success(aiComputingInstancesService.selectAiComputingInstancesById(id));
     }
 
-//    /**
-//     * 新增AI算力服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:instances:add')")
-//    @Log(title = "AI算力服务", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody AiComputingInstances aiComputingInstances)
-//    {
-//        return toAjax(aiComputingInstancesService.insertAiComputingInstances(aiComputingInstances));
-//    }
-//
-//    /**
-//     * 修改AI算力服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:instances:edit')")
-//    @Log(title = "AI算力服务", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody AiComputingInstances aiComputingInstances)
-//    {
-//        return toAjax(aiComputingInstancesService.updateAiComputingInstances(aiComputingInstances));
-//    }
-//
-//    /**
-//     * 删除AI算力服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:instances:remove')")
-//    @Log(title = "AI算力服务", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Integer[] ids)
-//    {
-//        return toAjax(aiComputingInstancesService.deleteAiComputingInstancesByIds(ids));
-//    }
+    /**
+     * 新增AI算力服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:instances:add')")
+    @Log(title = "AI算力服务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AiComputingInstances aiComputingInstances)
+    {
+        return toAjax(aiComputingInstancesService.insertAiComputingInstances(aiComputingInstances));
+    }
+
+    /**
+     * 修改AI算力服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:instances:edit')")
+    @Log(title = "AI算力服务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AiComputingInstances aiComputingInstances)
+    {
+        return toAjax(aiComputingInstancesService.updateAiComputingInstances(aiComputingInstances));
+    }
+
+    /**
+     * 删除AI算力服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:instances:remove')")
+    @Log(title = "AI算力服务", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(aiComputingInstancesService.deleteAiComputingInstancesByIds(ids));
+    }
 }

+ 55 - 55
zyc-admin/src/main/java/com/zyc/web/controller/api/AlarmInfoController.java

@@ -1,31 +1,34 @@
 package com.zyc.web.controller.api;
 
 import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
 import com.zyc.common.core.controller.BaseController;
 import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
 import com.zyc.system.domain.AlarmInfo;
 import com.zyc.system.service.IAlarmInfoService;
+import com.zyc.common.utils.poi.ExcelUtil;
 import com.zyc.common.core.page.TableDataInfo;
 
 /**
  * 告警信息Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
-@Api(tags = "告警信息")
-
-@RequestMapping("/alarm_info")
+@RequestMapping("/system/AlarmInfoController")
 public class AlarmInfoController extends BaseController
 {
     @Autowired
@@ -34,7 +37,6 @@ public class AlarmInfoController extends BaseController
     /**
      * 查询告警信息列表
      */
-    @ApiOperation("查询告警信息列表")
     @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(AlarmInfo alarmInfo)
@@ -44,24 +46,22 @@ public class AlarmInfoController extends BaseController
         return getDataTable(list);
     }
 
-//    /**
-//     * 导出告警信息列表
-//     */
-//
-//    @PreAuthorize("@ss.hasPermi('system:info:export')")
-//    @Log(title = "告警信息", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, AlarmInfo alarmInfo)
-//    {
-//        List<AlarmInfo> list = alarmInfoService.selectAlarmInfoList(alarmInfo);
-//        ExcelUtil<AlarmInfo> util = new ExcelUtil<AlarmInfo>(AlarmInfo.class);
-//        util.exportExcel(response, list, "告警信息数据");
-//    }
+    /**
+     * 导出告警信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "告警信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AlarmInfo alarmInfo)
+    {
+        List<AlarmInfo> list = alarmInfoService.selectAlarmInfoList(alarmInfo);
+        ExcelUtil<AlarmInfo> util = new ExcelUtil<AlarmInfo>(AlarmInfo.class);
+        util.exportExcel(response, list, "告警信息数据");
+    }
 
     /**
      * 获取告警信息详细信息
      */
-     @ApiOperation("根据id查询告警信息列表")
     @PreAuthorize("@ss.hasPermi('system:info:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
@@ -69,36 +69,36 @@ public class AlarmInfoController extends BaseController
         return success(alarmInfoService.selectAlarmInfoById(id));
     }
 
-//    /**
-//     * 新增告警信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:info:add')")
-//    @Log(title = "告警信息", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody AlarmInfo alarmInfo)
-//    {
-//        return toAjax(alarmInfoService.insertAlarmInfo(alarmInfo));
-//    }
-//
-//    /**
-//     * 修改告警信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:info:edit')")
-//    @Log(title = "告警信息", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody AlarmInfo alarmInfo)
-//    {
-//        return toAjax(alarmInfoService.updateAlarmInfo(alarmInfo));
-//    }
-//
-//    /**
-//     * 删除告警信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:info:remove')")
-//    @Log(title = "告警信息", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Integer[] ids)
-//    {
-//        return toAjax(alarmInfoService.deleteAlarmInfoByIds(ids));
-//    }
+    /**
+     * 新增告警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "告警信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AlarmInfo alarmInfo)
+    {
+        return toAjax(alarmInfoService.insertAlarmInfo(alarmInfo));
+    }
+
+    /**
+     * 修改告警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "告警信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AlarmInfo alarmInfo)
+    {
+        return toAjax(alarmInfoService.updateAlarmInfo(alarmInfo));
+    }
+
+    /**
+     * 删除告警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "告警信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(alarmInfoService.deleteAlarmInfoByIds(ids));
+    }
 }

+ 55 - 53
zyc-admin/src/main/java/com/zyc/web/controller/api/AmsApplicationGridServicesController.java

@@ -1,30 +1,34 @@
 package com.zyc.web.controller.api;
 
 import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
 import com.zyc.common.core.controller.BaseController;
 import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
 import com.zyc.system.domain.AmsApplicationGridServices;
 import com.zyc.system.service.IAmsApplicationGridServicesService;
+import com.zyc.common.utils.poi.ExcelUtil;
 import com.zyc.common.core.page.TableDataInfo;
 
 /**
  * AMS应用网格服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
-@Api(tags = "ASM应⽤服务⽹格服务")
-@RequestMapping("/asm_service")
+@RequestMapping("/system/AmsApplicationGridServicesController")
 public class AmsApplicationGridServicesController extends BaseController
 {
     @Autowired
@@ -33,7 +37,6 @@ public class AmsApplicationGridServicesController extends BaseController
     /**
      * 查询AMS应用网格服务列表
      */
-    @ApiOperation("查询ASM应⽤服务⽹格服务列表")
     @PreAuthorize("@ss.hasPermi('system:services:list')")
     @GetMapping("/list")
     public TableDataInfo list(AmsApplicationGridServices amsApplicationGridServices)
@@ -43,60 +46,59 @@ public class AmsApplicationGridServicesController extends BaseController
         return getDataTable(list);
     }
 
-//    /**
-//     * 导出AMS应用网格服务列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:services:export')")
-//    @Log(title = "AMS应用网格服务", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, AmsApplicationGridServices amsApplicationGridServices)
-//    {
-//        List<AmsApplicationGridServices> list = amsApplicationGridServicesService.selectAmsApplicationGridServicesList(amsApplicationGridServices);
-//        ExcelUtil<AmsApplicationGridServices> util = new ExcelUtil<AmsApplicationGridServices>(AmsApplicationGridServices.class);
-//        util.exportExcel(response, list, "AMS应用网格服务数据");
-//    }
+    /**
+     * 导出AMS应用网格服务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:services:export')")
+    @Log(title = "AMS应用网格服务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AmsApplicationGridServices amsApplicationGridServices)
+    {
+        List<AmsApplicationGridServices> list = amsApplicationGridServicesService.selectAmsApplicationGridServicesList(amsApplicationGridServices);
+        ExcelUtil<AmsApplicationGridServices> util = new ExcelUtil<AmsApplicationGridServices>(AmsApplicationGridServices.class);
+        util.exportExcel(response, list, "AMS应用网格服务数据");
+    }
 
     /**
      * 获取AMS应用网格服务详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:services:query')")
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据id查询ASM应⽤服务⽹格服务")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
         return success(amsApplicationGridServicesService.selectAmsApplicationGridServicesById(id));
     }
 
-//    /**
-//     * 新增AMS应用网格服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:services:add')")
-//    @Log(title = "AMS应用网格服务", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody AmsApplicationGridServices amsApplicationGridServices)
-//    {
-//        return toAjax(amsApplicationGridServicesService.insertAmsApplicationGridServices(amsApplicationGridServices));
-//    }
-//
-//    /**
-//     * 修改AMS应用网格服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:services:edit')")
-//    @Log(title = "AMS应用网格服务", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody AmsApplicationGridServices amsApplicationGridServices)
-//    {
-//        return toAjax(amsApplicationGridServicesService.updateAmsApplicationGridServices(amsApplicationGridServices));
-//    }
-//
-//    /**
-//     * 删除AMS应用网格服务
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:services:remove')")
-//    @Log(title = "AMS应用网格服务", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Integer[] ids)
-//    {
-//        return toAjax(amsApplicationGridServicesService.deleteAmsApplicationGridServicesByIds(ids));
-//    }
+    /**
+     * 新增AMS应用网格服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:services:add')")
+    @Log(title = "AMS应用网格服务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AmsApplicationGridServices amsApplicationGridServices)
+    {
+        return toAjax(amsApplicationGridServicesService.insertAmsApplicationGridServices(amsApplicationGridServices));
+    }
+
+    /**
+     * 修改AMS应用网格服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:services:edit')")
+    @Log(title = "AMS应用网格服务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AmsApplicationGridServices amsApplicationGridServices)
+    {
+        return toAjax(amsApplicationGridServicesService.updateAmsApplicationGridServices(amsApplicationGridServices));
+    }
+
+    /**
+     * 删除AMS应用网格服务
+     */
+    @PreAuthorize("@ss.hasPermi('system:services:remove')")
+    @Log(title = "AMS应用网格服务", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(amsApplicationGridServicesService.deleteAmsApplicationGridServicesByIds(ids));
+    }
 }

+ 104 - 0
zyc-admin/src/main/java/com/zyc/web/controller/api/ApiInterfaceController.java

@@ -0,0 +1,104 @@
+package com.zyc.web.controller.api;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
+import com.zyc.common.core.controller.BaseController;
+import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
+import com.zyc.system.domain.ApiInterface;
+import com.zyc.system.service.IApiInterfaceService;
+import com.zyc.common.utils.poi.ExcelUtil;
+import com.zyc.common.core.page.TableDataInfo;
+
+/**
+ * API接口清单Controller
+ * 
+ * @author zyc
+ * @date 2024-12-26
+ */
+@RestController
+@RequestMapping("/system/ApiInterfaceController")
+public class ApiInterfaceController extends BaseController
+{
+    @Autowired
+    private IApiInterfaceService apiInterfaceService;
+
+    /**
+     * 查询API接口清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ApiInterface apiInterface)
+    {
+        startPage();
+        List<ApiInterface> list = apiInterfaceService.selectApiInterfaceList(apiInterface);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出API接口清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:export')")
+    @Log(title = "API接口清单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ApiInterface apiInterface)
+    {
+        List<ApiInterface> list = apiInterfaceService.selectApiInterfaceList(apiInterface);
+        ExcelUtil<ApiInterface> util = new ExcelUtil<ApiInterface>(ApiInterface.class);
+        util.exportExcel(response, list, "API接口清单数据");
+    }
+
+    /**
+     * 获取API接口清单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(apiInterfaceService.selectApiInterfaceById(id));
+    }
+
+    /**
+     * 新增API接口清单
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:add')")
+    @Log(title = "API接口清单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ApiInterface apiInterface)
+    {
+        return toAjax(apiInterfaceService.insertApiInterface(apiInterface));
+    }
+
+    /**
+     * 修改API接口清单
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:edit')")
+    @Log(title = "API接口清单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ApiInterface apiInterface)
+    {
+        return toAjax(apiInterfaceService.updateApiInterface(apiInterface));
+    }
+
+    /**
+     * 删除API接口清单
+     */
+    @PreAuthorize("@ss.hasPermi('system:interface:remove')")
+    @Log(title = "API接口清单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(apiInterfaceService.deleteApiInterfaceByIds(ids));
+    }
+}

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ApmApplicationPerformanceManagementServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * APM应用性能管理服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ApmApplicationPerformanceManagementServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ApplicationDataIntegrationServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 应用与数据集成平台服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ApplicationDataIntegrationServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/BareMetalInstancesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 定制裸金属服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/BareMetalInstancesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/BigDataComputeServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 大数据计算服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/BigDataComputeServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/CabinetsController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 机柜信息Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/CabinetsController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/CloudDiskServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 云硬盘存储服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/CloudDiskServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/CloudInstancesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 云主机服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/CloudInstancesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ComputerRoomsController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 机房Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ComputerRoomsController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ContainerServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 容器服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ContainerServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DamengDatabaseServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 达梦数据库服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DamengDatabaseServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DataCentersController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 数据中心Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DataCentersController")

+ 2 - 5
zyc-admin/src/main/java/com/zyc/web/controller/api/DataGovernanceServicesController.java

@@ -2,8 +2,6 @@ package com.zyc.web.controller.api;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,14 +24,13 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 数据治理平台服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DataGovernanceServicesController")
 public class DataGovernanceServicesController extends BaseController
 {
-    @Qualifier("dataGovernanceServicesServiceImpl")
     @Autowired
     private IDataGovernanceServicesService dataGovernanceServicesService;
 

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DevicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 设备基本信息Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DevicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DictDataController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 字典数据Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DictDataController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DictTypeController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 字典类型Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DictTypeController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DisasterRecoveryServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 灾备服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DisasterRecoveryServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DistributedCacheServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 分布式缓存服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DistributedCacheServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/DomainResolutionController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 域名解析Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/DomainResolutionController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/EGovernmentNetworkController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 电子政务网Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/EGovernmentNetworkController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ElasticIpServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 弹性IP服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ElasticIpServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ElasticScalingServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 弹性伸缩服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ElasticScalingServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/FileStorageServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 文件存储服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/FileStorageServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/GovernmentCloudDedicatedLineController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 政务云专线Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/GovernmentCloudDedicatedLineController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/GovernmentExtranetAccessController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 政务外网接入Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/GovernmentExtranetAccessController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ImageServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 镜像服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ImageServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/IpAddressResourcesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * IP地址资源Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/IpAddressResourcesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/KunpengDesktopCloudHostsController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 鲲鹏桌面云主机Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/KunpengDesktopCloudHostsController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/KunpengDesktopCloudStorageController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 鲲鹏桌面云云硬盘存储Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/KunpengDesktopCloudStorageController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/LoadBalancerServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 负载均衡服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/LoadBalancerServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/MassiveDatabaseServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 海量数据库服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/MassiveDatabaseServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/MicroservicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 微服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/MicroservicesController")

+ 104 - 0
zyc-admin/src/main/java/com/zyc/web/controller/api/NetworkMapController.java

@@ -0,0 +1,104 @@
+package com.zyc.web.controller.api;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
+import com.zyc.common.core.controller.BaseController;
+import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
+import com.zyc.system.domain.NetworkMap;
+import com.zyc.system.service.INetworkMapService;
+import com.zyc.common.utils.poi.ExcelUtil;
+import com.zyc.common.core.page.TableDataInfo;
+
+/**
+ * 网络拓扑Controller
+ * 
+ * @author zyc
+ * @date 2024-12-26
+ */
+@RestController
+@RequestMapping("/system/NetworkMapController")
+public class NetworkMapController extends BaseController
+{
+    @Autowired
+    private INetworkMapService networkMapService;
+
+    /**
+     * 查询网络拓扑列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(NetworkMap networkMap)
+    {
+        startPage();
+        List<NetworkMap> list = networkMapService.selectNetworkMapList(networkMap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出网络拓扑列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:export')")
+    @Log(title = "网络拓扑", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, NetworkMap networkMap)
+    {
+        List<NetworkMap> list = networkMapService.selectNetworkMapList(networkMap);
+        ExcelUtil<NetworkMap> util = new ExcelUtil<NetworkMap>(NetworkMap.class);
+        util.exportExcel(response, list, "网络拓扑数据");
+    }
+
+    /**
+     * 获取网络拓扑详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(networkMapService.selectNetworkMapById(id));
+    }
+
+    /**
+     * 新增网络拓扑
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:add')")
+    @Log(title = "网络拓扑", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody NetworkMap networkMap)
+    {
+        return toAjax(networkMapService.insertNetworkMap(networkMap));
+    }
+
+    /**
+     * 修改网络拓扑
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:edit')")
+    @Log(title = "网络拓扑", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody NetworkMap networkMap)
+    {
+        return toAjax(networkMapService.updateNetworkMap(networkMap));
+    }
+
+    /**
+     * 删除网络拓扑
+     */
+    @PreAuthorize("@ss.hasPermi('system:map:remove')")
+    @Log(title = "网络拓扑", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(networkMapService.deleteNetworkMapByIds(ids));
+    }
+}

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/ObjectStorageServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 对象存储服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/ObjectStorageServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/PortOpeningController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 端口开放Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/PortOpeningController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/RelationalDatabaseServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 关系型数据库服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/RelationalDatabaseServicesController")

+ 104 - 0
zyc-admin/src/main/java/com/zyc/web/controller/api/ResourceMetricsInfoController.java

@@ -0,0 +1,104 @@
+package com.zyc.web.controller.api;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zyc.common.annotation.Log;
+import com.zyc.common.core.controller.BaseController;
+import com.zyc.common.core.domain.AjaxResult;
+import com.zyc.common.enums.BusinessType;
+import com.zyc.system.domain.ResourceMetricsInfo;
+import com.zyc.system.service.IResourceMetricsInfoService;
+import com.zyc.common.utils.poi.ExcelUtil;
+import com.zyc.common.core.page.TableDataInfo;
+
+/**
+ * 资源指标信息Controller
+ * 
+ * @author zyc
+ * @date 2024-12-26
+ */
+@RestController
+@RequestMapping("/system/ResourceMetricsInfoController")
+public class ResourceMetricsInfoController extends BaseController
+{
+    @Autowired
+    private IResourceMetricsInfoService resourceMetricsInfoService;
+
+    /**
+     * 查询资源指标信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ResourceMetricsInfo resourceMetricsInfo)
+    {
+        startPage();
+        List<ResourceMetricsInfo> list = resourceMetricsInfoService.selectResourceMetricsInfoList(resourceMetricsInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资源指标信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "资源指标信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ResourceMetricsInfo resourceMetricsInfo)
+    {
+        List<ResourceMetricsInfo> list = resourceMetricsInfoService.selectResourceMetricsInfoList(resourceMetricsInfo);
+        ExcelUtil<ResourceMetricsInfo> util = new ExcelUtil<ResourceMetricsInfo>(ResourceMetricsInfo.class);
+        util.exportExcel(response, list, "资源指标信息数据");
+    }
+
+    /**
+     * 获取资源指标信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(resourceMetricsInfoService.selectResourceMetricsInfoById(id));
+    }
+
+    /**
+     * 新增资源指标信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "资源指标信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ResourceMetricsInfo resourceMetricsInfo)
+    {
+        return toAjax(resourceMetricsInfoService.insertResourceMetricsInfo(resourceMetricsInfo));
+    }
+
+    /**
+     * 修改资源指标信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "资源指标信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ResourceMetricsInfo resourceMetricsInfo)
+    {
+        return toAjax(resourceMetricsInfoService.updateResourceMetricsInfo(resourceMetricsInfo));
+    }
+
+    /**
+     * 删除资源指标信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "资源指标信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(resourceMetricsInfoService.deleteResourceMetricsInfoByIds(ids));
+    }
+}

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/SecurityGroupServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 安全组服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/SecurityGroupServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/SecurityServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 安全服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/SecurityServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/VirtualPrivateCloudServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 虚拟私有云服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/VirtualPrivateCloudServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/VpnServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 虚拟专用网络VPN服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/VpnServicesController")

+ 2 - 2
zyc-admin/src/main/java/com/zyc/web/controller/api/YashanDatabaseServicesController.java

@@ -24,8 +24,8 @@ import com.zyc.common.core.page.TableDataInfo;
 /**
  * 崖山数据库服务Controller
  * 
- * @author ruoyi
- * @date 2024-12-19
+ * @author zyc
+ * @date 2024-12-26
  */
 @RestController
 @RequestMapping("/system/YashanDatabaseServicesController")

+ 1 - 1
zyc-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DB_HOST}:${DB_PORT}/landian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DB_HOST}:${DB_PORT}/zyc_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DB_USERNAME}
                 password: ${DB_PASSWORD}
             # 从库数据源

+ 1 - 1
zyc-admin/src/main/resources/application.yml

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.zyc: debug
     org.springframework: warn
 
 # 用户配置

+ 1 - 1
zyc-admin/src/main/resources/banner.txt

@@ -1,2 +1,2 @@
-Application Version: ${zyc-server.version}
+Application Version: ${zyc-service.version}
 Spring Boot Version: ${spring-boot.version}

+ 1 - 1
zyc-common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 1 - 1
zyc-framework/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 1 - 1
zyc-generator/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 2 - 2
zyc-generator/src/main/resources/generator.yml

@@ -1,9 +1,9 @@
 # 代码生成
 gen:
   # 作者
-  author: ruoyi
+  author: zyc
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.zyc.system
   # 自动去除表前缀,默认是false
   autoRemovePre: false
   # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)

+ 1 - 1
zyc-quartz/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 1 - 1
zyc-system/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>landian</artifactId>
+        <artifactId>zyc_admin</artifactId>
         <groupId>com.landian</groupId>
         <version>3.8.8</version>
     </parent>

+ 46 - 46
zyc-system/src/main/java/com/zyc/system/domain/AiComputingInstances.java

@@ -2,19 +2,19 @@ package com.zyc.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zyc.common.core.domain.BaseEntity;
+import com.zyc.system.mapper.AiComputingInstancesMapper;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zyc.common.annotation.Excel;
-import com.zyc.common.core.domain.BaseEntity;
 
 /**
  * AI算力服务对象 ai_computing_instances
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
-public class AiComputingInstances extends BaseEntity
-{
+public abstract class AiComputingInstances extends BaseEntity implements AiComputingInstancesMapper {
     private static final long serialVersionUID = 1L;
 
     /** 序号 */
@@ -22,31 +22,31 @@ public class AiComputingInstances extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -134,68 +134,68 @@ public class AiComputingInstances extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -364,13 +364,13 @@ public class AiComputingInstances extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/AlarmInfo.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 告警信息对象 alarm_info
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class AlarmInfo extends BaseEntity
 {

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/AmsApplicationGridServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * AMS应用网格服务对象 ams_application_grid_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class AmsApplicationGridServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class AmsApplicationGridServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -114,68 +114,68 @@ public class AmsApplicationGridServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -299,13 +299,13 @@ public class AmsApplicationGridServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 238 - 0
zyc-system/src/main/java/com/zyc/system/domain/ApiInterface.java

@@ -0,0 +1,238 @@
+package com.zyc.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zyc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zyc.common.annotation.Excel;
+
+/**
+ * API接口清单对象 api_interface
+ * 
+ * @author ruoyi
+ * @date 2024-12-26
+ */
+public class ApiInterface extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Integer id;
+
+    /** 接口版本号 */
+    @Excel(name = "接口版本号")
+    private String version;
+
+    /** 接口名称 */
+    @Excel(name = "接口名称")
+    private String name;
+
+    /** 接口描述 */
+    @Excel(name = "接口描述")
+    private String desc;
+
+    /** 接口URL地址 */
+    @Excel(name = "接口URL地址")
+    private String url;
+
+    /** 请求方法 */
+    @Excel(name = "请求方法")
+    private String method;
+
+    /** 请求参数 */
+    @Excel(name = "请求参数")
+    private String requestParams;
+
+    /** 响应结果 */
+    @Excel(name = "响应结果")
+    private String responseResult;
+
+    /** 创建者 */
+    @Excel(name = "创建者")
+    private Integer createdBy;
+
+    /** 更新者 */
+    @Excel(name = "更新者")
+    private Integer updatedBy;
+
+    /** 删除者 */
+    @Excel(name = "删除者")
+    private Integer deletedBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdAt;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedAt;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deletedAt;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer deletedFlag;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setVersion(String version) 
+    {
+        this.version = version;
+    }
+
+    public String getVersion() 
+    {
+        return version;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setDesc(String desc) 
+    {
+        this.desc = desc;
+    }
+
+    public String getDesc() 
+    {
+        return desc;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+    public void setMethod(String method) 
+    {
+        this.method = method;
+    }
+
+    public String getMethod() 
+    {
+        return method;
+    }
+    public void setRequestParams(String requestParams) 
+    {
+        this.requestParams = requestParams;
+    }
+
+    public String getRequestParams() 
+    {
+        return requestParams;
+    }
+    public void setResponseResult(String responseResult) 
+    {
+        this.responseResult = responseResult;
+    }
+
+    public String getResponseResult() 
+    {
+        return responseResult;
+    }
+    public void setCreatedBy(Integer createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public Integer getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setUpdatedBy(Integer updatedBy) 
+    {
+        this.updatedBy = updatedBy;
+    }
+
+    public Integer getUpdatedBy() 
+    {
+        return updatedBy;
+    }
+    public void setDeletedBy(Integer deletedBy) 
+    {
+        this.deletedBy = deletedBy;
+    }
+
+    public Integer getDeletedBy() 
+    {
+        return deletedBy;
+    }
+    public void setCreatedAt(Date createdAt) 
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Date getCreatedAt() 
+    {
+        return createdAt;
+    }
+    public void setUpdatedAt(Date updatedAt) 
+    {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getUpdatedAt() 
+    {
+        return updatedAt;
+    }
+    public void setDeletedAt(Date deletedAt) 
+    {
+        this.deletedAt = deletedAt;
+    }
+
+    public Date getDeletedAt() 
+    {
+        return deletedAt;
+    }
+    public void setDeletedFlag(Integer deletedFlag) 
+    {
+        this.deletedFlag = deletedFlag;
+    }
+
+    public Integer getDeletedFlag() 
+    {
+        return deletedFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("version", getVersion())
+            .append("name", getName())
+            .append("desc", getDesc())
+            .append("url", getUrl())
+            .append("method", getMethod())
+            .append("requestParams", getRequestParams())
+            .append("responseResult", getResponseResult())
+            .append("createdBy", getCreatedBy())
+            .append("updatedBy", getUpdatedBy())
+            .append("deletedBy", getDeletedBy())
+            .append("createdAt", getCreatedAt())
+            .append("updatedAt", getUpdatedAt())
+            .append("deletedAt", getDeletedAt())
+            .append("deletedFlag", getDeletedFlag())
+            .toString();
+    }
+}

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/ApmApplicationPerformanceManagementServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * APM应用性能管理服务对象 apm_application_performance_management_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ApmApplicationPerformanceManagementServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class ApmApplicationPerformanceManagementServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -106,68 +106,68 @@ public class ApmApplicationPerformanceManagementServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -273,13 +273,13 @@ public class ApmApplicationPerformanceManagementServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 44 - 44
zyc-system/src/main/java/com/zyc/system/domain/ApplicationDataIntegrationServices.java

@@ -5,13 +5,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zyc.common.annotation.Excel;
-import com.zyc.common.core.domain.BaseEntity;
 
+import com.zyc.common.core.domain.BaseEntity;
 /**
  * 应用与数据集成平台服务对象 application_data_integration_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ApplicationDataIntegrationServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class ApplicationDataIntegrationServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -110,68 +110,68 @@ public class ApplicationDataIntegrationServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -286,13 +286,13 @@ public class ApplicationDataIntegrationServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/BareMetalInstances.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 定制裸金属服务对象 bare_metal_instances
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class BareMetalInstances extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class BareMetalInstances extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -154,68 +154,68 @@ public class BareMetalInstances extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -429,13 +429,13 @@ public class BareMetalInstances extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/BigDataComputeServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 大数据计算服务对象 big_data_compute_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class BigDataComputeServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class BigDataComputeServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -110,68 +110,68 @@ public class BigDataComputeServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -286,13 +286,13 @@ public class BigDataComputeServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/Cabinets.java

@@ -12,7 +12,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 机柜信息对象 cabinets
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class Cabinets extends BaseEntity
 {

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/CloudDiskServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 云硬盘存储服务对象 cloud_disk_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class CloudDiskServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class CloudDiskServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class CloudDiskServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -122,68 +126,68 @@ public class CloudDiskServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -212,6 +216,15 @@ public class CloudDiskServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -325,16 +338,17 @@ public class CloudDiskServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("diskId", getDiskId())

+ 44 - 44
zyc-system/src/main/java/com/zyc/system/domain/CloudInstances.java

@@ -5,13 +5,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zyc.common.annotation.Excel;
-import com.zyc.common.core.domain.BaseEntity;
 
+import com.zyc.common.core.domain.BaseEntity;
 /**
  * 云主机服务对象 cloud_instances
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class CloudInstances extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class CloudInstances extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -154,68 +154,68 @@ public class CloudInstances extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -429,13 +429,13 @@ public class CloudInstances extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/ComputerRooms.java

@@ -12,7 +12,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 机房对象 computer_rooms
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ComputerRooms extends BaseEntity
 {

+ 44 - 43
zyc-system/src/main/java/com/zyc/system/domain/ContainerServices.java

@@ -2,6 +2,7 @@ package com.zyc.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zyc.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zyc.common.annotation.Excel;
@@ -11,7 +12,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 容器服务对象 container_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ContainerServices extends BaseEntity
 {
@@ -22,31 +23,31 @@ public class ContainerServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -114,68 +115,68 @@ public class ContainerServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -299,13 +300,13 @@ public class ContainerServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/DamengDatabaseServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 达梦数据库服务对象 dameng_database_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DamengDatabaseServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class DamengDatabaseServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -135,68 +135,68 @@ public class DamengDatabaseServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -365,13 +365,13 @@ public class DamengDatabaseServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/DataCenters.java

@@ -12,7 +12,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 数据中心对象 data_centers
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DataCenters extends BaseEntity
 {

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/DataGovernanceServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 数据治理平台服务对象 data_governance_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DataGovernanceServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class DataGovernanceServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -118,68 +118,68 @@ public class DataGovernanceServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -312,13 +312,13 @@ public class DataGovernanceServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 57 - 87
zyc-system/src/main/java/com/zyc/system/domain/Devices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 设备基本信息对象 devices
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class Devices extends BaseEntity
 {
@@ -22,49 +22,39 @@ public class Devices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
     private String systemName;
 
-    /** 申请时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date applicationTime;
-
-    /** 回收时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date recoveryTime;
-
-    /** 接入网络 */
-    @Excel(name = "接入网络")
-    private String accessNetwork;
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String assetNumber;
 
     /** 设备序列号 */
     @Excel(name = "设备序列号")
@@ -104,7 +94,7 @@ public class Devices extends BaseEntity
 
     /** 所属机柜 */
     @Excel(name = "所属机柜")
-    private String cabinet;
+    private Integer cabinetId;
 
     /** 电源模块 */
     @Excel(name = "电源模块")
@@ -182,68 +172,68 @@ public class Devices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -254,32 +244,14 @@ public class Devices extends BaseEntity
     {
         return systemName;
     }
-    public void setApplicationTime(Date applicationTime) 
-    {
-        this.applicationTime = applicationTime;
-    }
-
-    public Date getApplicationTime() 
-    {
-        return applicationTime;
-    }
-    public void setRecoveryTime(Date recoveryTime) 
-    {
-        this.recoveryTime = recoveryTime;
-    }
-
-    public Date getRecoveryTime() 
-    {
-        return recoveryTime;
-    }
-    public void setAccessNetwork(String accessNetwork) 
+    public void setAssetNumber(String assetNumber) 
     {
-        this.accessNetwork = accessNetwork;
+        this.assetNumber = assetNumber;
     }
 
-    public String getAccessNetwork() 
+    public String getAssetNumber() 
     {
-        return accessNetwork;
+        return assetNumber;
     }
     public void setSn(String sn) 
     {
@@ -362,14 +334,14 @@ public class Devices extends BaseEntity
     {
         return uEnd;
     }
-    public void setCabinet(String cabinet) 
+    public void setCabinetId(Integer cabinetId) 
     {
-        this.cabinet = cabinet;
+        this.cabinetId = cabinetId;
     }
 
-    public String getCabinet() 
+    public Integer getCabinetId() 
     {
-        return cabinet;
+        return cabinetId;
     }
     public void setDoublePower(String doublePower) 
     {
@@ -520,17 +492,15 @@ public class Devices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
-            .append("applicationTime", getApplicationTime())
-            .append("recoveryTime", getRecoveryTime())
-            .append("accessNetwork", getAccessNetwork())
+            .append("assetNumber", getAssetNumber())
             .append("sn", getSn())
             .append("deviceName", getDeviceName())
             .append("manufacturer", getManufacturer())
@@ -540,7 +510,7 @@ public class Devices extends BaseEntity
             .append("uHeight", getuHeight())
             .append("uBegin", getuBegin())
             .append("uEnd", getuEnd())
-            .append("cabinet", getCabinet())
+            .append("cabinetId", getCabinetId())
             .append("doublePower", getDoublePower())
             .append("hardwareConfig", getHardwareConfig())
             .append("applicationDesc", getApplicationDesc())

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/DictData.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 字典数据对象 dict_data
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DictData extends BaseEntity
 {

+ 1 - 1
zyc-system/src/main/java/com/zyc/system/domain/DictType.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 字典类型对象 dict_type
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DictType extends BaseEntity
 {

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/DisasterRecoveryServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 灾备服务对象 disaster_recovery_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DisasterRecoveryServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class DisasterRecoveryServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -110,68 +110,68 @@ public class DisasterRecoveryServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -286,13 +286,13 @@ public class DisasterRecoveryServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/DistributedCacheServices.java

@@ -12,7 +12,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 分布式缓存服务对象 distributed_cache_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DistributedCacheServices extends BaseEntity
 {
@@ -23,31 +23,31 @@ public class DistributedCacheServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -63,6 +63,10 @@ public class DistributedCacheServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -119,68 +123,68 @@ public class DistributedCacheServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -209,6 +213,15 @@ public class DistributedCacheServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -313,16 +326,17 @@ public class DistributedCacheServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("deploymentType", getDeploymentType())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/DomainResolution.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 域名解析对象 domain_resolution
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class DomainResolution extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class DomainResolution extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -114,68 +114,68 @@ public class DomainResolution extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -299,13 +299,13 @@ public class DomainResolution extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/EGovernmentNetwork.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 电子政务网对象 e_government_network
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class EGovernmentNetwork extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class EGovernmentNetwork extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -126,68 +126,68 @@ public class EGovernmentNetwork extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -338,13 +338,13 @@ public class EGovernmentNetwork extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/ElasticIpServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 弹性IP服务对象 elastic_ip_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ElasticIpServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class ElasticIpServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class ElasticIpServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -122,68 +126,68 @@ public class ElasticIpServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -212,6 +216,15 @@ public class ElasticIpServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -325,16 +338,17 @@ public class ElasticIpServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("ipType", getIpType())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/ElasticScalingServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 弹性伸缩服务对象 elastic_scaling_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ElasticScalingServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class ElasticScalingServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class ElasticScalingServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -114,68 +118,68 @@ public class ElasticScalingServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -204,6 +208,15 @@ public class ElasticScalingServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -299,16 +312,17 @@ public class ElasticScalingServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("policy", getPolicy())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/FileStorageServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 文件存储服务对象 file_storage_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class FileStorageServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class FileStorageServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class FileStorageServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -118,68 +122,68 @@ public class FileStorageServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -208,6 +212,15 @@ public class FileStorageServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -312,16 +325,17 @@ public class FileStorageServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("name", getName())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/GovernmentCloudDedicatedLine.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 政务云专线对象 government_cloud_dedicated_line
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class GovernmentCloudDedicatedLine extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class GovernmentCloudDedicatedLine extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -138,68 +138,68 @@ public class GovernmentCloudDedicatedLine extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -377,13 +377,13 @@ public class GovernmentCloudDedicatedLine extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/GovernmentExtranetAccess.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 政务外网接入对象 government_extranet_access
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class GovernmentExtranetAccess extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class GovernmentExtranetAccess extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -126,68 +126,68 @@ public class GovernmentExtranetAccess extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -338,13 +338,13 @@ public class GovernmentExtranetAccess extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/ImageServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 镜像服务对象 image_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class ImageServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class ImageServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class ImageServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -122,68 +126,68 @@ public class ImageServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -212,6 +216,15 @@ public class ImageServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -325,16 +338,17 @@ public class ImageServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("imageId", getImageId())

+ 26 - 26
zyc-system/src/main/java/com/zyc/system/domain/IpAddressResources.java

@@ -2,16 +2,16 @@ package com.zyc.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zyc.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zyc.common.annotation.Excel;
-import com.zyc.common.core.domain.BaseEntity;
 
 /**
  * IP地址资源对象 ip_address_resources
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class IpAddressResources extends BaseEntity
 {
@@ -22,19 +22,19 @@ public class IpAddressResources extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 单位名称 */
     @Excel(name = "单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 联系人 */
     @Excel(name = "联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 联系电话 */
     @Excel(name = "联系电话")
-    private String systemManagerPhone;
+    private String applicantNamePhone;
 
     /** 技术负责人 */
     @Excel(name = "技术负责人")
@@ -144,41 +144,41 @@ public class IpAddressResources extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setSystemManagerPhone(String systemManagerPhone) 
+    public void setApplicantNamePhone(String applicantNamePhone) 
     {
-        this.systemManagerPhone = systemManagerPhone;
+        this.applicantNamePhone = applicantNamePhone;
     }
 
-    public String getSystemManagerPhone() 
+    public String getApplicantNamePhone() 
     {
-        return systemManagerPhone;
+        return applicantNamePhone;
     }
     public void setTechnicalManager(String technicalManager) 
     {
@@ -401,10 +401,10 @@ public class IpAddressResources extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("systemManagerPhone", getSystemManagerPhone())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantNamePhone", getApplicantNamePhone())
             .append("technicalManager", getTechnicalManager())
             .append("technicalManagerPhone", getTechnicalManagerPhone())
             .append("systemName", getSystemName())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/KunpengDesktopCloudHosts.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 鲲鹏桌面云主机对象 kunpeng_desktop_cloud_hosts
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class KunpengDesktopCloudHosts extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class KunpengDesktopCloudHosts extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -146,68 +146,68 @@ public class KunpengDesktopCloudHosts extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -403,13 +403,13 @@ public class KunpengDesktopCloudHosts extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/KunpengDesktopCloudStorage.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 鲲鹏桌面云云硬盘存储对象 kunpeng_desktop_cloud_storage
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class KunpengDesktopCloudStorage extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class KunpengDesktopCloudStorage extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -118,68 +118,68 @@ public class KunpengDesktopCloudStorage extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -312,13 +312,13 @@ public class KunpengDesktopCloudStorage extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 57 - 43
zyc-system/src/main/java/com/zyc/system/domain/LoadBalancerServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 负载均衡服务对象 load_balancer_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class LoadBalancerServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class LoadBalancerServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -62,6 +62,10 @@ public class LoadBalancerServices extends BaseEntity
     @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recoveryTime;
 
+    /** 实例类型 */
+    @Excel(name = "实例类型")
+    private Integer instanceType;
+
     /** 实例ID */
     @Excel(name = "实例ID")
     private String instanceId;
@@ -114,68 +118,68 @@ public class LoadBalancerServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -204,6 +208,15 @@ public class LoadBalancerServices extends BaseEntity
     {
         return recoveryTime;
     }
+    public void setInstanceType(Integer instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public Integer getInstanceType() 
+    {
+        return instanceType;
+    }
     public void setInstanceId(String instanceId) 
     {
         this.instanceId = instanceId;
@@ -299,16 +312,17 @@ public class LoadBalancerServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())
+            .append("instanceType", getInstanceType())
             .append("instanceId", getInstanceId())
             .append("instanceName", getInstanceName())
             .append("instanceIds", getInstanceIds())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/MassiveDatabaseServices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 海量数据库服务对象 massive_database_services
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class MassiveDatabaseServices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class MassiveDatabaseServices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -135,68 +135,68 @@ public class MassiveDatabaseServices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -365,13 +365,13 @@ public class MassiveDatabaseServices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 43 - 43
zyc-system/src/main/java/com/zyc/system/domain/Microservices.java

@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
  * 微服务对象 microservices
  * 
  * @author ruoyi
- * @date 2024-12-19
+ * @date 2024-12-26
  */
 public class Microservices extends BaseEntity
 {
@@ -22,31 +22,31 @@ public class Microservices extends BaseEntity
 
     /** 工单编号 */
     @Excel(name = "工单编号")
-    private String ticketNumber;
+    private String workOrderCode;
 
     /** 申请单位名称 */
     @Excel(name = "申请单位名称")
-    private String organizationName;
+    private String applicantDepartment;
 
     /** 申请联系人 */
     @Excel(name = "申请联系人")
-    private String systemManager;
+    private String applicantName;
 
     /** 申请联系人电话 */
     @Excel(name = "申请联系人电话")
-    private String contactPhone;
+    private String applicantPhone;
 
     /** 技术联系人 */
     @Excel(name = "技术联系人")
-    private String technicalContact;
+    private String techContactName;
 
     /** 技术联系人电话 */
     @Excel(name = "技术联系人电话")
-    private String technicalContactPhone;
+    private String techContactPhone;
 
     /** 使用单位 */
     @Excel(name = "使用单位")
-    private String userUnit;
+    private String userDepartment;
 
     /** 信息系统名称 */
     @Excel(name = "信息系统名称")
@@ -114,68 +114,68 @@ public class Microservices extends BaseEntity
     {
         return id;
     }
-    public void setTicketNumber(String ticketNumber) 
+    public void setWorkOrderCode(String workOrderCode) 
     {
-        this.ticketNumber = ticketNumber;
+        this.workOrderCode = workOrderCode;
     }
 
-    public String getTicketNumber() 
+    public String getWorkOrderCode() 
     {
-        return ticketNumber;
+        return workOrderCode;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setApplicantDepartment(String applicantDepartment) 
     {
-        this.organizationName = organizationName;
+        this.applicantDepartment = applicantDepartment;
     }
 
-    public String getOrganizationName() 
+    public String getApplicantDepartment() 
     {
-        return organizationName;
+        return applicantDepartment;
     }
-    public void setSystemManager(String systemManager) 
+    public void setApplicantName(String applicantName) 
     {
-        this.systemManager = systemManager;
+        this.applicantName = applicantName;
     }
 
-    public String getSystemManager() 
+    public String getApplicantName() 
     {
-        return systemManager;
+        return applicantName;
     }
-    public void setContactPhone(String contactPhone) 
+    public void setApplicantPhone(String applicantPhone) 
     {
-        this.contactPhone = contactPhone;
+        this.applicantPhone = applicantPhone;
     }
 
-    public String getContactPhone() 
+    public String getApplicantPhone() 
     {
-        return contactPhone;
+        return applicantPhone;
     }
-    public void setTechnicalContact(String technicalContact) 
+    public void setTechContactName(String techContactName) 
     {
-        this.technicalContact = technicalContact;
+        this.techContactName = techContactName;
     }
 
-    public String getTechnicalContact() 
+    public String getTechContactName() 
     {
-        return technicalContact;
+        return techContactName;
     }
-    public void setTechnicalContactPhone(String technicalContactPhone) 
+    public void setTechContactPhone(String techContactPhone) 
     {
-        this.technicalContactPhone = technicalContactPhone;
+        this.techContactPhone = techContactPhone;
     }
 
-    public String getTechnicalContactPhone() 
+    public String getTechContactPhone() 
     {
-        return technicalContactPhone;
+        return techContactPhone;
     }
-    public void setUserUnit(String userUnit) 
+    public void setUserDepartment(String userDepartment) 
     {
-        this.userUnit = userUnit;
+        this.userDepartment = userDepartment;
     }
 
-    public String getUserUnit() 
+    public String getUserDepartment() 
     {
-        return userUnit;
+        return userDepartment;
     }
     public void setSystemName(String systemName) 
     {
@@ -299,13 +299,13 @@ public class Microservices extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("organizationName", getOrganizationName())
-            .append("systemManager", getSystemManager())
-            .append("contactPhone", getContactPhone())
-            .append("technicalContact", getTechnicalContact())
-            .append("technicalContactPhone", getTechnicalContactPhone())
-            .append("userUnit", getUserUnit())
+            .append("workOrderCode", getWorkOrderCode())
+            .append("applicantDepartment", getApplicantDepartment())
+            .append("applicantName", getApplicantName())
+            .append("applicantPhone", getApplicantPhone())
+            .append("techContactName", getTechContactName())
+            .append("techContactPhone", getTechContactPhone())
+            .append("userDepartment", getUserDepartment())
             .append("systemName", getSystemName())
             .append("applicationTime", getApplicationTime())
             .append("recoveryTime", getRecoveryTime())

+ 252 - 0
zyc-system/src/main/java/com/zyc/system/domain/NetworkMap.java

@@ -0,0 +1,252 @@
+package com.zyc.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zyc.common.annotation.Excel;
+import com.zyc.common.core.domain.BaseEntity;
+
+/**
+ * 网络拓扑对象 network_map
+ * 
+ * @author ruoyi
+ * @date 2024-12-26
+ */
+public class NetworkMap extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Integer id;
+
+    /** 子网ID */
+    @Excel(name = "子网ID")
+    private Integer subnetId;
+
+    /** 子网父ID */
+    @Excel(name = "子网父ID")
+    private Integer parentSubnetId;
+
+    /** 网元管理IP */
+    @Excel(name = "网元管理IP")
+    private String ip;
+
+    /** 网元名称(网络节点名称) */
+    @Excel(name = "网元名称", readConverterExp = "网=络节点名称")
+    private String netNodeName;
+
+    /** 网元设备状态 */
+    @Excel(name = "网元设备状态")
+    private String netNodeStatus;
+
+    /** 网拓扑中的坐标 */
+    @Excel(name = "网拓扑中的坐标")
+    private String coordinate;
+
+    /** 拓扑连纤A端信息 */
+    @Excel(name = "拓扑连纤A端信息")
+    private String lianqianA;
+
+    /** 拓扑连纤Z端信息 */
+    @Excel(name = "拓扑连纤Z端信息")
+    private String lianqianZ;
+
+    /** 创建者 */
+    @Excel(name = "创建者")
+    private Integer createdBy;
+
+    /** 更新者 */
+    @Excel(name = "更新者")
+    private Integer updatedBy;
+
+    /** 删除者 */
+    @Excel(name = "删除者")
+    private Integer deletedBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdAt;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedAt;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deletedAt;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer deletedFlag;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setSubnetId(Integer subnetId) 
+    {
+        this.subnetId = subnetId;
+    }
+
+    public Integer getSubnetId() 
+    {
+        return subnetId;
+    }
+    public void setParentSubnetId(Integer parentSubnetId) 
+    {
+        this.parentSubnetId = parentSubnetId;
+    }
+
+    public Integer getParentSubnetId() 
+    {
+        return parentSubnetId;
+    }
+    public void setIp(String ip) 
+    {
+        this.ip = ip;
+    }
+
+    public String getIp() 
+    {
+        return ip;
+    }
+    public void setNetNodeName(String netNodeName) 
+    {
+        this.netNodeName = netNodeName;
+    }
+
+    public String getNetNodeName() 
+    {
+        return netNodeName;
+    }
+    public void setNetNodeStatus(String netNodeStatus) 
+    {
+        this.netNodeStatus = netNodeStatus;
+    }
+
+    public String getNetNodeStatus() 
+    {
+        return netNodeStatus;
+    }
+    public void setCoordinate(String coordinate) 
+    {
+        this.coordinate = coordinate;
+    }
+
+    public String getCoordinate() 
+    {
+        return coordinate;
+    }
+    public void setLianqianA(String lianqianA) 
+    {
+        this.lianqianA = lianqianA;
+    }
+
+    public String getLianqianA() 
+    {
+        return lianqianA;
+    }
+    public void setLianqianZ(String lianqianZ) 
+    {
+        this.lianqianZ = lianqianZ;
+    }
+
+    public String getLianqianZ() 
+    {
+        return lianqianZ;
+    }
+    public void setCreatedBy(Integer createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public Integer getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setUpdatedBy(Integer updatedBy) 
+    {
+        this.updatedBy = updatedBy;
+    }
+
+    public Integer getUpdatedBy() 
+    {
+        return updatedBy;
+    }
+    public void setDeletedBy(Integer deletedBy) 
+    {
+        this.deletedBy = deletedBy;
+    }
+
+    public Integer getDeletedBy() 
+    {
+        return deletedBy;
+    }
+    public void setCreatedAt(Date createdAt) 
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Date getCreatedAt() 
+    {
+        return createdAt;
+    }
+    public void setUpdatedAt(Date updatedAt) 
+    {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getUpdatedAt() 
+    {
+        return updatedAt;
+    }
+    public void setDeletedAt(Date deletedAt) 
+    {
+        this.deletedAt = deletedAt;
+    }
+
+    public Date getDeletedAt() 
+    {
+        return deletedAt;
+    }
+    public void setDeletedFlag(Integer deletedFlag) 
+    {
+        this.deletedFlag = deletedFlag;
+    }
+
+    public Integer getDeletedFlag() 
+    {
+        return deletedFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("subnetId", getSubnetId())
+            .append("parentSubnetId", getParentSubnetId())
+            .append("ip", getIp())
+            .append("netNodeName", getNetNodeName())
+            .append("netNodeStatus", getNetNodeStatus())
+            .append("coordinate", getCoordinate())
+            .append("lianqianA", getLianqianA())
+            .append("lianqianZ", getLianqianZ())
+            .append("createdBy", getCreatedBy())
+            .append("updatedBy", getUpdatedBy())
+            .append("deletedBy", getDeletedBy())
+            .append("createdAt", getCreatedAt())
+            .append("updatedAt", getUpdatedAt())
+            .append("deletedAt", getDeletedAt())
+            .append("deletedFlag", getDeletedFlag())
+            .toString();
+    }
+}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно