java/mx_charging_pile.git

			@@ -2,6 +2,7 @@

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
			import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
			import com.ruoyi.chargingPile.api.model.Site;
			@@ -16,10 +17,7 @@
			import com.ruoyi.chargingPile.api.vo.SiteVO;
			import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
			import com.ruoyi.chargingPile.domain.SiteMenu;
			import com.ruoyi.chargingPile.service.IPartnerService;
			import com.ruoyi.chargingPile.service.ISiteService;
			import com.ruoyi.chargingPile.service.TChargingGunService;
			import com.ruoyi.chargingPile.service.TChargingPileService;
			import com.ruoyi.chargingPile.service.*;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.GeodesyUtil;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			@@ -69,7 +67,9 @@
			@Resource
			private TChargingGunService chargingGunService;


			@Autowired
			private TParkingLotService parkingLotService;




			@@ -103,7 +103,6 @@
			public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
			return AjaxResult.success(siteService.pageList(query));
			}

			@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
			@PostMapping("/getDetailById")
			public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
			@@ -112,7 +111,8 @@
			Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
			siteDetailVO.setDistance(distance.get("WGS84"));
			// 查询绑定车牌提示文案
			TParkingLot parkingLot = parkingLotClient.getLotBySiteId(query.getSiteId()).getData();
			TParkingLot parkingLot = parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
			.eq(TParkingLot::getSiteId, query.getSiteId()));
			if(Objects.nonNull(parkingLot)){
			siteDetailVO.setRemark(parkingLot.getRemark());
			}
			@@ -148,12 +148,12 @@
			}

			@ResponseBody
			@DeleteMapping("/delSite/{id}")
			@DeleteMapping("/delSite")
			@ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
			})
			public AjaxResult delSite(@PathVariable Integer[] id){
			public AjaxResult delSite(@RequestParam("id") Integer[] id){
			return siteService.delSite(id);
			}