refactor: 代码合并

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gccloud.common.exception.GlobalException;
 import com.gccloud.common.utils.BeanConvertUtils;
 import com.gccloud.common.utils.JSON;
+import com.gccloud.common.utils.QueryWrapperUtils;
 import com.gccloud.dataroom.core.module.map.dto.DataRoomMapRepeatDTO;
 import com.gccloud.dataroom.core.module.map.vo.DataRoomMapVO;
 import com.gccloud.dataroom.core.module.map.vo.MapChildVO;
@@ -38,9 +39,31 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
 
     @Override
     public List<DataRoomMapVO> getList(MapSearchDTO searchDTO) {
-        return this.baseMapper.getList(searchDTO);
+        if (StringUtils.isNotBlank(searchDTO.getSearchKey())) {
+            searchDTO.setParentId(null);
+        }
+        LambdaQueryWrapper<DataRoomMapEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(DataRoomMapEntity::getParentId);
+        List<DataRoomMapEntity> list = this.list(queryWrapper);
+        List<String> idList = list.stream().map(DataRoomMapEntity::getParentId).collect(Collectors.toList());
+
+        LambdaQueryWrapper<DataRoomMapEntity> wrapper = QueryWrapperUtils.wrapperLike(new LambdaQueryWrapper<>(), searchDTO.getSearchKey(), DataRoomMapEntity::getName, DataRoomMapEntity::getMapCode);
+        wrapper.eq(searchDTO.getLevel() != null, DataRoomMapEntity::getLevel, searchDTO.getLevel());
+        wrapper.eq(StringUtils.isNotBlank(searchDTO.getParentId()), DataRoomMapEntity::getParentId, searchDTO.getParentId());
+        wrapper.eq(searchDTO.getUploadedGeoJson() != null, DataRoomMapEntity::getUploadedGeoJson, searchDTO.getUploadedGeoJson());
+        List<DataRoomMapEntity> entityList = this.list(wrapper);
+        List<DataRoomMapVO> voList = Lists.newArrayList();
+        for (DataRoomMapEntity entity : entityList) {
+            DataRoomMapVO mapVO = BeanConvertUtils.convert(entity, DataRoomMapVO.class);
+            mapVO.setHasChildren(idList.contains(entity.getId()));
+            voList.add(mapVO);
+        }
+        return voList;
+//        return this.baseMapper.getList(searchDTO);
     }
 
+
+
     @Override
     public List<DataRoomMapVO> getAvailableTree(Integer level) {
         // 根据层级，如果某个地图的某个子级（或子级的子级...）也符合该层级，那么把该地图也返回

data-room-ui/packages/MapDataManagement/src/AddForm.vue

@@ -178,7 +178,7 @@ export default {
       return !this.isEmpty(this.mapForm.geoJson)
     },
     outRangeLabel() {
-      return `级别${this.mapForm.level}`;
+      return `级别${this.mapForm.level + 1}`;
     }
   },
   data () {

data-room-ui/packages/MapDataManagement/src/EditForm.vue

@@ -176,7 +176,7 @@ export default {
       return !this.isWhitespace(this.mapForm.geoJson) && this.mapForm.uploadedGeoJson === 0
     },
     outRangeLabel() {
-      return `级别${this.mapForm.level}`;
+      return `级别${this.mapForm.level + 1}`;
     }
   },
   data () {

data-room-ui/packages/MapDataManagement/src/index.vue

@@ -319,7 +319,7 @@ export default {
       })
     },
     getMoreLevel(level) {
-      return '级别' + level
+      return '级别' + (level + 1)
     },
     addMap() {
       this.$refs.addForm.mapFormVisible = true