java/Robotaxi.git

			@@ -3,15 +3,21 @@
			import cn.afterturn.easypoi.excel.ExcelExportUtil;
			import cn.afterturn.easypoi.excel.entity.ExportParams;
			import cn.hutool.core.bean.BeanUtil;
			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
			import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
			import com.xiaopeng.api.dto.operation.LonLatDto;
			import com.xiaopeng.api.dto.order.AddCruiseMissionDto;
			import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient;
			import com.xiaopeng.api.feignClient.map.XpMapClient;
			import com.xiaopeng.api.model.order.XpCruiseOrder;
			import com.xiaopeng.api.vo.OrderType;
			import com.xiaopeng.api.vo.operation.RouteVo;
			import com.xiaopeng.common.core.domain.R;
			import com.xiaopeng.common.core.utils.WebUtils;
			import com.xiaopeng.common.core.web.page.PageInfo;
			import com.xiaopeng.common.redis.service.RedisService;
			import com.xiaopeng.order.model.exportExcel.XpCruiseOrderExportExcel;
			import com.xiaopeng.order.model.exportExcel.XpOrderExportExcel;
			import com.xiaopeng.order.model.query.XpCruiseOrderExcelQuery;
			@@ -27,6 +33,7 @@
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import javax.servlet.ServletOutputStream;
			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			@@ -51,6 +58,10 @@
			private final OrderMissionClient orderMissionClient;
			private final IXpOrderService xpOrderService;

			@Resource
			private XpMapClient xpMapClient;



			/**
			* 根据车辆VIN码取消订单
			@@ -58,10 +69,10 @@
			*
			* @param
			*/
			@PostMapping("/inner/cruiseOrder/cancelCruiseOrderByVin")
			public R<Long> cancelCruiseOrderByVin(@RequestParam String vin) {
			Long id = xpCruiseOrderService.cancelCruiseOrderByVin(vin);
			return R.ok(id);
			@PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderByVin")
			public R<XpCruiseOrder> cancelCruiseOrderByVin(@RequestParam String vin) {
			XpCruiseOrder cruiseOrder = xpCruiseOrderService.cancelCruiseOrderByVin(vin);
			return R.ok(cruiseOrder);
			}

			/**
			@@ -69,7 +80,7 @@
			*
			* @param
			*/
			@PostMapping("/inner/cruiseOrder/completeCruiseOrder")
			@PostMapping("/logan/inner/cruiseOrder/completeCruiseOrder")
			public R<?> completeCruiseOrder(@RequestParam Long orderId) {
			xpCruiseOrderService.completeCruiseOrder(orderId);
			return R.ok();
			@@ -82,8 +93,8 @@
			* @param orderId
			* @return
			*/
			@PostMapping("/inner/cruiseOrder/cancelCruiseOrderById")
			public R<?> cancelCruiseOrderById(@RequestParam Long orderId) {
			@PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderById")
			public R<XpCruiseOrder> cancelCruiseOrderById(@RequestParam Long orderId) {
			return xpCruiseOrderService.cancelCruiseOrderById(orderId);
			}

			@@ -94,7 +105,7 @@
			* @param orderId
			* @return
			*/
			@PostMapping("/inner/cruiseOrder/getCruiseOrder")
			@PostMapping("/logan/inner/cruiseOrder/getCruiseOrder")
			public R<XpCruiseOrder> getCruiseOrder(@RequestParam Long orderId) {
			return R.ok(xpCruiseOrderService.getById(orderId));
			}
			@@ -106,7 +117,7 @@
			* @param
			* @return 订单ID
			*/
			@PostMapping("/inner/cruiseOrder/addCruiseOrder")
			@PostMapping("/logan/inner/cruiseOrder/addCruiseOrder")
			public R<Long> addCruiseOrder(@RequestBody XpCruiseOrder order) {
			boolean save = xpCruiseOrderService.save(order);
			if (!save) {
			@@ -115,14 +126,22 @@

			// 下发命令
			PushOrderDto pushOrderDto = new PushOrderDto();
			pushOrderDto.setEndTaskId(order.getXpuTaskId());
			pushOrderDto.setVin(order.getVehicleVin());
			pushOrderDto.setOrderId("XU" + order.getId());
			pushOrderDto.setStartWaypointId(order.getStartPointId());
			pushOrderDto.setEndWaypointId(order.getEndPointId());
			pushOrderDto.setStartLatitude(order.getStartLat());
			pushOrderDto.setStartLongitude(order.getStartLon());
			pushOrderDto.setEndLatitude(order.getEndLat());
			pushOrderDto.setEndLongitude(order.getEndLon());
			pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
			pushOrderDto.setStage(2);
			if(null != order){
			pushOrderDto.setLastOrderId(order.getLastOrderId1());
			pushOrderDto.setLastXpuTaskId(order.getLastXpuTaskId());
			}
			pushOrderDto.setTaskActionType(order.getTaskActionType());
			// 调用推送服务 orderId + carVin
			orderMissionClient.pushOrder(pushOrderDto);

			@@ -150,7 +169,7 @@
			* @param vin
			* @return
			*/
			@PostMapping("/inner/cruiseOrder/stopAllCruiseOrder")
			@PostMapping("/logan/inner/cruiseOrder/stopAllCruiseOrder")
			public R<?> stopAllCruiseOrder(@RequestParam String vin) {
			xpCruiseOrderService.update(new UpdateWrapper<XpCruiseOrder>().eq("vehicleVin", vin)
			.in("status", Arrays.asList(0, 1)).set("status", 2));
			@@ -170,6 +189,7 @@

			// 2. 转换为导出对象
			List<XpCruiseOrderExportExcel> exportList = BeanUtil.copyToList(dataList, XpCruiseOrderExportExcel.class);
			exportList.forEach(item -> item.setOrderSource("系统自动创建"));

			// 3. 生成 Excel
			Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), XpCruiseOrderExportExcel.class, exportList);
			@@ -211,8 +231,8 @@

			@ApiOperation(value = "巡游订单详情", tags = {"管理后台-巡游订单"})
			@GetMapping(value = "/api/v1/cruise-order/getDetailById/{id}")
			public R<XpCruiseOrder> getDetailById(@PathVariable Long id){
			XpCruiseOrder xpCruiseOrder = xpCruiseOrderService.getById(id);
			public R<XpCruiseOrderPageVO> getDetailById(@PathVariable Long id){
			XpCruiseOrderPageVO xpCruiseOrder = xpCruiseOrderService.getDetailById(id);
			return R.ok(xpCruiseOrder);
			}
			}