From 06c5eda038f967dc0c0261e16eff0ad1a18e41e7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 05 六月 2024 15:52:58 +0800
Subject: [PATCH] 6.5
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
index a8137a0..8d0da57 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java
@@ -1,11 +1,18 @@
package com.stylefeng.guns.modular.transfer.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+import com.stylefeng.guns.modular.system.dao.TOpenCitySiteMapper;
+import com.stylefeng.guns.modular.system.model.OpenCity;
+import com.stylefeng.guns.modular.system.model.TOpenCitySite;
+import com.stylefeng.guns.modular.system.service.IOpenCityService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
+import com.stylefeng.guns.modular.system.util.AmapGeocoding;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
+import com.stylefeng.guns.modular.transfer.model.SiteDto;
import com.stylefeng.guns.modular.transfer.server.IOrderTransferService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,7 +25,9 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
@Api
@RestController
@@ -153,15 +162,46 @@
}
}
+ @Autowired
+ private IOpenCityService openCityService;
+ @Autowired
+ private TOpenCitySiteMapper openCitySiteMapper;
@ResponseBody
- @PostMapping("/get/site")
+ @PostMapping("/api/get/site")
@ApiOperation(value = "获取站点", tags = {"用户端-接送机"}, notes = "")
@ApiImplicitParams({
-
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil site(double latitude, double longitude){
+ public ResultUtil site(double latitude, double longitude) throws Exception {
+ //获取当前城市名称
+ String cityName = AmapGeocoding.getCityName(latitude, longitude);
+ //查询ids
+ List<OpenCity> cityName1 = openCityService.selectList(new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag",3));
+ List<Integer> ids = new ArrayList<>();
+ for (OpenCity openCity : cityName1) {
+ ids.add(openCity.getId());
+ }
+ if (ids.isEmpty()){
+ return ResultUtil.error("当前城市暂无开通站点");
+ }
+ List<TOpenCitySite> tOpenCitySites = openCitySiteMapper.selectList(new EntityWrapper<TOpenCitySite>().in("openCityId",ids).ne("flag",3));
+ List<TOpenCitySite> jichang = new ArrayList<>();
+ List<TOpenCitySite> dongche = new ArrayList<>();
+ for (TOpenCitySite tOpenCitySite : tOpenCitySites) {
+ if (tOpenCitySite.getType()==1){
+ jichang.add(tOpenCitySite);
+ }
+ if (tOpenCitySite.getType()==2){
+ dongche.add(tOpenCitySite);
+ }
+ }
+
+ SiteDto siteDto = new SiteDto();
+ siteDto.setDongche(dongche);
+ siteDto.setJichang(jichang);
+ return ResultUtil.success(siteDto);
}
}
--
Gitblit v1.7.1