提交 f71fa7a6 authored 作者: huyufan's avatar huyufan

数据大屏

上级 9cbda7a8
package com.clx.performance.controller.app; package com.clx.performance.controller.app;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.CheckMobileParam;
import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam; import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
import com.clx.performance.service.OwnerAccountService; import com.clx.performance.service.OwnerAccountService;
import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO; import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
...@@ -35,4 +36,12 @@ public class AppOwnerAccountController { ...@@ -35,4 +36,12 @@ public class AppOwnerAccountController {
IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightOwnerAccountPageList(param); IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightOwnerAccountPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
@ApiOperation(value = "验证手机号验证码", notes = "<br>By:胡宇帆")
@PostMapping("/checkMobile")
public Result<String> checkMobile(@RequestBody CheckMobileParam param) {
String token = ownerAccountService.checkMobile(param);
return Result.ok(token);
}
} }
...@@ -53,6 +53,7 @@ public class LargeScreenListener { ...@@ -53,6 +53,7 @@ public class LargeScreenListener {
log.info("处理数据大屏标准地址路线监听器执行,订单为{}", message); log.info("处理数据大屏标准地址路线监听器执行,订单为{}", message);
FeignOrderVO orderVO = JSONUtil.toBean(message, FeignOrderVO.class); FeignOrderVO orderVO = JSONUtil.toBean(message, FeignOrderVO.class);
if (ObjectUtil.isNull(orderVO.getSendSystemAddressId()) || ObjectUtil.isNull(orderVO.getReveiveSystemAddressId())) { if (ObjectUtil.isNull(orderVO.getSendSystemAddressId()) || ObjectUtil.isNull(orderVO.getReveiveSystemAddressId())) {
log.info("当前订单标准地址相关为空,不予处理");
return; return;
} }
Integer receiveAddressId = orderVO.getReveiveSystemAddressId(); Integer receiveAddressId = orderVO.getReveiveSystemAddressId();
...@@ -66,6 +67,7 @@ public class LargeScreenListener { ...@@ -66,6 +67,7 @@ public class LargeScreenListener {
} else { } else {
ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed) ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed)
.map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
log.info("查询出标准地址相关坐标经纬度:{}", JSONUtil.parse(feignAddressVO));
BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN); BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN);
BigDecimal sendAddressLongitude = feignAddressVO.getSendAddressVo().getLongitude().setScale(4, RoundingMode.DOWN); BigDecimal sendAddressLongitude = feignAddressVO.getSendAddressVo().getLongitude().setScale(4, RoundingMode.DOWN);
......
...@@ -176,10 +176,14 @@ public class LargeScreenServiceImpl implements LargeScreenService { ...@@ -176,10 +176,14 @@ public class LargeScreenServiceImpl implements LargeScreenService {
@Override @Override
public String routeLine(Integer addressId) { public String routeLine(Integer addressId) {
List<SystemAddressVO> list = Optional.of(orderFeign.getOrderListByReceiveAddressId(addressId)).filter(Result::succeed)
.map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
List<Integer> addressIds = list.stream().map(SystemAddressVO::getId).collect(Collectors.toList());
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
Query query = new Query(); Query query = new Query();
query.addCriteria(Criteria.where("receiveSystemAddressId").is(addressId)); query.addCriteria(Criteria.where("receiveSystemAddressId").in(addressIds));
List<MongoLargeScreenAddressRoute> routes = mongoTemplate.find(query, MongoLargeScreenAddressRoute.class); List<MongoLargeScreenAddressRoute> routes = mongoTemplate.find(query, MongoLargeScreenAddressRoute.class);
if (CollectionUtils.isEmpty(routes)) { if (CollectionUtils.isEmpty(routes)) {
return null; return null;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论