From 2855ae89d2ab6268e1edc42c3e9d7e73c8e7259e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 03 九月 2024 10:09:24 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 98 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 38 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 561b7b1..40552ab 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -12,6 +12,8 @@
import com.ruoyi.admin.utils.OcrBase;
import com.ruoyi.admin.vo.OrderByServeRecordVO;
import com.ruoyi.admin.vo.OrderDetailVO;
+import com.ruoyi.admin.vo.OrderReasinDto;
+import com.ruoyi.admin.vo.ReassinDto;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.R;
@@ -52,6 +54,7 @@
import java.math.BigDecimal;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -119,7 +122,13 @@
})
public R<OrderDetailVO> orderDetail(@RequestParam String id) {
// 独立orderService
- return R.ok(orderService.orderListDetail(id));
+ OrderDetailVO orderDetailVO = orderService.orderListDetail(id);
+ if (orderDetailVO.getServeRecordInfo().getPhoto()!=null&&!orderDetailVO.getServeRecordInfo().getPhoto().isEmpty()){
+ if (orderDetailVO.getServeRecordInfo().getPhoto().get(0).equals("")){
+ orderDetailVO.getServeRecordInfo().setPhoto(null);
+ }
+ }
+ return R.ok(orderDetailVO);
}
@Resource
private RecoveryClassifyService recoveryClassifyService;
@@ -239,6 +248,7 @@
.eq(MasterWorker::getIsDelete, 0).one();
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
+ order.setAcceptTime(new Date());
// 待上门
order.setState(Constants.ONE);
} else {
@@ -334,7 +344,7 @@
*/
@RequiresPermissions("order_reassignment")
@ApiOperation(value = "订单列表-订单派单/改派", tags = {"后台-订单管理"})
- @GetMapping(value = "/reassignment")
+ @PostMapping(value = "/reassignment")
@ApiImplicitParams({
@ApiImplicitParam(value = "操作类型(1:订单派单；2:订单改派)", name = "type", dataType = "Integer", required = true),
@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
@@ -342,44 +352,43 @@
@ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
})
@Transactional(rollbackFor = Exception.class)
- public R<String> reassignment(@RequestParam Integer type, @RequestParam String orderIds,
- @RequestParam Integer workerId, String applyReason) {
- String[] split = orderIds.split(",");
- for (String orderId : split) {
+ public R<String> reassignment(@RequestBody OrderReasinDto orderReasinDto) {
+// String[] split = orderIds.split(",");
+ for (ReassinDto orderId : orderReasinDto.getReassinDtos()) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
- .eq(MasterWorker::getId, workerId)
+ .eq(MasterWorker::getId, orderReasinDto.getWorkerId())
.eq(MasterWorker::getIsDelete, 0).one();
- Order item = orderClient.detail(orderId).getData();
- Order order = orderClient.exchangeOrder(type, orderId, workerId,
+ Order item = orderClient.detail(orderId.getOrderId()).getData();
+ Order order = orderClient.exchangeOrder(orderId.getType(), orderId.getOrderId(), orderReasinDto.getWorkerId(),
masterWorker.getRealName(), masterWorker.getPhone()).getData();
// 订单派单
boolean result = true;
- if (Constants.TWO.equals(type)) {
+ if (Constants.TWO.equals(orderId.getType())) {
if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
orderClient.updateState(order.getId(), Constants.ONE);
}
// 订单状态为 待完工时，需要更改状态 待上门且清空师傅到达预约点时间
if (order.getState().equals(Constants.TWO)) {
- orderClient.updateStateAndArrivalTime(orderId, Constants.ONE);
+ orderClient.updateStateAndArrivalTime(orderId.getOrderId(), Constants.ONE);
}
// 生成改派信息
- ChangeDispatch changeDispatch = new ChangeDispatch();
- changeDispatch.setWorkerId(item.getServerId());
- changeDispatch.setWorkerName(item.getServerName());
- changeDispatch.setApplyReason(applyReason);
- changeDispatch.setApplyTime(new Date());
- changeDispatch.setState(Constants.ONE);
- changeDispatch.setOrderId(orderId);
- changeDispatch.setOrderNumber(item.getOrderNumber());
- if (null != item.getUserId()) {
- changeDispatch.setUserId(item.getUserId());
- }
- changeDispatch.setUserName(item.getReservationName());
- changeDispatch.setIsDelete(Constants.ZERO);
- result = dispatchClient.saveRecord(changeDispatch).getData();
+// ChangeDispatch changeDispatch = new ChangeDispatch();
+// changeDispatch.setWorkerId(item.getServerId());
+// changeDispatch.setWorkerName(item.getServerName());
+// changeDispatch.setApplyReason(orderReasinDto.getApplyReason());
+// changeDispatch.setApplyTime(new Date());
+// changeDispatch.setState(Constants.ONE);
+// changeDispatch.setOrderId(orderId.getOrderId());
+// changeDispatch.setOrderNumber(item.getOrderNumber());
+// if (null != item.getUserId()) {
+// changeDispatch.setUserId(item.getUserId());
+// }
+// changeDispatch.setUserName(item.getReservationName());
+// changeDispatch.setIsDelete(Constants.ZERO);
+// result = dispatchClient.saveRecord(changeDispatch).getData();
}
- ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(workerId));
+ ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
@@ -419,6 +428,14 @@
@ApiOperation(value = "订单列表-excel导出", tags = {"后台-订单管理"})
@PostMapping(value = "/excelExport")
public R<String> excelExport(@RequestBody OrderQueryRequest orderQueryRequest, HttpServletResponse response) {
+ List<Integer> servIds = new ArrayList<>();
+ if (orderQueryRequest.getClassNameId()!=null){
+ List<Integer> classIds = recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getId, orderQueryRequest.getClassNameId()).list().stream().map(RecoveryClassify::getId).collect(Collectors.toList());
+ servIds = recoveryServeService.lambdaQuery().eq(BaseEntity::getIsDelete,0).in(RecoveryServe::getClassifyId, classIds).list().stream().map(RecoveryServe::getId).collect(Collectors.toList());
+ }
+ orderQueryRequest.setServIds(servIds);
+
+
R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
// 独立orderService
return orderService.excelExport(result.getData(), response);
@@ -440,6 +457,10 @@
@PostMapping (value = "/ocr")
public R<JSONObject> ocr(String ocrAddress) {
return R.ok(DescribeInstances.ocr(ocrAddress));
+ }
+
+ public static void main(String[] args) {
+ System.out.println(LocalDateTime.now().plusMonths(1));
}
/**
@@ -531,7 +552,7 @@
private RedisService redisService;
@ApiOperation(value = "地图统计", tags = {"后台-订单管理-地图统计"})
@PostMapping(value = "/map/works")
- public R<List<MasterWorker>> map(String cityCode) {
+ public R<List<MasterWorker>> map(String cityCode,String name) {
LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
@@ -548,7 +569,7 @@
if (workIds==null||workIds.isEmpty()){
return R.ok(new ArrayList<>());
}
- List<MasterWorker> list = masterWorkerService.lambdaQuery().in(MasterWorker::getId, workIds).list();
+ List<MasterWorker> list = masterWorkerService.lambdaQuery().in(MasterWorker::getId, workIds).eq(name!=null&&name!="",MasterWorker::getRealName,name).eq(cityCode!=null&&cityCode!="", MasterWorker::getCityCode,cityCode).list();
for (MasterWorker masterWorker : list) {
masterWorker.setLacation(redisService.getCacheObject("work:"+masterWorker.getId()+":"));
}
@@ -564,14 +585,14 @@
for (Order datum : workday.getData()) {
OrderByServeRecordVO orderByServeRecord = new OrderByServeRecordVO();
-// String masterFolderPath = "/usr/local/coordinate/" + datum.getServerId();
-// File masterFolder = new File(masterFolderPath);
- // 检查师傅ID的文件夹是否存在，存在就读取轨迹数据
-// System.out.println("文件是否存在：" + masterFolder.exists());
-// if (masterFolder.exists()) {
- // 检查订单ID的JSON文件是否存在，不存在则创建
-// String jsonFilePath = masterFolderPath + "/" + datum.getId() + ".json";
- String jsonFilePath = "C:\\Users\\Admin\\Desktop\\1814257493315514369.json";
+ String masterFolderPath = "/usr/local/coordinate/" + datum.getServerId();
+ File masterFolder = new File(masterFolderPath);
+// 检查师傅ID的文件夹是否存在，存在就读取轨迹数据
+ System.out.println("文件是否存在：" + masterFolder.exists());
+ if (masterFolder.exists()) {
+// 检查订单ID的JSON文件是否存在，不存在则创建
+ String jsonFilePath = masterFolderPath + "/" + datum.getId() + ".json";
+// String jsonFilePath = "C:\\Users\\Admin\\Desktop\\1814257493315514369.json";
File jsonFile = new File(jsonFilePath);
System.out.println("订单Json文件是否存在：" + jsonFile.exists());
if (jsonFile.exists()) {
@@ -590,9 +611,10 @@
} catch (IOException e) {
System.out.println(e.getMessage());
}
-// }
+ list.add(orderByServeRecord);
+
+ }
}
- list.add(orderByServeRecord);
}
--
Gitblit v1.7.1