xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/WeatherDTO.java
File was renamed from xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/map/WeatherVo.java @@ -1,4 +1,4 @@ package com.xiaopeng.api.vo.map; package com.xiaopeng.api.dto; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -7,7 +7,7 @@ @Data @ApiModel("根据ip获取点位") public class WeatherVo { public class WeatherDTO { int status; xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java
@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.Min; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -37,11 +38,22 @@ @ApiModelProperty(value = "用户每日取消订单数") private Integer cancleCount; @ApiModelProperty(value = "单个订单可修改目的地次数") private Integer amendCountPerOrder; @ApiModelProperty(value = "乘客端首页安全中心是否开启") private Boolean showSecurityCenter; // @ApiModelProperty(value = "豁免金额") private BigDecimal exemptionAmount; @ApiModelProperty(value = "是否长期有效 1=是 0=否") private Boolean isLongValid; @ApiModelProperty(value = "豁免城市") private String cityCode; @ApiModelProperty(value = "豁免开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -54,6 +66,8 @@ @ApiModelProperty(value = "豁免角色 逗号分割 0=全部 1=新客 2=老客 3=流失召回 4=媒体") private String exemptionRole; // @ApiModelProperty(value = "免密授权金额") private BigDecimal passwordFreeAmount; @@ -61,27 +75,35 @@ private BigDecimal prepaidLimit; @ApiModelProperty(value = "一轮推单距离") @Min(0) private Double onePushDistance; @ApiModelProperty(value = "一轮推单时间") @Min(0) private Integer onePushTime; @ApiModelProperty(value = "二轮推单距离") @Min(0) private Double twoPushDistance; @ApiModelProperty(value = "二轮推单时间") @Min(0) private Integer twoPushTime; @ApiModelProperty(value = "三轮推单距离") @Min(0) private Double threePushDistance; @ApiModelProperty(value = "三轮推单时间") @Min(0) private Integer threePushTime; @ApiModelProperty(value = "四轮推单距离") @Min(0) private Double fourPushDistance; @ApiModelProperty(value = "四轮推单时间") @Min(0) private Integer fourPushTime; @ApiModelProperty(value = "五轮推单距离") @@ -123,4 +145,9 @@ @ApiModelProperty(value = "电量权重") private Integer weightElectricity; @ApiModelProperty(value = "路线时效,单位:秒") private Integer MaxStandingTiming; @ApiModelProperty(value = "触发步行导航的最小距离") private Integer walkingGuideDistance; } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -6,7 +6,7 @@ import com.xiaopeng.api.dto.map.OrderRouteAndFareDto; import com.xiaopeng.api.dto.map.RouteAndFareDto; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.vo.map.WeatherVo; import com.xiaopeng.api.dto.WeatherDTO; import com.xiaopeng.api.vo.map.PointByIpVo; import com.xiaopeng.api.vo.operation.RouteVo; import com.xiaopeng.common.core.domain.R; @@ -191,7 +191,7 @@ @ApiOperation(value = "获取天气信息", tags = {"内部-调价"}) @GetMapping("/logan/inner/weatherInfo") public R<WeatherVo> weather(@RequestParam String city) throws IOException { public R<WeatherDTO> weather(@RequestParam String city) throws IOException { try (CloseableHttpClient httpClient = HttpClients.createDefault()) { HttpGet httpGet = new HttpGet(String.format(WEATHER_URL, key, city)); @@ -200,7 +200,7 @@ if (entity != null) { String resp = EntityUtils.toString(entity, StandardCharsets.UTF_8); System.out.println(resp); return R.ok(om.readValue(resp, WeatherVo.class)); return R.ok(om.readValue(resp, WeatherDTO.class)); } return R.fail("获取天气信息失败"); } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpTradingStrategyEditDTO.java
@@ -117,4 +117,19 @@ @ApiModelProperty(value = "关联城市列表") @Valid private List<XpTradingStrategyCity> cityList; @ApiModelProperty(value = "单个订单可修改目的地次数") private Integer amendCountPerOrder; @ApiModelProperty(value = "乘客端首页安全中心是否开启") private Boolean showSecurityCenter; @ApiModelProperty(value = "豁免城市") private String cityCode; @ApiModelProperty(value = "路线时效,单位:秒") private Integer MaxStandingTiming; @ApiModelProperty(value = "触发步行导航的最小距离") private Integer walkingGuideDistance; } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpTradingStrategyDetailVO.java
@@ -124,4 +124,20 @@ @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @ApiModelProperty(value = "单个订单可修改目的地次数") private Integer amendCountPerOrder; @ApiModelProperty(value = "乘客端首页安全中心是否开启") private Boolean showSecurityCenter; @ApiModelProperty(value = "豁免城市") private String cityCode; @ApiModelProperty(value = "路线时效,单位:秒") private Integer MaxStandingTiming; @ApiModelProperty(value = "触发步行导航的最小距离") private Integer walkingGuideDistance; }