From 1d4065d993d2535ec2e4893a5426205d4111db3d Mon Sep 17 00:00:00 2001
From: wangyinsheng <2310589501@qq.com>
Date: Tue, 24 Sep 2024 11:06:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceAttrDTO.java  | 4 ++++
 .../java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java  | 4 ++++
 .../hnac/gglm/bigmodel/maintenance/service/DataInstructService.java | 6 ++++++
 .../hnac/gglm/bigmodel/maintenance/service/DataRecordService.java   | 6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceAttrDTO.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceAttrDTO.java
index 47dc143..4330048 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceAttrDTO.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceAttrDTO.java
@@ -12,6 +12,10 @@ public class DeviceAttrDTO {
     @JsonProperty("item_id")
     private String itemId;
 
+    @ApiModelProperty("itemName")
+    @JsonProperty("item_name")
+    private String itemName;
+
     @ApiModelProperty("站点名称")
     @JsonProperty("station_name")
     private String stationName;
diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
index 7707447..dedfabe 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
@@ -12,6 +12,10 @@ public class DeviceFuncDTO {
     @JsonProperty("item_id")
     private String itemId;
 
+    @ApiModelProperty("itemName")
+    @JsonProperty("item_name")
+    private String itemName;
+
     @ApiModelProperty("站点名称")
     @JsonProperty("station_name")
     private String stationName;
diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
index f8e0600..76fb1cc 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
@@ -64,6 +64,12 @@ public class DataInstructService extends BaseServiceImpl<DataInstructMapper, Dat
                 deviceFuncDTO.setYkName(deviceFunc.getName());
                 deviceFuncDTO.setStationName(deviceFunc.getProjectName());
                 deviceFuncDTO.setStationId(deviceFunc.getProjectId());
+                String stationName = deviceFuncDTO.getStationName() == null ? "" : deviceFuncDTO.getStationName();
+                String deviceName = deviceFuncDTO.getDeviceName() == null ? "" : deviceFuncDTO.getDeviceName();
+                String recordName = deviceFuncDTO.getYkName() == null ? "" : deviceFuncDTO.getYkName();
+                deviceFuncDTO.setItemName(new StringBuffer(stationName)
+                        .append(" ").append(deviceName)
+                        .append(" ").append(recordName).toString());
                 deviceFuncDTOS.add(deviceFuncDTO);
             }
         }
diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
index 5c026d5..5c605ed 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
@@ -91,6 +91,12 @@ public class DataRecordService extends BaseServiceImpl<DataRecordMapper, DataRec
                 deviceAttrDTO.setStationId(deviceAttr.getProjectId());
                 deviceAttrDTO.setRecordName(deviceAttr.getName());
                 deviceAttrDTO.setItemId(deviceAttr.getSignage());
+                String stationName = deviceAttrDTO.getStationName() == null ? "" : deviceAttrDTO.getStationName();
+                String deviceName = deviceAttrDTO.getDeviceName() == null ? "" : deviceAttrDTO.getDeviceName();
+                String recordName = deviceAttrDTO.getRecordName() == null ? "" : deviceAttrDTO.getRecordName();
+                deviceAttrDTO.setItemName(new StringBuffer(stationName)
+                        .append(" ").append(deviceName)
+                        .append(" ").append(recordName).toString());
                 deviceAttrDTO.setRule(deviceAttr.getRule());
                 deviceAttrDTOS.add(deviceAttrDTO);
             }