Merge branch 'dev' into 'main'

Dev

See merge request !153

ruoyi-admin/src/main/java/com/ruoyi/web/controller/other/MapEntityController.java

@@ -19,8 +19,8 @@ public class MapEntityController extends BaseController {
 
     @RequestMapping(value = "/getAllMapEntities",method = RequestMethod.GET)
     @ResponseBody
-    public List<MapEntity> getAllMapEntities() {
-        return mapEntityService.getAllMapEntities();
+    public List<MapEntity> getAllMapEntities(@RequestParam(name = "level") String level) {
+        return mapEntityService.getAllMapEntitiesByLevel(level);
     }
 
     @RequestMapping(value = "/getMapEntityById",method = RequestMethod.GET)

ruoyi-system/src/main/java/com/ruoyi/system/service/other/MapEntityService.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 public interface MapEntityService {
     // 获取所有实体
-    List<MapEntity> getAllMapEntities();
+    List<MapEntity> getAllMapEntitiesByLevel(String level);
     // 根据 ID 获取实体
     MapEntity getMapEntityById(String id);
     // 更新实体

ruoyi-system/src/main/java/com/ruoyi/system/service/other/impl/MapEntityServiceImpl.java

 package com.ruoyi.system.service.other.impl;
 
 import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.system.domain.other.MapEntity;
 import com.ruoyi.system.mapper.other.MapEntityMapper;
 import com.ruoyi.system.service.other.MapEntityService;
@@ -16,8 +17,12 @@ public class MapEntityServiceImpl implements MapEntityService {
     private MapEntityMapper mapEntityMapper;
 
     @Override
-    public List<MapEntity> getAllMapEntities() {
-        return mapEntityMapper.selectList(null);
+    public List<MapEntity> getAllMapEntitiesByLevel(String level) {
+        QueryWrapper<MapEntity> queryWrapper = new QueryWrapper<>();
+        if(level!=null&& !level.isEmpty()){
+            queryWrapper.eq("entity_level", level);
+        }
+        return mapEntityMapper.selectList(queryWrapper);
     }
 
     @Override