duhongyu месяцев назад: 3
Родитель
Сommit
350b4fc39d

+ 1 - 1
.idea/workspace.xml

2502
         </line-breakpoint>
2502
         </line-breakpoint>
2503
         <line-breakpoint type="java-line">
2503
         <line-breakpoint type="java-line">
2504
           <url>file://$PROJECT_DIR$/src/main/java/com/yt/zhylplat/moduleMap/service/impl/TMapPolygonPropertiesServiceImpl.java</url>
2504
           <url>file://$PROJECT_DIR$/src/main/java/com/yt/zhylplat/moduleMap/service/impl/TMapPolygonPropertiesServiceImpl.java</url>
2505
-          <line>683</line>
2505
+          <line>684</line>
2506
           <option name="timeStamp" value="864" />
2506
           <option name="timeStamp" value="864" />
2507
         </line-breakpoint>
2507
         </line-breakpoint>
2508
         <line-breakpoint type="java-line">
2508
         <line-breakpoint type="java-line">

+ 2 - 0
src/main/java/com/yt/zhylplat/moduleMap/service/impl/TMapPolygonPropertiesServiceImpl.java

1044
             vo.setX(item.getFX());
1044
             vo.setX(item.getFX());
1045
             vo.setY(item.getFY());
1045
             vo.setY(item.getFY());
1046
             vo.setState(item.getFStateid());
1046
             vo.setState(item.getFStateid());
1047
+            vo.setPosition(item.getFAddress());
1047
             mapEquipmentVos.add(vo);
1048
             mapEquipmentVos.add(vo);
1048
         }
1049
         }
1049
         for (TBaseDriveinfo item :Driveinfos)
1050
         for (TBaseDriveinfo item :Driveinfos)
1053
             vo.setName(item.getfName());
1054
             vo.setName(item.getfName());
1054
             vo.setX(item.getfX());
1055
             vo.setX(item.getfX());
1055
             vo.setY(item.getfY());
1056
             vo.setY(item.getfY());
1057
+            vo.setPosition("");
1056
             vo.setState(item.getfState());
1058
             vo.setState(item.getfState());
1057
             mapEquipmentVos.add(vo);
1059
             mapEquipmentVos.add(vo);
1058
         }
1060
         }

+ 2 - 0
src/main/java/com/yt/zhylplat/moduleMap/vo/MapEquipmentVo.java

18
     private String X;
18
     private String X;
19
     @ApiModelProperty(value = "维度")
19
     @ApiModelProperty(value = "维度")
20
     private String Y;
20
     private String Y;
21
+    @ApiModelProperty(value = "位置")
22
+    private String position;
21
     @ApiModelProperty(value = "设施状态Id0未连接1已连接2已告警")
23
     @ApiModelProperty(value = "设施状态Id0未连接1已连接2已告警")
22
     private Integer State;
24
     private Integer State;
23
     @ApiModelProperty(value = "最后检查时间")
25
     @ApiModelProperty(value = "最后检查时间")