diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/impl/VectorDataServiceImpl.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/impl/VectorDataServiceImpl.java index eb82c3f..c1f26d9 100644 --- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/impl/VectorDataServiceImpl.java +++ b/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; } diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/vo/DeviceModelData.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/vo/DeviceModelData.java index 9385b1f..7bebc16 100644 --- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/vo/DeviceModelData.java +++ b/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; } } 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