Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java

@@ -26,6 +26,9 @@ public class ScreenFlyMapChart extends Chart{
     @Data
     public static class Customize {
 
+        @ApiModelProperty(notes = "地图id")
+        private String mapId;
+
         @ApiModelProperty(notes = "是否显示文字")
         private Boolean mapName;
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/controller/DataRoomMapController.java

@@ -128,8 +128,14 @@ public class DataRoomMapController {
 
     @GetMapping("/tree/{level}")
     @ApiOperation(value = "树", position = 110, notes = "地图数据树", produces = MediaType.APPLICATION_JSON_VALUE)
-    public R<List<DataRoomMapVO>> tree(@PathVariable Integer level) {
-        List<DataRoomMapVO> list = dataRoomMapService.getAvailableTree(level);
+    public R<List<DataRoomMapVO>> tree(@PathVariable String level) {
+        int levelInt = 0;
+        try {
+            levelInt = Integer.parseInt(level);
+        } catch (NumberFormatException e) {
+            return R.error("地图层级参数错误");
+        }
+        List<DataRoomMapVO> list = dataRoomMapService.getAvailableTree(levelInt);
         return R.success(list);
     }
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java

@@ -45,7 +45,8 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
     public List<DataRoomMapVO> getAvailableTree(Integer level) {
         // 根据层级，如果某个地图的某个子级（或子级的子级...）也符合该层级，那么把该地图也返回
         LambdaQueryWrapper<DataRoomMapEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(DataRoomMapEntity::getId, DataRoomMapEntity::getLevel, DataRoomMapEntity::getParentId, DataRoomMapEntity::getMapCode);
+        queryWrapper.select(DataRoomMapEntity::getId, DataRoomMapEntity::getLevel, DataRoomMapEntity::getParentId,
+                DataRoomMapEntity::getMapCode, DataRoomMapEntity::getName, DataRoomMapEntity::getEnableDown, DataRoomMapEntity::getUploadedGeoJson);
         queryWrapper.le(DataRoomMapEntity::getLevel, level);
         List<DataRoomMapEntity> list = list(queryWrapper);
         // 转成树形结构
@@ -70,6 +71,7 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
         // 目标层级的地图，以及其父级地图...
         List<DataRoomMapVO> match = Lists.newArrayList(targetLevelList);
         for (DataRoomMapVO mapVO : targetLevelList) {
+            mapVO.setDisabled(!mapVO.getUploadedGeoJson().equals(YES));
             if (mapVO.getLevel().equals(0)) {
                 // 已经是最顶级了，没有父级了
                 continue;

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/vo/DataRoomMapVO.java

@@ -43,4 +43,7 @@ public class DataRoomMapVO {
     @ApiModelProperty(notes = "子级")
     private List<DataRoomMapVO> children;
 
+    @ApiModelProperty(notes = "是否禁用")
+    private Boolean disabled;
+
 }