Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/impl/VectorDataServiceImpl.java

@@ -110,6 +110,7 @@ public class VectorDataServiceImpl implements VectorDataService {
             if (null != projectName) {
                 item.setProjectName(projectName);
             }
+            item.setItemName(item.getProjectName() + " " + item.getName());
         });
         return list;
     }

hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/vo/DeviceModelData.java

@@ -139,23 +139,23 @@ public class DeviceModelData {
     /**
      * 类型，0:属性，1:功能，2:事件
      */
-    private Integer type;
+    private String type;
 
     public static DeviceModelData of(ModelAttrVO data) {
         DeviceModelData deviceModelData = Func.copyProperties(data, DeviceModelData.class);
-        deviceModelData.setType(0);
+        deviceModelData.setType("0");
         return deviceModelData;
     }
 
     public static DeviceModelData of(ModelFuncVO data) {
         DeviceModelData deviceModelData = Func.copyProperties(data, DeviceModelData.class);
-        deviceModelData.setType(1);
+        deviceModelData.setType("1");
         return deviceModelData;
     }
 
     public static DeviceModelData of(ModelEventVO data) {
         DeviceModelData deviceModelData = Func.copyProperties(data, DeviceModelData.class);
-        deviceModelData.setType(2);
+        deviceModelData.setType("2");
         return deviceModelData;
     }
 }

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;

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;

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);
             }
         }

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);
             }