|
@@ -2,12 +2,14 @@ package cn.reghao.tnb.mall.app.geo.controller;
|
|
|
|
|
|
|
|
import cn.reghao.jutil.web.WebResult;
|
|
import cn.reghao.jutil.web.WebResult;
|
|
|
import cn.reghao.tnb.common.db.SelectOption;
|
|
import cn.reghao.tnb.common.db.SelectOption;
|
|
|
|
|
+import cn.reghao.tnb.mall.api.dto.geo.JobLoc;
|
|
|
import cn.reghao.tnb.mall.api.dto.geo.MallReplyDto;
|
|
import cn.reghao.tnb.mall.api.dto.geo.MallReplyDto;
|
|
|
import cn.reghao.tnb.mall.api.dto.geo.MallReplyPhotoDto;
|
|
import cn.reghao.tnb.mall.api.dto.geo.MallReplyPhotoDto;
|
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MapPoint;
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MapPoint;
|
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MapMarker;
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MapMarker;
|
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MarkerInfo;
|
|
import cn.reghao.tnb.mall.app.geo.model.vo.MarkerInfo;
|
|
|
import cn.reghao.tnb.mall.app.geo.service.EarthService;
|
|
import cn.reghao.tnb.mall.app.geo.service.EarthService;
|
|
|
|
|
+import cn.reghao.tnb.mall.app.geo.service.JobLocationService;
|
|
|
import cn.reghao.tnb.mall.app.geo.service.MapService;
|
|
import cn.reghao.tnb.mall.app.geo.service.MapService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -27,10 +29,19 @@ import java.util.List;
|
|
|
public class MapController {
|
|
public class MapController {
|
|
|
private final MapService mapService;
|
|
private final MapService mapService;
|
|
|
private final EarthService earthService;
|
|
private final EarthService earthService;
|
|
|
|
|
+ private final JobLocationService jobLocationService;
|
|
|
|
|
|
|
|
- public MapController(MapService mapService, EarthService earthService) {
|
|
|
|
|
|
|
+ public MapController(MapService mapService, EarthService earthService, JobLocationService jobLocationService) {
|
|
|
this.mapService = mapService;
|
|
this.mapService = mapService;
|
|
|
this.earthService = earthService;
|
|
this.earthService = earthService;
|
|
|
|
|
+ this.jobLocationService = jobLocationService;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @ApiOperation(value = "添加工作位置", notes = "N")
|
|
|
|
|
+ @PostMapping(value = "/job", produces = MediaType.APPLICATION_JSON_VALUE)
|
|
|
|
|
+ public String addJobLocation(@RequestBody JobLoc jobLoc) {
|
|
|
|
|
+ jobLocationService.addJobLocation(jobLoc);
|
|
|
|
|
+ return WebResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation(value = "检查淘宝商品评论是否存在", notes = "N")
|
|
@ApiOperation(value = "检查淘宝商品评论是否存在", notes = "N")
|
|
@@ -57,7 +68,9 @@ public class MapController {
|
|
|
@ApiOperation(value = "获取地图中标记的点", notes = "N")
|
|
@ApiOperation(value = "获取地图中标记的点", notes = "N")
|
|
|
@GetMapping(value = "/markers", produces = MediaType.APPLICATION_JSON_VALUE)
|
|
@GetMapping(value = "/markers", produces = MediaType.APPLICATION_JSON_VALUE)
|
|
|
public String getMapMarkers(@RequestParam("type") Integer type) {
|
|
public String getMapMarkers(@RequestParam("type") Integer type) {
|
|
|
- List<MapMarker> list = mapService.getMapMarkers(type);
|
|
|
|
|
|
|
+ //List<MapMarker> list = mapService.getMapMarkers(type);
|
|
|
|
|
+ List<MapMarker> list = jobLocationService.getMapMarks();
|
|
|
|
|
+
|
|
|
return WebResult.success(list);
|
|
return WebResult.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
|