From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 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..b84e0e9 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,20 @@
package com.stylefeng.guns.modular.transfer.controller;
+import com.aliyuncs.utils.StringUtils;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
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 +27,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
@@ -63,7 +74,7 @@
@ApiImplicitParam(value = "出行时间（2020-08-20 10:10）", name = "travelTime", required = true, dataType = "string"),
@ApiImplicitParam(value = "是否预约（1=否，2=是）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "是否代下单（0=否，1=是）", name = "substitute", required = true, dataType = "int"),
- @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
@ApiImplicitParam(value = "下单地点纬度", name = "placementLat", required = true, dataType = "string"),
@ApiImplicitParam(value = "起点经度", name = "startLon", required = true, dataType = "string"),
@ApiImplicitParam(value = "起点纬度", name = "startLat", required = true, dataType = "string"),
@@ -153,15 +164,54 @@
}
}
+ @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,String code) throws Exception {
+ //获取当前城市名称
+// String cityName = AmapGeocoding.getCityName(latitude, longitude);
+ Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().ne("flag", 3);
+ if (!StringUtils.isEmpty(code)){
+ ne.eq("code",code);
+ }
+ //查询ids
+ List<OpenCity> cityName1 = openCityService.selectList(ne);
+ 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) {
+
+ String address = AmapGeocoding.getAddress(Double.parseDouble(tOpenCitySite.getLat()), Double.parseDouble(tOpenCitySite.getLon()));
+ tOpenCitySite.setAddress(address);
+ 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