Browse Source

设备参数返回ID

wangyangyang 4 years ago
parent
commit
b0ce067217

+ 6 - 6
sms_water/src/main/java/com/huaxu/entity/DeviceParmEntity.java

@@ -30,17 +30,17 @@ public class DeviceParmEntity implements Serializable {
     @ApiModelProperty("设备属性名称")
     private String attributeName;
     @ApiModelProperty("是否地图悬浮显示")
-    private Integer isSuspension;
+    private Boolean isSuspension;
     @ApiModelProperty("是否统计报表参数")
-    private Integer isReport;
+    private Boolean isReport;
     @ApiModelProperty("是否统计图表参数")
-    private Integer isChart;
+    private Boolean isChart;
     @ApiModelProperty("是否地图参数")
-    private Integer isMap;
+    private Boolean isMap;
     @ApiModelProperty("是否报警参数")
-    private Integer isAlarm;
+    private Boolean isAlarm;
     @ApiModelProperty("是否工艺图参数")
-    private Integer isArtwork;
+    private Boolean isArtwork;
 
 
     @ApiModelProperty(value = "备注")

+ 5 - 1
sms_water/src/main/java/com/huaxu/service/impl/DeviceParmServiceImpl.java

@@ -32,7 +32,11 @@ public class DeviceParmServiceImpl  implements DeviceParmService  {
 
     @Override
     public List<DeviceParmEntity> selectByDeviceId(Integer id) {
-        return deviceParmMapper.selectByDeviceId(id);
+        List<DeviceParmEntity> deviceParmEntities = deviceParmMapper.selectByDeviceId(id);
+        for (DeviceParmEntity item : deviceParmEntities) {
+            item.setDeviceId(id);
+        }
+        return deviceParmEntities;
     }
 
     @Override