youxiw2000 / trash · Commits

Commit b6006397228d92ed25329a7c9f8a21afe9930c52

Authored by guzijian
1 parent 39722ddf
build: skipped

fix: 修复分配驾驶报错问题

Inline Side-by-side
Showing 10 changed files with 24 additions and 40 deletions
trash-admin/src/main/resources/static/role/company.png 0 → 100644
View file @b600639

23.6 KB
trash-admin/src/main/resources/static/role/disposal.png 0 → 100644
View file @b600639

21.8 KB
trash-admin/src/main/resources/static/role/handler.png 0 → 100644
View file @b600639

23.7 KB
trash-admin/src/main/resources/static/role/user.png 0 → 100644
View file @b600639

18.9 KB
trash-admin/src/main/resources/static/swiper-1.jpg 0 → 100644
View file @b600639

1.07 MB
trash-admin/src/main/resources/static/swiper-2.jpg 0 → 100644
View file @b600639

87.8 KB
trash-admin/src/main/resources/static/user-guide.png
View file @b600639

1.73 MB | W: | H:

1.71 MB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
  View file @b600639
@@ -105,6 +105,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter @@ -105,6 +105,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
105 "/**/*.html", 105 "/**/*.html",
106 "/**/*.css", 106 "/**/*.css",
107 "/**/*.png", 107 "/**/*.png",
  108 + "/**/*.jpg",
108 "/**/*.js" 109 "/**/*.js"
109 ).permitAll() 110 ).permitAll()
110 .antMatchers("/processDefinition/**").permitAll() 111 .antMatchers("/processDefinition/**").permitAll()
trash-garbage/src/main/java/com/trash/garbage/service/AsyncJobHandlerService.java deleted 100644 → 0
  View file @39722dd
1 -package com.trash.garbage.service;  
2 -  
3 -import org.springframework.scheduling.annotation.Async;  
4 -import org.springframework.stereotype.Service;  
5 -  
6 -import javax.annotation.Resource;  
7 -  
8 -/**  
9 - * 处理异步任务  
10 - * @author 20412  
11 - */  
12 -@Service  
13 -@Async  
14 -public class AsyncJobHandlerService {  
15 -  
16 -}  
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @b600639
@@ -209,7 +209,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> @@ -209,7 +209,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
209 // 用户 209 // 用户
210 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) { 210 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
211 LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>(); 211 LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
212 - qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus); 212 + qw.orderByDesc(GarOrder::getGarCreateTime, GarOrder::getGarOrderHandlerStatus);
213 PageHelper.startPage(pageNo, pageSize); 213 PageHelper.startPage(pageNo, pageSize);
214 // 待清运 || 清运中 || 已完成 || 待支付 214 // 待清运 || 清运中 || 已完成 || 待支付
215 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type) 215 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
@@ -217,8 +217,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -217,8 +217,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
217 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) { 217 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
218 qw.eq(GarOrder::getGarOrderUserId, userId) 218 qw.eq(GarOrder::getGarOrderUserId, userId)
219 .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue()) 219 .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
220 - .eq(GarOrder::getGarOrderHandlerStatus, type)  
221 - .orderByDesc(GarOrder::getGarCreateTime); 220 + .eq(GarOrder::getGarOrderHandlerStatus, type);
222 List<GarOrder> orderList = list(qw); 221 List<GarOrder> orderList = list(qw);
223 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize); 222 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
224 return pageInfo; 223 return pageInfo;
@@ -367,7 +366,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -367,7 +366,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
367 } 366 }
368 // 用户修改 367 // 用户修改
369 else if (GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) && dto.getUpdated()) { 368 else if (GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) && dto.getUpdated()) {
370 - // TODO 待优化 可能出现线程安全 需要上锁 369 + // TODO 待优化 可能出现线程安全 需要上锁
371 if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) { 370 if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) {
372 throw new BizException(ResultCode.CODE_400, "当前订单无法修改，因为已有驾驶员确认"); 371 throw new BizException(ResultCode.CODE_400, "当前订单无法修改，因为已有驾驶员确认");
373 } 372 }
@@ -620,11 +619,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -620,11 +619,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
620 return vo; 619 return vo;
621 }); 620 });
622 List<TransportationEnterpriseVo> voList; 621 List<TransportationEnterpriseVo> voList;
623 - if ( orderByColumn != 0){ 622 + if (orderByColumn != 0) {
624 // 降序 623 // 降序
625 - voList= stream.sorted(comparator.reversed()).collect(Collectors.toList());  
626 - }else {  
627 - voList= stream.sorted(comparator).collect(Collectors.toList()); 624 + voList = stream.sorted(comparator.reversed()).collect(Collectors.toList());
  625 + } else {
  626 + voList = stream.sorted(comparator).collect(Collectors.toList());
628 } 627 }
629 int total = voList.size(); 628 int total = voList.size();
630 int remainder = total % pageSize; 629 int remainder = total % pageSize;
@@ -676,25 +675,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -676,25 +675,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
676 public void dispatchDriverOrders(DispatchDto dto) { 675 public void dispatchDriverOrders(DispatchDto dto) {
677 GarOrder order = getById(dto.getGarOrderId()); 676 GarOrder order = getById(dto.getGarOrderId());
678 List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size()); 677 List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size());
679 - // 每次下发统计选中驾驶员更新实际派车数量  
680 // 已分配 继续下发 678 // 已分配 继续下发
681 - if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) {  
682 - LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();  
683 - qw.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId());  
684 - Map<String, GarOrderMatchHandler> handlerMap = handlerService.list(qw).stream().collect(Collectors.toMap(item -> item.getGarOrderHandlerTel(), item -> item));  
685 - for (DispatchDto.DispatchDetail dispatchDetail : dto.getDispatchList()) {  
686 - if (handlerMap.containsKey(dispatchDetail.getTel())) {  
687 - continue;  
688 - }  
689 - GarOrderMatchHandler handler = getGarOrderMatchHandler(order, dispatchDetail);  
690 - handlerList.add(handler);  
691 - }  
692 - } else {  
693 - for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {  
694 - GarOrderMatchHandler handler = getGarOrderMatchHandler(order, detail);  
695 - handlerList.add(handler); 679 +// if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) {
  680 + LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();
  681 + qw.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId());
  682 + Map<String, GarOrderMatchHandler> handlerMap = handlerService.list(qw).stream().collect(Collectors.toMap(item -> item.getGarOrderHandlerTel(), item -> item));
  683 + for (DispatchDto.DispatchDetail dispatchDetail : dto.getDispatchList()) {
  684 + if (handlerMap.containsKey(dispatchDetail.getTel())) {
  685 + continue;
696 } 686 }
  687 + GarOrderMatchHandler handler = getGarOrderMatchHandler(order, dispatchDetail);
  688 + handlerList.add(handler);
697 } 689 }
  690 +// }
  691 +// else {
  692 +// for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {
  693 +// GarOrderMatchHandler handler = getGarOrderMatchHandler(order, detail);
  694 +// handlerList.add(handler);
  695 +// }
  696 +// }
698 handlerService.saveBatch(handlerList); 697 handlerService.saveBatch(handlerList);
699 List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList()); 698 List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
700 // TODO 短信通知 699 // TODO 短信通知