diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java index 0df9ca6..64b834a 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java @@ -9,4 +9,5 @@ public class AmapConfigConstant { public static final String DURATION = "duration"; public static final String DIRECTION_URL = "https://restapi.amap.com/v3/direction/driving"; + public static final String DISTRICT_URL = "https://restapi.amap.com/v3/config/district"; } diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/dto/DicDistrict.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/DicDistrict.java new file mode 100644 index 0000000..e535479 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/DicDistrict.java @@ -0,0 +1,12 @@ +package com.internal.dto; + +import lombok.Data; + +@Data +public class DicDistrict { + + private String addressCode; + private String addressName; + private String parentAddressCode; + private Integer level; +} diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/util/BigDecimalUtils.java b/online-taxi-public/internal-common/src/main/java/com/internal/util/BigDecimalUtils.java index 4ba6340..e390e09 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/util/BigDecimalUtils.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/util/BigDecimalUtils.java @@ -30,7 +30,7 @@ public class BigDecimalUtils { } BigDecimal b1 = BigDecimal.valueOf(v1); BigDecimal b2 = BigDecimal.valueOf(v2); - return b1.divide(b2,2,BigDecimal.ROUND_HALF_UP).doubleValue(); + return b1.divide(b2).doubleValue(); } public static double subtract(double v1,double v2) { diff --git a/online-taxi-public/servcie-price/src/main/java/com/taxi/serviceprice/service/ForecastPriceService.java b/online-taxi-public/servcie-price/src/main/java/com/taxi/serviceprice/service/ForecastPriceService.java index 464699c..7820757 100644 --- a/online-taxi-public/servcie-price/src/main/java/com/taxi/serviceprice/service/ForecastPriceService.java +++ b/online-taxi-public/servcie-price/src/main/java/com/taxi/serviceprice/service/ForecastPriceService.java @@ -9,7 +9,6 @@ import com.internal.response.ForecastPriceResponse; import com.internal.util.BigDecimalUtils; import com.taxi.serviceprice.mapper.PriceRuleMapper; import com.taxi.serviceprice.remote.ServiceMapClient; -import javafx.scene.effect.Light; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -111,7 +110,9 @@ public class ForecastPriceService { Double unitPricePerMinute = priceRule.getUnitPricePerMinute(); double timeFare = BigDecimalUtils.multiply(time,unitPricePerMinute); price = BigDecimalUtils.add(price,timeFare); - return new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + BigDecimal priceBigDecimal = new BigDecimal(price); + price = priceBigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + return price; } // public static void main(String[] args) throws IllegalAccessException { diff --git a/online-taxi-public/service-map/pom.xml b/online-taxi-public/service-map/pom.xml index 359141a..3e59fe3 100644 --- a/online-taxi-public/service-map/pom.xml +++ b/online-taxi-public/service-map/pom.xml @@ -22,6 +22,16 @@ spring-cloud-starter-alibaba-nacos-discovery + + com.baomidou + mybatis-plus-boot-starter + 3.4.3.1 + + + + mysql + mysql-connector-java + \ No newline at end of file diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/ServiceMapApplication.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/ServiceMapApplication.java index d4e8b84..66e8a02 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/ServiceMapApplication.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/ServiceMapApplication.java @@ -1,6 +1,7 @@ package com.taxi.servicemap; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -9,6 +10,7 @@ import org.springframework.web.client.RestTemplate; @SpringBootApplication @EnableDiscoveryClient//服务发现 +@MapperScan("com.taxi.servicemap.mapper") public class ServiceMapApplication { public static void main(String[] args) { diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DicDistrictController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DicDistrictController.java new file mode 100644 index 0000000..c5b00d6 --- /dev/null +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DicDistrictController.java @@ -0,0 +1,21 @@ +package com.taxi.servicemap.controller; + +import com.internal.dto.ResponseResult; +import com.taxi.servicemap.service.DicDistrictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + + + +@RestController +public class DicDistrictController { + + @Autowired + private DicDistrictService dicDistrictService; + + @GetMapping("/dic-district") + public ResponseResult initDicDistrict(String keywords){ + return dicDistrictService.initDicDistrict(keywords); + } +} diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DriectionController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DriectionController.java index c94d172..8d0c8b1 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DriectionController.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/DriectionController.java @@ -2,7 +2,7 @@ package com.taxi.servicemap.controller; import com.internal.dto.ResponseResult; import com.internal.request.ForecastPriceDTO; -import com.taxi.servicemap.service.DirectionSevice; +import com.taxi.servicemap.service.DirectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/direction") public class DriectionController { @Autowired - private DirectionSevice directionSevice; + private DirectionService directionSevice; @GetMapping("/driving") public ResponseResult deiving(@RequestBody ForecastPriceDTO forecastPriceDTO) { diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TestController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TestController.java index b85afc0..65a2398 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TestController.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TestController.java @@ -1,8 +1,15 @@ package com.taxi.servicemap.controller; +import com.internal.dto.DicDistrict; +import com.taxi.servicemap.mapper.DicDistrictMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @RestController public class TestController { @@ -10,4 +17,16 @@ public class TestController { public String test(){ return "service map"; } + + @Autowired + DicDistrictMapper mapper; + + @GetMapping("/testMap") + public String testMap(){ + Map map = new HashMap<>(); + map.put("address_code","11000"); + List dicDistrictList = mapper.selectByMap(map); + System.out.println(dicDistrictList); + return "test-map"; + } } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/mapper/DicDistrictMapper.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/mapper/DicDistrictMapper.java new file mode 100644 index 0000000..2a631f5 --- /dev/null +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/mapper/DicDistrictMapper.java @@ -0,0 +1,9 @@ +package com.taxi.servicemap.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.internal.dto.DicDistrict; +import org.springframework.stereotype.Repository; + +@Repository +public interface DicDistrictMapper extends BaseMapper { +} diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DicDistrictService.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DicDistrictService.java new file mode 100644 index 0000000..b8feaff --- /dev/null +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DicDistrictService.java @@ -0,0 +1,31 @@ +package com.taxi.servicemap.service; + +import com.internal.contant.AmapConfigConstant; +import com.internal.dto.ResponseResult; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class DicDistrictService { + + + //?keywords=%E4%B8%AD%E5%9B%BD&subdistrict=3&key=01d85ea8f7db65efc370cfec18ff6397 + + @Value("${amap.key}") + private String amapKey; + + + public ResponseResult initDicDistrict(String keywords){ + //拼接请求的URL + StringBuilder url = new StringBuilder(); + url.append(AmapConfigConstant.DISTRICT_URL); + url.append("?"); + url.append("keywords="+keywords); + url.append("&"); + url.append("subdistrict=3"); + url.append("&"); + url.append("key="+amapKey); + System.out.println(url.toString()); + return ResponseResult.success(); + } +} diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionSevice.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionService.java similarity index 95% rename from online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionSevice.java rename to online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionService.java index 0c71248..f4371f6 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionSevice.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/DirectionService.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class DirectionSevice { +public class DirectionService { @Autowired private MapDirectionClient mapDirectionClient; diff --git a/online-taxi-public/service-map/src/main/resources/application.yaml b/online-taxi-public/service-map/src/main/resources/application.yaml index 36d859f..c2ec145 100644 --- a/online-taxi-public/service-map/src/main/resources/application.yaml +++ b/online-taxi-public/service-map/src/main/resources/application.yaml @@ -2,6 +2,11 @@ server: port: 8085 spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/service-map?characterEncoding=utf-8&serverTimezone=GMT%2B8 + username: root + password: topsun123 cloud: nacos: discovery: diff --git a/online-taxi-public/service-map/target/classes/application.yaml b/online-taxi-public/service-map/target/classes/application.yaml index 36d859f..c2ec145 100644 --- a/online-taxi-public/service-map/target/classes/application.yaml +++ b/online-taxi-public/service-map/target/classes/application.yaml @@ -2,6 +2,11 @@ server: port: 8085 spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/service-map?characterEncoding=utf-8&serverTimezone=GMT%2B8 + username: root + password: topsun123 cloud: nacos: discovery: