Преглед изворни кода

update mall-service MapController

reghao пре 1 година
родитељ
комит
da6d58e197

+ 1 - 3
mall/mall-service/src/main/java/cn/reghao/tnb/mall/app/geo/controller/MapController.java

@@ -68,9 +68,7 @@ public class MapController {
     @ApiOperation(value = "获取地图中标记的点", notes = "N")
     @GetMapping(value = "/markers", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getMapMarkers(@RequestParam("type") Integer type) {
-        //List<MapMarker> list = mapService.getMapMarkers(type);
-        List<MapMarker> list = jobLocationService.getMapMarks();
-
+        List<MapMarker> list = mapService.getMapMarkers(type);
         return WebResult.success(list);
     }
 

+ 7 - 1
mall/mall-service/src/main/java/cn/reghao/tnb/mall/app/geo/service/MapService.java

@@ -41,16 +41,19 @@ public class MapService {
     private final GeoItemMapper geoItemMapper;
     private final GeoPointMapper geoPointMapper;
     private final CameraPhotoMapper cameraPhotoMapper;
+    private JobLocationService jobLocationService;
 
     public MapService(MallReplyMapper mallReplyMapper, MallReplyPhotoMapper mallReplyPhotoMapper,
                       GeoScopeMapper geoScopeMapper, GeoItemMapper geoItemMapper,
-                      GeoPointMapper geoPointMapper, CameraPhotoMapper cameraPhotoMapper) {
+                      GeoPointMapper geoPointMapper, CameraPhotoMapper cameraPhotoMapper,
+                      JobLocationService jobLocationService) {
         this.mallReplyMapper = mallReplyMapper;
         this.mallReplyPhotoMapper = mallReplyPhotoMapper;
         this.geoScopeMapper = geoScopeMapper;
         this.geoItemMapper = geoItemMapper;
         this.geoPointMapper = geoPointMapper;
         this.cameraPhotoMapper = cameraPhotoMapper;
+        this.jobLocationService = jobLocationService;
     }
 
     public boolean checkReplyId(String replyId) {
@@ -139,6 +142,9 @@ public class MapService {
                 String objectId = mapMarker.getId();
             });
             return list;
+        } else if (itemType == 7) {
+            List<MapMarker> list = jobLocationService.getMapMarks();
+            return list;
         }
 
         return Collections.emptyList();